svn commit: samba r17915 - in branches/SAMBA_3_0_RELEASE/source/libads: .

[jerry at samba.org]

Author: jerry
Date: 2006-08-29 16:04:37 +0000 (Tue, 29 Aug 2006)
New Revision: 17915

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

Log:
Saturn fixes
Modified:
   branches/SAMBA_3_0_RELEASE/source/libads/ldap.c
   branches/SAMBA_3_0_RELEASE/source/libads/sasl.c


Changeset:
Modified: branches/SAMBA_3_0_RELEASE/source/libads/ldap.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/libads/ldap.c	2006-08-29 16:03:57 UTC (rev 17914)
+++ branches/SAMBA_3_0_RELEASE/source/libads/ldap.c	2006-08-29 16:04:37 UTC (rev 17915)
@@ -496,7 +496,7 @@
 	}
 
 	cookie_be = ber_alloc_t(LBER_USE_DER);
-	if (cookie && *cookie) {
+	if (*cookie) {
 		ber_printf(cookie_be, "{iO}", (ber_int_t) 1000, *cookie);
 		ber_bvfree(*cookie); /* don't need it from last time */
 		*cookie = NULL;

Modified: branches/SAMBA_3_0_RELEASE/source/libads/sasl.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/libads/sasl.c	2006-08-29 16:03:57 UTC (rev 17914)
+++ branches/SAMBA_3_0_RELEASE/source/libads/sasl.c	2006-08-29 16:04:37 UTC (rev 17915)
@@ -276,9 +276,8 @@
 	int i=0;
 	int gss_rc, rc;
 	uint8 *p;
-	uint32 max_msg_size;
+	uint32 max_msg_size = 0;
 	char *sname;
-	unsigned sec_layer;
 	ADS_STATUS status;
 	krb5_principal principal;
 	krb5_context ctx = NULL;
@@ -390,8 +389,9 @@
 #if 0
 	file_save("sasl_gssapi.dat", output_token.value, output_token.length);
 #endif
-	max_msg_size = (p[1]<<16) | (p[2]<<8) | p[3];
-	sec_layer = *p;
+	if (p) {
+		max_msg_size = (p[1]<<16) | (p[2]<<8) | p[3];
+	}
 
 	gss_release_buffer(&minor_status, &output_token);