svn commit: samba r10796 - in branches/SAMBA_4_0/source/auth: . gensec

abartlet at samba.org abartlet at samba.org
Fri Oct 7 02:07:25 GMT 2005


Author: abartlet
Date: 2005-10-07 02:07:25 +0000 (Fri, 07 Oct 2005)
New Revision: 10796

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10796

Log:
Make getting an anonymous session info a utility function.  

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/auth/auth_util.c
   branches/SAMBA_4_0/source/auth/gensec/schannel.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/auth_util.c
===================================================================
--- branches/SAMBA_4_0/source/auth/auth_util.c	2005-10-07 01:52:48 UTC (rev 10795)
+++ branches/SAMBA_4_0/source/auth/auth_util.c	2005-10-07 02:07:25 UTC (rev 10796)
@@ -456,6 +456,32 @@
 	return NT_STATUS_OK;
 }
 
+NTSTATUS auth_anonymous_session_info(TALLOC_CTX *parent_ctx, 
+				     struct auth_session_info **_session_info) 
+{
+	NTSTATUS nt_status;
+	struct auth_serversupplied_info *server_info = NULL;
+	struct auth_session_info *session_info = NULL;
+	TALLOC_CTX *mem_ctx = talloc_new(parent_ctx);
+	
+	nt_status = auth_anonymous_server_info(mem_ctx,
+					       &server_info);
+	if (!NT_STATUS_IS_OK(nt_status)) {
+		talloc_free(mem_ctx);
+		return nt_status;
+	}
+
+	/* references the server_info into the session_info */
+	nt_status = auth_generate_session_info(parent_ctx, server_info, &session_info);
+	talloc_free(mem_ctx);
+
+	NT_STATUS_NOT_OK_RETURN(nt_status);
+
+	*_session_info = session_info;
+
+	return NT_STATUS_OK;
+}
+
 /****************************************************************************
  prints a struct auth_session_info security token to debug output.
 ****************************************************************************/

Modified: branches/SAMBA_4_0/source/auth/gensec/schannel.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/schannel.c	2005-10-07 01:52:48 UTC (rev 10795)
+++ branches/SAMBA_4_0/source/auth/gensec/schannel.c	2005-10-07 02:07:25 UTC (rev 10796)
@@ -167,28 +167,8 @@
 static NTSTATUS schannel_session_info(struct gensec_security *gensec_security,
 					 struct auth_session_info **_session_info) 
 {
-	NTSTATUS nt_status;
 	struct schannel_state *state = gensec_security->private_data;
-	struct auth_serversupplied_info *server_info = NULL;
-	struct auth_session_info *session_info = NULL;
-	TALLOC_CTX *mem_ctx = talloc_new(state);
-	
-	nt_status = auth_anonymous_server_info(mem_ctx,
-					       &server_info);
-	if (!NT_STATUS_IS_OK(nt_status)) {
-		talloc_free(mem_ctx);
-		return nt_status;
-	}
-
-	/* references the server_info into the session_info */
-	nt_status = auth_generate_session_info(state, server_info, &session_info);
-	talloc_free(mem_ctx);
-
-	NT_STATUS_NOT_OK_RETURN(nt_status);
-
-	*_session_info = session_info;
-
-	return NT_STATUS_OK;
+	return auth_anonymous_session_info(state, _session_info);
 }
 
 static NTSTATUS schannel_start(struct gensec_security *gensec_security)



More information about the samba-cvs mailing list