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

[metze at samba.org]

Author: metze
Date: 2004-11-15 20:31:12 +0000 (Mon, 15 Nov 2004)
New Revision: 3770

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

Log:
- fix endless recursion loop in spnego fallback code

- fix compiler warnings

metze

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


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/auth/spnego.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/spnego.c	2004-11-15 20:25:40 UTC (rev 3769)
+++ branches/SAMBA_4_0/source/libcli/auth/spnego.c	2004-11-15 20:31:12 UTC (rev 3770)
@@ -218,6 +218,10 @@
 		if (!all_ops[i]->oid) {
 			continue;
 		}
+		if (strcasecmp(OID_SPNEGO,all_ops[i]->oid) == 0) {
+			continue;
+		}
+
 		nt_status = gensec_subcontext_start(gensec_security, 
 						    &spnego_state->sub_sec_security);
 		if (!NT_STATUS_IS_OK(nt_status)) {
@@ -437,7 +441,7 @@
 			if (spnego.type != spnego_state->expected_packet) {
 				DEBUG(1, ("Invalid SPNEGO request: %d, expected %d\n", spnego.type, 
 					  spnego_state->expected_packet));
-				dump_data(1, (const char *)in.data, in.length);
+				dump_data(1, in.data, in.length);
 				spnego_free_data(&spnego);
 				return NT_STATUS_INVALID_PARAMETER;
 			}
@@ -497,7 +501,7 @@
 		
 		if (len == -1) {
 			DEBUG(1, ("Invalid SPNEGO request:\n"));
-			dump_data(1, (const char *)in.data, in.length);
+			dump_data(1, in.data, in.length);
 			return NT_STATUS_INVALID_PARAMETER;
 		}
 		
@@ -505,7 +509,7 @@
 		if (spnego.type != spnego_state->expected_packet) {
 			DEBUG(1, ("Invalid SPNEGO request: %d, expected %d\n", spnego.type, 
 				  spnego_state->expected_packet));
-			dump_data(1, (const char *)in.data, in.length);
+			dump_data(1, in.data, in.length);
 			spnego_free_data(&spnego);
 			return NT_STATUS_INVALID_PARAMETER;
 		}
@@ -563,7 +567,7 @@
 		
 		if (len == -1) {
 			DEBUG(1, ("Invalid SPNEGO request:\n"));
-			dump_data(1, (const char *)in.data, in.length);
+			dump_data(1, in.data, in.length);
 			return NT_STATUS_INVALID_PARAMETER;
 		}
 		
@@ -571,7 +575,7 @@
 		if (spnego.type != spnego_state->expected_packet) {
 			DEBUG(1, ("Invalid SPNEGO request: %d, expected %d\n", spnego.type, 
 				  spnego_state->expected_packet));
-			dump_data(1, (const char *)in.data, in.length);
+			dump_data(1, in.data, in.length);
 			spnego_free_data(&spnego);
 			return NT_STATUS_INVALID_PARAMETER;
 		}
@@ -603,7 +607,7 @@
 		
 		if (len == -1) {
 			DEBUG(1, ("Invalid SPNEGO request:\n"));
-			dump_data(1, (const char *)in.data, in.length);
+			dump_data(1, in.data, in.length);
 			return NT_STATUS_INVALID_PARAMETER;
 		}
 		
@@ -611,7 +615,7 @@
 		if (spnego.type != spnego_state->expected_packet) {
 			DEBUG(1, ("Invalid SPNEGO request: %d, expected %d\n", spnego.type, 
 				  spnego_state->expected_packet));
-			dump_data(1, (const char *)in.data, in.length);
+			dump_data(1, in.data, in.length);
 			spnego_free_data(&spnego);
 			return NT_STATUS_INVALID_PARAMETER;
 		}