* new version 2.20.9.

   * Add command line argument -smimedir, which allows to specify
     the default path for a directory that contains the public, private,
     and ca directories. This is useful in case a user has a backup of
     old certificates that cannot be installed in the ~/.alpine-smime
     dir.

   * Update to alpine man page to include documentation on missing command
     line options such as -nowrite_password_cache, -passfile, -pwdcertdir,
     and -smimedir.

   * Various changes in the code to quell some compiler issued warnings in
     Mac OSX. Reported by Joe St Sauver. This includes the removing
     deprecated ldap functions from the code and the test in the configure
     script. The switch to not deprecated functions is done by the use of
     the belvar structure, which is not completely appropriate for what we
     are doing, but it is sufficient for our needs. The berval structure
     is more appropriate for binary data, but it works well with string
     data, which is what we need.

   * Various changes in the code to quell some warnings issued by clang
     3.5.

1 files changed, 32 insertions, 32 deletions

diff --git a/configure.ac b/configure.ac
index 272144e..f4cf950 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1426,40 +1426,40 @@ if test "$alpine_with_ldap" = "yes" ; then
   if test "$alpine_has_ldap" = "yes" ; then
     AC_MSG_NOTICE([* * * Including LDAP Support])
     AC_DEFINE([ENABLE_LDAP], [], [Enable LDAP query support])
-
+  fi
     dnl we use deprecated functions (ldap_get_values)
     dnl OpenLDAP 2.3.x doesn't define LDAP_DEPRECATED by default like 2.2.x
-    AC_MSG_CHECKING([if we should define LDAP_DEPRECATED])
-    AC_RUN_IFELSE(
-	[AC_LANG_SOURCE([[
-#include <stdio.h>
-#include <stdlib.h>
-#include <ldap.h>
-int main(void) {
-
-	if (LDAP_VENDOR_VERSION >= 20300)
-		exit(0);
-
-	exit(2);
-}
-	]])],
-	[
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(LDAP_DEPRECATED, 1,
-		[Define if you use OpenLDAP 2.3.x deprecated functions])
-
-	],
-	[
-		AC_MSG_RESULT(no)
-	],
-	[
-		AC_MSG_WARN([cross compiling: not checking])
-	]
-    )
-
-  else
-    AC_MSG_NOTICE([Cannot find LDAP functions!  Excluding LDAP support.])
-  fi
+dnl    AC_MSG_CHECKING([if we should define LDAP_DEPRECATED])
+dnl    AC_RUN_IFELSE(
+dnl	[AC_LANG_SOURCE([[
+dnl #include <stdio.h>
+dnl #include <stdlib.h>
+dnl #include <ldap.h>
+dnl int main(void) {
+dnl 
+dnl 	if (LDAP_VENDOR_VERSION >= 20300)
+dnl 		exit(0);
+dnl 
+dnl 	exit(2);
+dnl }
+dnl 	]])],
+dnl 		[
+dnl 		AC_MSG_RESULT(yes)
+dnl 		AC_DEFINE(LDAP_DEPRECATED, 1,
+dnl 		[Define if you use OpenLDAP 2.3.x deprecated functions])
+dnl 
+dnl 	],
+dnl 	[
+dnl 		AC_MSG_RESULT(no)
+dnl 	],
+dnl 	[
+dnl 		AC_MSG_WARN([cross compiling: not checking])
+dnl 	]
+dnl     )
+dnl 
+dnl   else
+dnl     AC_MSG_NOTICE([Cannot find LDAP functions!  Excluding LDAP support.])
+dnl   fi
 fi
 
 dnl PAM support is needed to build c-client in some linux, and hence Alpine.