ntlmssp: Prepare gensec_ntlmssp_start() for broader use

This moves the allocation of the ntlmssp pointer back to the callers.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/auth/ntlmssp/gensec_ntlmssp.c b/auth/ntlmssp/gensec_ntlmssp.c
index 55b2f8748a344fe1f8fb23841ee61fc427081538..9cbd6e1cc477bde6ac09474b723c1995338e9f86 100644 (file)
--- a/auth/ntlmssp/gensec_ntlmssp.c
+++ b/auth/ntlmssp/gensec_ntlmssp.c
@@ -107,7 +107,6 @@ bool gensec_ntlmssp_have_feature(struct gensec_security *gensec_security,
 NTSTATUS gensec_ntlmssp_start(struct gensec_security *gensec_security)
 {
        struct gensec_ntlmssp_context *gensec_ntlmssp;
-       struct ntlmssp_state *ntlmssp_state;
 
        gensec_ntlmssp = talloc_zero(gensec_security,
                                     struct gensec_ntlmssp_context);
@@ -117,16 +116,6 @@ NTSTATUS gensec_ntlmssp_start(struct gensec_security *gensec_security)
 
        gensec_ntlmssp->gensec_security = gensec_security;
 
-       ntlmssp_state = talloc_zero(gensec_ntlmssp,
-                                   struct ntlmssp_state);
-       if (!ntlmssp_state) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       ntlmssp_state->callback_private = gensec_ntlmssp;
-
-       gensec_ntlmssp->ntlmssp_state = ntlmssp_state;
-
        gensec_security->private_data = gensec_ntlmssp;
        return NT_STATUS_OK;
 }

diff --git a/source4/auth/ntlmssp/ntlmssp_client.c b/source4/auth/ntlmssp/ntlmssp_client.c
index 858b16f0538058a2c64aa435a4fa80748c1601d2..6ec56941e6575f48b5bae1a583279067f0474ff4 100644 (file)
--- a/source4/auth/ntlmssp/ntlmssp_client.c
+++ b/source4/auth/ntlmssp/ntlmssp_client.c
@@ -329,8 +329,20 @@ NTSTATUS gensec_ntlmssp_client_start(struct gensec_security *gensec_security)
        nt_status = gensec_ntlmssp_start(gensec_security);
        NT_STATUS_NOT_OK_RETURN(nt_status);
 
-       gensec_ntlmssp = talloc_get_type_abort(gensec_security->private_data,
-                                              struct gensec_ntlmssp_context);
+       gensec_ntlmssp =
+               talloc_get_type_abort(gensec_security->private_data,
+                                     struct gensec_ntlmssp_context);
+
+       ntlmssp_state = talloc_zero(gensec_ntlmssp,
+                                   struct ntlmssp_state);
+       if (!ntlmssp_state) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       ntlmssp_state->callback_private = gensec_ntlmssp;
+
+       gensec_ntlmssp->ntlmssp_state = ntlmssp_state;
+
        ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
 
        ntlmssp_state->role = NTLMSSP_CLIENT;

diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c
index 68a802ce78e50caa5755284964ffaae06fd6b591..0799e0a99422a754604ec6b09635eeff0edbbeff 100644 (file)
--- a/source4/auth/ntlmssp/ntlmssp_server.c
+++ b/source4/auth/ntlmssp/ntlmssp_server.c
@@ -245,8 +245,20 @@ NTSTATUS gensec_ntlmssp_server_start(struct gensec_security *gensec_security)
        nt_status = gensec_ntlmssp_start(gensec_security);
        NT_STATUS_NOT_OK_RETURN(nt_status);
 
-       gensec_ntlmssp = talloc_get_type_abort(gensec_security->private_data,
-                                              struct gensec_ntlmssp_context);
+       gensec_ntlmssp =
+               talloc_get_type_abort(gensec_security->private_data,
+                                     struct gensec_ntlmssp_context);
+
+       ntlmssp_state = talloc_zero(gensec_ntlmssp,
+                                   struct ntlmssp_state);
+       if (!ntlmssp_state) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       ntlmssp_state->callback_private = gensec_ntlmssp;
+
+       gensec_ntlmssp->ntlmssp_state = ntlmssp_state;
+
        ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
 
        ntlmssp_state->role = NTLMSSP_SERVER;