r23898: rename HAVE_ADS_SASL_WRAPPING -> HAVE_LDAP_SASL_WRAPPING

metze
(This used to be commit 873eaff8febb50f00f9dac64c57b2a22c16f4f9b)

diff --git a/source3/configure.in b/source3/configure.in
index 5e5d55055517ed1f3ba39fc4bd781ae6b1b3da76..b824d9d37e08e42f1a561957b78ee2a35a962ee9 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3482,7 +3482,7 @@ if test x"$with_ldap_support" != x"no"; then
   # 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
 
   ########################################################

diff --git a/source3/include/ads.h b/source3/include/ads.h
index 89f54a23f25a7480ce233d1a9cb4760253b117f1..5c15359c410c697d8d9ec9b96a87384aab3740a6 100644 (file)
--- a/source3/include/ads.h
+++ b/source3/include/ads.h
@@ -61,11 +61,11 @@ typedef struct {
                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 */

diff --git a/source3/libads/sasl_wrapping.c b/source3/libads/sasl_wrapping.c
index 4bac35fddb4d5fad668a18e437f2ee4d983d8c44..5afa3eef151e1489be8a6cf16dea3aa925ec16ad 100644 (file)
--- a/source3/libads/sasl_wrapping.c
+++ b/source3/libads/sasl_wrapping.c
@@ -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 @@ ADS_STATUS ads_setup_sasl_wrapping(ADS_STRUCT *ads)
        return ADS_SUCCESS;
 }
 
-#endif /* HAVE_ADS_SASL_WRAPPING */
+#endif /* HAVE_LDAP_SASL_WRAPPING */