svn commit: samba r2850 - in branches/SAMBA_4_0/source/libcli/auth: .

metze at samba.org metze at samba.org
Thu Oct 7 14:44:18 GMT 2004


Author: metze
Date: 2004-10-07 14:44:18 +0000 (Thu, 07 Oct 2004)
New Revision: 2850

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/libcli/auth&rev=2850&nolog=1

Log:
- check for GENSEC_WANT_SEAL in gensec_unseal_packet()

- pass functions to the subcontext in spnego

metze

Modified:
   branches/SAMBA_4_0/source/libcli/auth/gensec.c
   branches/SAMBA_4_0/source/libcli/auth/spnego.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/auth/gensec.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/gensec.c	2004-10-07 14:09:15 UTC (rev 2849)
+++ branches/SAMBA_4_0/source/libcli/auth/gensec.c	2004-10-07 14:44:18 UTC (rev 2850)
@@ -314,6 +314,10 @@
 	if (!gensec_security->ops->unseal_packet) {
 		return NT_STATUS_NOT_IMPLEMENTED;
 	}
+	if (!(gensec_security->want_features & GENSEC_WANT_SEAL)) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
 	return gensec_security->ops->unseal_packet(gensec_security, mem_ctx, 
 						   data, length, 
 						   whole_pdu, pdu_length, 

Modified: branches/SAMBA_4_0/source/libcli/auth/spnego.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/spnego.c	2004-10-07 14:09:15 UTC (rev 2849)
+++ branches/SAMBA_4_0/source/libcli/auth/spnego.c	2004-10-07 14:44:18 UTC (rev 2850)
@@ -108,7 +108,6 @@
 {
 	struct spnego_state *spnego_state = gensec_security->private_data;
 
-	return NT_STATUS_NOT_IMPLEMENTED;
 	if (spnego_state->state_position != SPNEGO_DONE 
 	    && spnego_state->state_position != SPNEGO_FALLBACK) {
 		return NT_STATUS_INVALID_PARAMETER;
@@ -129,7 +128,6 @@
 {
 	struct spnego_state *spnego_state = gensec_security->private_data;
 
-	return NT_STATUS_NOT_IMPLEMENTED;
 	if (spnego_state->state_position != SPNEGO_DONE 
 	    && spnego_state->state_position != SPNEGO_FALLBACK) {
 		return NT_STATUS_INVALID_PARAMETER;



More information about the samba-cvs mailing list