* Fix compilation error in arg.c when pwdcertdir was being freed, even

     though a password file might have not been defined.

   * Work on reducing the number of warnings in OSX.

1 files changed, 13 insertions, 13 deletions

diff --git a/configure b/configure
index 7b262108..0f0a03f7 100755
--- a/configure
+++ b/configure
@@ -17919,9 +17919,9 @@ if test "x$ac_cv_lib_lber_ber_alloc" = xyes; then :
 
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_init" >&5
-$as_echo_n "checking for library containing ldap_init... " >&6; }
-if ${ac_cv_search_ldap_init+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_initialize" >&5
+$as_echo_n "checking for library containing ldap_initialize... " >&6; }
+if ${ac_cv_search_ldap_initialize+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -17934,11 +17934,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char ldap_init ();
+char ldap_initialize ();
 int
 main ()
 {
-return ldap_init ();
+return ldap_initialize ();
   ;
   return 0;
 }
@@ -17951,25 +17951,25 @@ for ac_lib in '' ldap; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_ldap_init=$ac_res
+  ac_cv_search_ldap_initialize=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_ldap_init+:} false; then :
+  if ${ac_cv_search_ldap_initialize+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_ldap_init+:} false; then :
+if ${ac_cv_search_ldap_initialize+:} false; then :
 
 else
-  ac_cv_search_ldap_init=no
+  ac_cv_search_ldap_initialize=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_init" >&5
-$as_echo "$ac_cv_search_ldap_init" >&6; }
-ac_res=$ac_cv_search_ldap_init
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_initialize" >&5
+$as_echo "$ac_cv_search_ldap_initialize" >&6; }
+ac_res=$ac_cv_search_ldap_initialize
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
@@ -18046,7 +18046,7 @@ $as_echo "$as_me: * * * Including LDAP Support" >&6;}
 $as_echo "#define ENABLE_LDAP /**/" >>confdefs.h
 
   fi
-        fi
+fi
 
 if test "x$alpine_PAM" != "xnone" ; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pam_start" >&5