Author: metze Date: 2007-07-16 14:38:05 +0000 (Mon, 16 Jul 2007) New Revision: 23894
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23894 Log: merge from SAMBA_3_2: add dummy callbacks for LDAP SASL wrapping, they're not used yet... metze Modified: branches/SAMBA_3_2_0/source/Makefile.in branches/SAMBA_3_2_0/source/configure.in branches/SAMBA_3_2_0/source/include/ads.h branches/SAMBA_3_2_0/source/libsmb/namequery_dc.c Changeset: Modified: branches/SAMBA_3_2_0/source/Makefile.in =================================================================== --- branches/SAMBA_3_2_0/source/Makefile.in 2007-07-16 14:35:33 UTC (rev 23893) +++ branches/SAMBA_3_2_0/source/Makefile.in 2007-07-16 14:38:05 UTC (rev 23894) @@ -309,7 +309,8 @@ libgpo/gpo_fetch.o libgpo/gpo_filesync.o libgpo/gpo_sec.o LIBGPO_OBJ = $(LIBGPO_OBJ0) -LIBADS_OBJ = libads/ldap.o libads/ldap_printer.o libads/sasl.o \ +LIBADS_OBJ = libads/ldap.o libads/ldap_printer.o \ + libads/sasl.o libads/sasl_wrapping.o \ libads/krb5_setpw.o libads/ldap_user.o \ libads/ads_struct.o libads/kerberos_keytab.o \ libads/disp_sec.o libads/ads_utils.o libads/ldap_utils.o \ Modified: branches/SAMBA_3_2_0/source/configure.in =================================================================== --- branches/SAMBA_3_2_0/source/configure.in 2007-07-16 14:35:33 UTC (rev 23893) +++ branches/SAMBA_3_2_0/source/configure.in 2007-07-16 14:38:05 UTC (rev 23894) @@ -3352,6 +3352,14 @@ AC_CHECK_LIB_EXT(lber, LDAP_LIBS, ber_scanf) ######################################################## + # If ber_sockbuf_add_io() is available we can add + # 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]) + fi + + ######################################################## # now see if we can find the ldap libs in standard paths AC_CHECK_LIB_EXT(ldap, LDAP_LIBS, ldap_init) Modified: branches/SAMBA_3_2_0/source/include/ads.h =================================================================== --- branches/SAMBA_3_2_0/source/include/ads.h 2007-07-16 14:35:33 UTC (rev 23893) +++ branches/SAMBA_3_2_0/source/include/ads.h 2007-07-16 14:38:05 UTC (rev 23894) @@ -54,16 +54,18 @@ } config; /* info about the current LDAP connection */ +#ifdef HAVE_ADS struct { -#ifdef HAVE_LDAP LDAP *ld; -#else - void *ld; /* the active ldap structure */ -#endif struct in_addr ip; /* the ip of the active connection, if any */ time_t last_attempt; /* last attempt to reconnect */ int port; + +#ifdef HAVE_ADS_SASL_WRAPPING + Sockbuf_IO_Desc *sbiod; /* lowlevel state for LDAP wrapping */ +#endif /* HAVE_ADS_SASL_WRAPPING */ } ldap; +#endif /* HAVE_ADS */ } ADS_STRUCT; /* used to remember the names of the posix attributes in AD */ Modified: branches/SAMBA_3_2_0/source/libsmb/namequery_dc.c =================================================================== --- branches/SAMBA_3_2_0/source/libsmb/namequery_dc.c 2007-07-16 14:35:33 UTC (rev 23893) +++ branches/SAMBA_3_2_0/source/libsmb/namequery_dc.c 2007-07-16 14:38:05 UTC (rev 23894) @@ -123,7 +123,11 @@ fstrcpy(srv_name, ads->config.ldap_server_name); strupper_m(srv_name); +#ifdef HAVE_ADS *dc_ip = ads->ldap.ip; +#else + ZERO_STRUCT(*dc_ip); +#endif ads_destroy(&ads); DEBUG(4,("ads_dc_name: using server='%s' IP=%s\n",
