Import Debian package 0.61.0-1+lenny1

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

diff --git a/authuserdbpwd.c b/authuserdbpwd.c
index b49a6b7..889c68d 100644 (file)
--- a/authuserdbpwd.c
+++ b/authuserdbpwd.c
@@ -21,11 +21,9 @@
 #include       "authwait.h"
 #include       "sbindir.h"
 #include       "courierauthdebug.h"
-#if HAVE_HMACLIB
 #include        "libhmac/hmac.h"
-#endif
 
-static const char rcsid[]="$Id: authuserdbpwd.c,v 1.8 2006/10/28 19:22:52 mrsam Exp $";
+static const char rcsid[]="$Id: authuserdbpwd.c,v 1.9 2008/07/10 02:43:55 mrsam Exp $";
 
 
 static int bad(const char *q)
@@ -40,8 +38,6 @@ static int bad(const char *q)
 }
 
 
-#if HAVE_HMACLIB
-
 static char *hmacpw(const char *pw, const char *hash)
 {
        int     i;
@@ -70,7 +66,6 @@ static char *hmacpw(const char *pw, const char *hash)
        }
        return (NULL);
 }
-#endif
 
 static int dochangepwd1(const char *, const char *, const char *, const char *,
                        const char *);
@@ -113,8 +108,6 @@ int auth_userdb_passwd(const char *service,
        if (rc > 0)
                return rc;
 
-#if HAVE_HMACLIB
-
        {
                int i;
 
@@ -157,7 +150,6 @@ int auth_userdb_passwd(const char *service,
 
                }
        }
-#endif
 
        if (rc == 0)
        {
@@ -183,8 +175,6 @@ static int try_auth_userdb_passwd(const char *hmac_flag,
        char *npwd;
        int rc;
 
-#if HAVE_HMACLIB
-
        if (hmac_flag)
        {
                DPRINTF("Trying to change password for %s",
@@ -206,7 +196,6 @@ static int try_auth_userdb_passwd(const char *hmac_flag,
                }
        }
        else
-#endif
        {
                DPRINTF("Trying to change system password for %s",
                        service);