diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-07-16 16:08:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:28:39 -0500 |
| commit | 77619f37a02da09a77f3fac4cb86df5e40839b2a (patch) | |
| tree | 4ad8bbc6e3f63add546b79a3dc15bcefbe8d1a86 /source3 | |
| parent | fc3f3c655b62bd002c7ba34550bb0d138cc309dd (diff) | |
| download | samba-77619f37a02da09a77f3fac4cb86df5e40839b2a.tar.gz samba-77619f37a02da09a77f3fac4cb86df5e40839b2a.tar.bz2 samba-77619f37a02da09a77f3fac4cb86df5e40839b2a.zip | |
r23898: rename HAVE_ADS_SASL_WRAPPING -> HAVE_LDAP_SASL_WRAPPING
metze
(This used to be commit 873eaff8febb50f00f9dac64c57b2a22c16f4f9b)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/configure.in | 2 | ||||
| -rw-r--r-- | source3/include/ads.h | 6 | ||||
| -rw-r--r-- | source3/libads/sasl_wrapping.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source3/configure.in b/source3/configure.in index 5e5d550555..b824d9d37e 100644 --- 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 89f54a23f2..5c15359c41 100644 --- 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 4bac35fddb..5afa3eef15 100644 --- 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 */ |