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

[abartlet at samba.org]

Author: abartlet
Date: 2005-04-25 03:48:02 +0000 (Mon, 25 Apr 2005)
New Revision: 6455

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

Log:
Remove wrapper functions, and ntlmssp_end (which is well handed by talloc() now).

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/auth/gensec/ntlmssp.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/gensec/ntlmssp.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/ntlmssp.c	2005-04-25 03:37:37 UTC (rev 6454)
+++ branches/SAMBA_4_0/source/auth/gensec/ntlmssp.c	2005-04-25 03:48:02 UTC (rev 6455)
@@ -325,9 +325,12 @@
  * @param ntlmssp_state NTLMSSP State
  */
 
-NTSTATUS ntlmssp_session_key(struct ntlmssp_state *ntlmssp_state,
-			     DATA_BLOB *session_key)
+NTSTATUS gensec_ntlmssp_session_key(struct gensec_security *gensec_security, 
+				    DATA_BLOB *session_key)
 {
+	struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
+	struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp_state->ntlmssp_state;
+
 	if (!ntlmssp_state->session_key.data) {
 		return NT_STATUS_NO_USER_SESSION_KEY;
 	}
@@ -337,24 +340,6 @@
 }
 
 /**
- * End an NTLMSSP state machine
- * 
- * @param ntlmssp_state NTLMSSP State, free()ed by this function
- */
-
-void ntlmssp_end(struct ntlmssp_state **ntlmssp_state)
-{
-	(*ntlmssp_state)->ref_count--;
-
-	if ((*ntlmssp_state)->ref_count == 0) {
-		talloc_free(*ntlmssp_state);
-	}
-
-	*ntlmssp_state = NULL;
-	return;
-}
-
-/**
  * Determine correct target name flags for reply, given server role 
  * and negotiated flags
  * 
@@ -1440,17 +1425,6 @@
 	return nt_status;
 }
 
-static int gensec_ntlmssp_destroy(void *ptr)
-{
-	struct gensec_ntlmssp_state *gensec_ntlmssp_state = ptr;
-
-	if (gensec_ntlmssp_state->ntlmssp_state) {
-		ntlmssp_end(&gensec_ntlmssp_state->ntlmssp_state);
-	}
-
-	return 0;
-}
-
 static NTSTATUS gensec_ntlmssp_start(struct gensec_security *gensec_security)
 {
 	struct gensec_ntlmssp_state *gensec_ntlmssp_state;
@@ -1465,8 +1439,6 @@
 	gensec_ntlmssp_state->server_info = NULL;
 	gensec_ntlmssp_state->have_features = 0;
 
-	talloc_set_destructor(gensec_ntlmssp_state, gensec_ntlmssp_destroy); 
-
 	gensec_security->private_data = gensec_ntlmssp_state;
 	return NT_STATUS_OK;
 }
@@ -1560,14 +1532,6 @@
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS gensec_ntlmssp_session_key(struct gensec_security *gensec_security, 
-					   DATA_BLOB *session_key)
-{
-	struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
-
-	return ntlmssp_session_key(gensec_ntlmssp_state->ntlmssp_state, session_key);
-}
-
 /** 
  * Return the credentials of a logged on user, including session keys
  * etc.