libcli/smb: Convert struct smb_trans_enc_state to talloc

[ab/samba.git/.git] / source3 / smbd / seal.c

diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c
index 8c4ebea04a273ca40f777b1d560c60655549620d..cdcfe06835dd9c333c366fc95a8d4653e042b277 100644 (file)
--- a/source3/smbd/seal.c
+++ b/source3/smbd/seal.c
@@ -77,16 +77,15 @@ bool is_encrypted_packet(struct smbd_server_connection *sconn,
 static NTSTATUS make_auth_gensec(const struct tsocket_address *remote_address,
                                 struct smb_trans_enc_state *es)
 {
-       struct gensec_security *gensec_security;
        NTSTATUS status;
 
-       status = auth_generic_prepare(NULL, remote_address,
-                                     &gensec_security);
+       status = auth_generic_prepare(es, remote_address,
+                                     &es->gensec_security);
        if (!NT_STATUS_IS_OK(status)) {
                return nt_status_squash(status);
        }
 
-       gensec_want_feature(gensec_security, GENSEC_FEATURE_SEAL);
+       gensec_want_feature(es->gensec_security, GENSEC_FEATURE_SEAL);
 
        /*
         * We could be accessing the secrets.tdb or krb5.keytab file here.
@@ -94,38 +93,17 @@ static NTSTATUS make_auth_gensec(const struct tsocket_address *remote_address,
         */
        become_root();
 
-       status = gensec_start_mech_by_oid(gensec_security, GENSEC_OID_SPNEGO);
+       status = gensec_start_mech_by_oid(es->gensec_security, GENSEC_OID_SPNEGO);
 
        unbecome_root();
 
        if (!NT_STATUS_IS_OK(status)) {
-               TALLOC_FREE(gensec_security);
                return nt_status_squash(status);
        }
 
-       es->gensec_security = gensec_security;
-
        return status;
 }
 
-/******************************************************************************
- Shutdown a server encryption context.
-******************************************************************************/
-
-static void srv_free_encryption_context(struct smb_trans_enc_state **pp_es)
-{
-       struct smb_trans_enc_state *es = *pp_es;
-
-       if (!es) {
-               return;
-       }
-
-       common_free_encryption_state(&es);
-
-       SAFE_FREE(es);
-       *pp_es = NULL;
-}
-
 /******************************************************************************
  Create a server encryption context.
 ******************************************************************************/
@@ -139,15 +117,14 @@ static NTSTATUS make_srv_encryption_context(const struct tsocket_address *remote
        *pp_es = NULL;
 
        ZERO_STRUCTP(partial_srv_trans_enc_ctx);
-       es = SMB_MALLOC_P(struct smb_trans_enc_state);
+       es = talloc_zero(NULL, struct smb_trans_enc_state);
        if (!es) {
                return NT_STATUS_NO_MEMORY;
        }
-       ZERO_STRUCTP(es);
        status = make_auth_gensec(remote_address,
                                  es);
        if (!NT_STATUS_IS_OK(status)) {
-               srv_free_encryption_context(&es);
+               TALLOC_FREE(es);
                return status;
        }
        *pp_es = es;
@@ -241,7 +218,7 @@ NTSTATUS srv_request_encryption_setup(connection_struct *conn,
 
        es = partial_srv_trans_enc_ctx;
        if (!es || es->gensec_security == NULL) {
-               srv_free_encryption_context(&partial_srv_trans_enc_ctx);
+               TALLOC_FREE(partial_srv_trans_enc_ctx);
                return NT_STATUS_INVALID_PARAMETER;
        }
 
@@ -253,7 +230,7 @@ NTSTATUS srv_request_encryption_setup(connection_struct *conn,
        unbecome_root();
        if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED) &&
            !NT_STATUS_IS_OK(status)) {
-               srv_free_encryption_context(&partial_srv_trans_enc_ctx);
+               TALLOC_FREE(partial_srv_trans_enc_ctx);
                return nt_status_squash(status);
        }
 
@@ -310,7 +287,7 @@ NTSTATUS srv_encryption_start(connection_struct *conn)
                return status;
        }
        /* Throw away the context we're using currently (if any). */
-       srv_free_encryption_context(&srv_trans_enc_ctx);
+       TALLOC_FREE(srv_trans_enc_ctx);
 
        /* Steal the partial pointer. Deliberate shallow copy. */
        srv_trans_enc_ctx = partial_srv_trans_enc_ctx;
@@ -328,6 +305,6 @@ NTSTATUS srv_encryption_start(connection_struct *conn)
 
 void server_encryption_shutdown(struct smbd_server_connection *sconn)
 {
-       srv_free_encryption_context(&partial_srv_trans_enc_ctx);
-       srv_free_encryption_context(&srv_trans_enc_ctx);
+       TALLOC_FREE(partial_srv_trans_enc_ctx);
+       TALLOC_FREE(srv_trans_enc_ctx);
 }