smb1cli_conn_set_encryption talloc move s3-libsmb: Convert struct smb_trans_enc_state...

[metze/samba/wip.git] / source3 / libsmb / clifsinfo.c

diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index ad5128e7f8b5c52d260c03b0464eab1ae6c24e39..019db764b8414cba73b0ef35971b8caeb97e080a 100644 (file)
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -646,8 +646,7 @@ NTSTATUS cli_raw_ntlm_smb_encryption_start(struct cli_state *cli,
                 * gensec_security a talloc child */
                es->gensec_security = talloc_move(NULL,
                                                  &auth_generic_state->gensec_security);
-               smb1cli_conn_set_encryption(cli->conn, es);
-               es = NULL;
+               smb1cli_conn_set_encryption(cli->conn, &es);
        }
 
   fail:
@@ -666,8 +665,13 @@ NTSTATUS cli_gss_smb_encryption_start(struct cli_state *cli)
        DATA_BLOB param_out = data_blob_null;
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
        struct auth_generic_state *auth_generic_state;
+<<<<<<< HEAD
        struct smb_trans_enc_state *es = talloc_zero(NULL, struct smb_trans_enc_state);
+=======
+       struct smb_trans_enc_state *es;
+>>>>>>> 7efc635... s3-libsmb: Convert struct smb_trans_enc_state to talloc
 
+       es = talloc_zero(NULL, struct smb_trans_enc_state);
        if (!es) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -731,8 +735,8 @@ NTSTATUS cli_gss_smb_encryption_start(struct cli_state *cli)
                 * gensec_security a talloc child */
                es->gensec_security = talloc_move(es,
                                                  &auth_generic_state->gensec_security);
-               smb1cli_conn_set_encryption(cli->conn, es);
-               es = NULL;
+               TALLOC_FREE(auth_generic_state);
+               smb1cli_conn_set_encryption(cli->conn, &es);
        }
 fail:
        TALLOC_FREE(es);