Attachment 1852 Details for Bug 3490 – Don't do LDAP checks if LDAP support is disabled

[patch] Don't do LDAP checks if LDAP support is disabled

samba3-configure-ldap-warnings.diff (text/plain), 3.02 KB, created by James Peach on 2006-04-10 19:53:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Peach

Created: 2006-04-10 19:53:40 UTC

Size: 3.02 KB

patch

obsolete

>Index: configure.in
>===================================================================
>--- configure.in	(revision 15025)
>+++ configure.in	(working copy)
>@@ -3126,42 +3126,52 @@
> KRB5_LIBS=""
> 
> if test x"$with_ldap_support" != x"yes"; then
>+
>     if test x"$with_ads_support" = x"yes"; then
> 	AC_MSG_ERROR(Active Directory Support requires LDAP support)
>-    elif test x"$with_ads_support" != x"no"; then
>-	AC_MSG_WARN(Active Directory Support requires LDAP support)
>+    elif test x"$with_ads_support" = x"auto"; then
>+	AC_MSG_WARN(Disabling Active Directory support (requires LDAP support))
>+	with_ads_support=no
>     fi
>-    with_ads_support=no
>-fi
> 
>-AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS)
>+else
> 
>-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)
>+    # Check to see whether there is enough LDAP functionality to be able
>+    # to build AD support.
>+
>+    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_initialize))
>+	    with_ads_support=no
>+	fi
>     fi
>-    AC_MSG_WARN(Active Directory Support requires ldap_initialize)
>-    with_ads_support=no
>-fi
> 
>-AC_CHECK_FUNC_EXT(ldap_domain2hostlist,$LDAP_LIBS)
>+    AC_CHECK_FUNC_EXT(ldap_domain2hostlist,$LDAP_LIBS)
> 
>-if test x"$ac_cv_func_ext_ldap_domain2hostlist" != x"yes"; then
>-    if test x"$with_ads_support" = x"yes"; then
>-        AC_MSG_ERROR(Active Directory Support requires ldap_domain2hostlist)
>+    if test x"$ac_cv_func_ext_ldap_domain2hostlist" != x"yes"; then
>+	if test x"$with_ads_support" = x"yes"; then
>+	    AC_MSG_ERROR(Active Directory support requires ldap_domain2hostlist)
>+	elif test x"$with_ads_support" = x"auto"; then
>+	    AC_MSG_WARN(Disabling Active Directory support (requires ldap_domain2hostlist))
>+	    with_ads_support=no
>+	fi
>     fi
>-    AC_MSG_WARN(Active Directory Support requires ldap_domain2hostlist)
>-    with_ads_support=no
>-fi
> 
>-AC_CHECK_FUNC_EXT(ldap_add_result_entry,$LDAP_LIBS)
>+    AC_CHECK_FUNC_EXT(ldap_add_result_entry,$LDAP_LIBS)
> 
>-if test x"$ac_cv_func_ext_ldap_add_result_entry" != x"yes"; then
>-    if test x"$with_ads_support" = x"yes"; then
>-        AC_MSG_ERROR(Active Directory Support requires ldap_add_result_entry)
>+    if test x"$ac_cv_func_ext_ldap_add_result_entry" != x"yes"; then
>+	if test x"$with_ads_support" = x"yes"; then
>+	    AC_MSG_ERROR(Active Directory support requires ldap_add_result_entry)
>+	elif test x"$with_ads_support" = x"auto"; then
>+	    AC_MSG_WARN(Disabling Active Directory support (requires ldap_add_result_entry))
>+	    with_ads_support=no
>+	fi
>     fi
>-    AC_MSG_WARN(Active Directory Support requires ldap_add_result_entry)
>-    with_ads_support=no
>+
> fi
> 
> if test x"$with_ads_support" != x"no"; then

Actions: View

Attachments on bug 3490: 1852