components/samba/samba/patches/conf.in-nsldap.patch
author Jiri Sasek <jurasek@opensolaris.org>
Wed, 25 May 2011 18:33:43 +0200
changeset 264 84a67a54e8fd
permissions -rw-r--r--
7044174 Move samba(s) and its dependencies to Userland. 7025146 Update samba to 3.5.8 (bugfix release) 7011577 Impossible to rename a file on a ZFS filesystem when installing 146364-01 (Samba 3.5.5) 7011579 Request to add shadow_copy2 in the next Samba patch or Solaris Samba package 7013885 User cannot delete a file on a share-se_access_check algorithmreturns access (2) denied 7010973 GPLv3 licensing issue with pkg:/library/samba/libsmbclient 7031097 Mozilla LDAP C-SDK (project private library for Samba) should be moved to Userland prior of Samba.

--- source3/configure.in	Mon Jan 18 12:38:09 2010
+++ source3/configure.in	Sat Mar 13 19:19:27 2010
@@ -3063,6 +3063,20 @@
     with_ldap_support=yes
     AC_MSG_CHECKING(whether LDAP support is used)
     AC_MSG_RESULT(yes)
+
+    ################################
+    # Check if the Netscape LDAP SDK
+    AC_CACHE_CHECK([for LDAP_OPT_SIZELIMIT macro],samba_cv_HAVE_LDAP_NSC,[
+    AC_TRY_COMPILE([
+#include <stdio.h>
+#include <ldap.h>],
+    [printf("%s\n", LDAP_OPT_SIZELIMIT);],
+    samba_cv_HAVE_LDAP_NSC=yes,samba_cv_HAVE_LDAP_NSC=no)])
+    if test x"$samba_cv_HAVE_LDAP_NSC" = x"yes"; then
+	AC_DEFINE(HAVE_HAVE_LDAP_NSC,1,
+		[Whether the LDAP API is Netscape SDK])
+    fi
+
   else
     if test x"$with_ldap_support" = x"yes"; then
 	AC_MSG_ERROR(libldap is needed for LDAP support)
@@ -3125,15 +3139,25 @@
     fi
     ;;
 	*)
-    AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS)
+    # Omit the ldap_initialize() test if there is a Netscape SDK
+    # (Mozilla Directory server 5)
+    if test x"$samba_cv_HAVE_LDAP_NSC" = x"no"; then
 
-    if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then
-	if test x"$with_ads_support" = x"yes"; then
-	    AC_MSG_ERROR(Active Directory support requires ldap_initialize)
-	elif test x"$with_ads_support" = x"auto"; then
-	    AC_MSG_WARN(Disabling Active Directory support (requires ldap_initialize))
-	    with_ads_support=no
+	AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS)
+
+	if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then
+	    if test x"$with_ads_support" = x"yes"; then
+		AC_MSG_ERROR(Active Directory support requires ldap_initialize)
+	    elif test x"$with_ads_support" = x"auto"; then
+		AC_MSG_WARN(Disabling Active Directory support (requires ldap_in
+itialize))
+		with_ads_support=no
+	    fi
+
 	fi
+     else
+	AC_MSG_RESULT(Active Directory support on Netscape LDAP SDK - limited fu
+nctionality?)
     fi
     ;;
 esac