Imported upstream version 0.61.0

[hcoop/debian/courier-authlib.git] / authldap.c

diff --git a/authldap.c b/authldap.c
index c0144f9..63761d2 100644 (file)
--- a/authldap.c
+++ b/authldap.c
@@ -1,5 +1,5 @@
 /*
-** Copyright 1998 - 2004 Double Precision, Inc.  See COPYING for
+** Copyright 1998 - 2008 Double Precision, Inc.  See COPYING for
 ** distribution information.
 */
 
@@ -17,7 +17,7 @@
 #include       "authstaticlist.h"
 #include       "courierauthdebug.h"
 
-static const char rcsid[]="$Id: authldap.c,v 1.22 2005/03/20 19:10:30 mrsam Exp $";
+static const char rcsid[]="$Id: authldap.c,v 1.23 2008/07/10 02:43:55 mrsam Exp $";
 
 extern void auth_ldap_enumerate( void(*cb_func)(const char *name,
                                                uid_t uid,
@@ -46,8 +46,6 @@ static int auth_ldap_login(const char *service, char *authdata,
                              callback_arg);
 }
 
-#if HAVE_HMACLIB
-
 #include       "libhmac/hmac.h"
 #include       "cramlib.h"
 
@@ -66,7 +64,6 @@ static int auth_ldap_cram(const char *service,
 
        return authldapcommon(service, cci.user, 0, &auth_cram_callback, &cci);
 }
-#endif
 
 int auth_ldap(const char *service, const char *authtype, char *authdata,
              int (*callback_func)(struct authinfo *, void *),
@@ -76,13 +73,8 @@ int auth_ldap(const char *service, const char *authtype, char *authdata,
                return (auth_ldap_login(service, authdata,
                        callback_func, callback_arg));
 
-#if HAVE_HMACLIB
        return (auth_ldap_cram(service, authtype, authdata,
                        callback_func, callback_arg));
-#else
-       errno=EPERM;
-       return (-1);
-#endif
 }