svn commit: samba r23898 - in branches/SAMBA_3_2/source: . include libads

[metze at samba.org]

Author: metze
Date: 2007-07-16 16:08:24 +0000 (Mon, 16 Jul 2007)
New Revision: 23898

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

Log:
rename HAVE_ADS_SASL_WRAPPING -> HAVE_LDAP_SASL_WRAPPING

metze
Modified:
   branches/SAMBA_3_2/source/configure.in
   branches/SAMBA_3_2/source/include/ads.h
   branches/SAMBA_3_2/source/libads/sasl_wrapping.c


Changeset:
Modified: branches/SAMBA_3_2/source/configure.in
===================================================================
--- branches/SAMBA_3_2/source/configure.in	2007-07-16 15:31:45 UTC (rev 23897)
+++ branches/SAMBA_3_2/source/configure.in	2007-07-16 16:08:24 UTC (rev 23898)
@@ -3482,7 +3482,7 @@
   # SASL wrapping hooks
   AC_CHECK_FUNC_EXT(ber_sockbuf_add_io,$LDAP_LIBS)
   if test x"$ac_cv_func_ext_ber_sockbuf_add_io" = x"yes"; then
-  	AC_DEFINE(HAVE_ADS_SASL_WRAPPING, 1, [Support for SASL wrapping])
+  	AC_DEFINE(HAVE_LDAP_SASL_WRAPPING, 1, [Support for SASL wrapping])
   fi
 
   ########################################################

Modified: branches/SAMBA_3_2/source/include/ads.h
===================================================================
--- branches/SAMBA_3_2/source/include/ads.h	2007-07-16 15:31:45 UTC (rev 23897)
+++ branches/SAMBA_3_2/source/include/ads.h	2007-07-16 16:08:24 UTC (rev 23898)
@@ -61,11 +61,11 @@
 		time_t last_attempt; /* last attempt to reconnect */
 		int port;
 
-#ifdef HAVE_ADS_SASL_WRAPPING
+#ifdef HAVE_LDAP_SASL_WRAPPING
 		Sockbuf_IO_Desc *sbiod; /* lowlevel state for LDAP wrapping */
-#endif /* HAVE_ADS_SASL_WRAPPING */
+#endif /* HAVE_LDAP_SASL_WRAPPING */
 	} ldap;
-#endif /* HAVE_ADS */
+#endif /* HAVE_LDAP */
 } ADS_STRUCT;
 
 /* used to remember the names of the posix attributes in AD */

Modified: branches/SAMBA_3_2/source/libads/sasl_wrapping.c
===================================================================
--- branches/SAMBA_3_2/source/libads/sasl_wrapping.c	2007-07-16 15:31:45 UTC (rev 23897)
+++ branches/SAMBA_3_2/source/libads/sasl_wrapping.c	2007-07-16 16:08:24 UTC (rev 23898)
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 
-#ifdef HAVE_ADS_SASL_WRAPPING
+#ifdef HAVE_LDAP_SASL_WRAPPING
 
 static int ads_saslwrap_setup(Sockbuf_IO_Desc *sbiod, void *arg)
 {
@@ -106,4 +106,4 @@
 	return ADS_SUCCESS;
 }
 
-#endif /* HAVE_ADS_SASL_WRAPPING */
+#endif /* HAVE_LDAP_SASL_WRAPPING */