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;
}
}
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)
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);
* gensec_security a talloc child */
es->gensec_security = talloc_move(NULL,
&auth_generic_state->gensec_security);
- smb1cli_conn_set_encryption(cli->conn, &es);
+ smb1cli_conn_set_encryption(cli->conn, es);
+ es = NULL;
}
fail:
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;
}
* gensec_security a talloc child */
es->gensec_security = talloc_move(es,
&auth_generic_state->gensec_security);
- TALLOC_FREE(auth_generic_state);
- smb1cli_conn_set_encryption(cli->conn, &es);
+ smb1cli_conn_set_encryption(cli->conn, es);
+ es = NULL;
}
fail:
TALLOC_FREE(es);