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

Conflicts:

	libcli/smb/smbXcli_base.c
	source3/libsmb/clifsinfo.c

diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index fe85b3168054e29c1dcd19d476b2613799bac802..270b9c338c61da779214dbf5389268a60143f897 100644 (file)
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -214,10 +214,13 @@ static int smbXcli_conn_destructor(struct smbXcli_conn *conn)
                DLIST_REMOVE(conn->sessions, conn->sessions);
        }
 
+<<<<<<< HEAD
        if (conn->smb1.trans_enc) {
                TALLOC_FREE(conn->smb1.trans_enc);
        }
 
+=======
+>>>>>>> 7efc635... s3-libsmb: Convert struct smb_trans_enc_state to talloc
        return 0;
 }
 
@@ -595,13 +598,18 @@ bool smb1cli_conn_signing_is_active(struct smbXcli_conn *conn)
 }
 
 void smb1cli_conn_set_encryption(struct smbXcli_conn *conn,
-                                struct smb_trans_enc_state *es)
+                                struct smb_trans_enc_state **es)
 {
        /* Replace the old state, if any. */
+<<<<<<< HEAD
        if (conn->smb1.trans_enc) {
                TALLOC_FREE(conn->smb1.trans_enc);
        }
        conn->smb1.trans_enc = es;
+=======
+       TALLOC_FREE(conn->smb1.trans_enc);
+       conn->smb1.trans_enc = talloc_move(conn, es);
+>>>>>>> 7efc635... s3-libsmb: Convert struct smb_trans_enc_state to talloc
 }
 
 bool smb1cli_conn_encryption_on(struct smbXcli_conn *conn)

diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h
index 91dc2448351800e94e860970ef021bf54cd4c4e6..64d409ab8b7778bcea85f392fc4b223670d892ef 100644 (file)
--- a/libcli/smb/smbXcli_base.h
+++ b/libcli/smb/smbXcli_base.h
@@ -82,7 +82,7 @@ bool smb1cli_conn_check_signing(struct smbXcli_conn *conn,
 bool smb1cli_conn_signing_is_active(struct smbXcli_conn *conn);
 
 void smb1cli_conn_set_encryption(struct smbXcli_conn *conn,
-                                struct smb_trans_enc_state *es);
+                                struct smb_trans_enc_state **es);
 bool smb1cli_conn_encryption_on(struct smbXcli_conn *conn);
 
 bool smb1cli_is_andx_req(uint8_t cmd);

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);