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

[jelmer at samba.org]

Author: jelmer
Date: 2007-10-07 13:10:39 +0000 (Sun, 07 Oct 2007)
New Revision: 25562

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

Log:
Use standard bool types in cyrus sasl code - patch by Julien.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c	2007-10-07 12:56:43 UTC (rev 25561)
+++ branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c	2007-10-07 13:10:39 UTC (rev 25562)
@@ -248,6 +248,7 @@
 	return sasl_nt_status(sasl_ret);
 
 }
+
 static NTSTATUS gensec_sasl_wrap_packets(struct gensec_security *gensec_security, 
 					TALLOC_CTX *out_mem_ctx, 
 					const DATA_BLOB *in, 
@@ -271,7 +272,7 @@
 }
 
 /* Try to figure out what features we actually got on the connection */
-static BOOL gensec_sasl_have_feature(struct gensec_security *gensec_security, 
+static bool gensec_sasl_have_feature(struct gensec_security *gensec_security, 
 				     uint32_t feature) 
 {
 	struct gensec_sasl_state *gensec_sasl_state = talloc_get_type(gensec_security->private_data,
@@ -279,25 +280,25 @@
 	sasl_ssf_t ssf;
 	int sasl_ret = sasl_getprop(gensec_sasl_state->conn, SASL_SSF, &ssf);
 	if (sasl_ret != SASL_OK) {
-		return False;
+		return false;
 	}
 	if (feature & GENSEC_FEATURE_SIGN) {
 		if (ssf == 0) {
-			return False;
+			return false;
 		}
 		if (ssf >= 1) {
-			return True;
+			return true;
 		}
 	}
 	if (feature & GENSEC_FEATURE_SEAL) {
 		if (ssf <= 1) {
-			return False;
+			return false;
 		}
 		if (ssf > 1) {
-			return True;
+			return true;
 		}
 	}
-	return False;
+	return false;
 }
 
 /* This could in theory work with any SASL mech */
@@ -309,7 +310,7 @@
 	.wrap_packets     = gensec_sasl_wrap_packets,
 	.unwrap_packets   = gensec_sasl_unwrap_packets,
 	.have_feature     = gensec_sasl_have_feature,
-	.enabled          = True,
+	.enabled          = true,
 	.priority         = GENSEC_SASL
 };