Imported upstream version 0.61.0

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

diff --git a/authcustom.c b/authcustom.c
index e371f1f..a548c8e 100644 (file)
--- a/authcustom.c
+++ b/authcustom.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.
 */
 
@@ -16,7 +16,7 @@
 #include       "authcustom.h"
 #include       "authstaticlist.h"
 
-static const char rcsid[]="$Id: authcustom.c,v 1.6 2005/03/20 19:10:30 mrsam Exp $";
+static const char rcsid[]="$Id: authcustom.c,v 1.7 2008/07/10 02:43:55 mrsam Exp $";
 
 static int auth_custom_login(const char *service, char *authdata,
                             int (*callback_func)(struct authinfo *, void *),
@@ -34,8 +34,6 @@ static int auth_custom_login(const char *service, char *authdata,
        return authcustomcommon(user, pass, callback_func, callback_arg);
 }
 
-#if HAVE_HMACLIB
-
 #include       "libhmac/hmac.h"
 #include       "cramlib.h"
 
@@ -55,7 +53,6 @@ static int auth_custom_cram(const char *service,
 
        return authcustomcommon(cci.user, 0, &auth_cram_callback, &cci);
 }
-#endif
 
 int auth_custom(const char *service, const char *authtype, char *authdata,
                int (*callback_func)(struct authinfo *, void *),
@@ -65,12 +62,8 @@ int auth_custom(const char *service, const char *authtype, char *authdata,
                return (auth_custom_login(service, authdata,
                        callback_func, callback_arg));
 
-#if HAVE_HMACLIB
        return (auth_custom_cram(service, authtype, authdata,
                                 callback_func, callback_arg));
-#else
-       return -1;
-#endif
 }