HCoop
/
hcoop
/
debian
/
courier-authlib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hcoop release
[hcoop/debian/courier-authlib.git]
/
authuserdbpwd.c
diff --git
a/authuserdbpwd.c
b/authuserdbpwd.c
index
b49a6b7
..
3a5be7b
100644
(file)
--- a/
authuserdbpwd.c
+++ b/
authuserdbpwd.c
@@
-17,15
+17,12
@@
#endif
#include "userdb/userdb.h"
#include "auth.h"
#endif
#include "userdb/userdb.h"
#include "auth.h"
-#include "authstaticlist.h"
+#include "
courier
authstaticlist.h"
#include "authwait.h"
#include "sbindir.h"
#include "courierauthdebug.h"
#include "authwait.h"
#include "sbindir.h"
#include "courierauthdebug.h"
-#if HAVE_HMACLIB
#include "libhmac/hmac.h"
#include "libhmac/hmac.h"
-#endif
-static const char rcsid[]="$Id: authuserdbpwd.c,v 1.8 2006/10/28 19:22:52 mrsam Exp $";
static int bad(const char *q)
static int bad(const char *q)
@@
-40,8
+37,6
@@
static int bad(const char *q)
}
}
-#if HAVE_HMACLIB
-
static char *hmacpw(const char *pw, const char *hash)
{
int i;
static char *hmacpw(const char *pw, const char *hash)
{
int i;
@@
-70,7
+65,6
@@
static char *hmacpw(const char *pw, const char *hash)
}
return (NULL);
}
}
return (NULL);
}
-#endif
static int dochangepwd1(const char *, const char *, const char *, const char *,
const char *);
static int dochangepwd1(const char *, const char *, const char *, const char *,
const char *);
@@
-105,7
+99,7
@@
int auth_userdb_passwd(const char *service,
errno=EPERM;
DPRINTF("userdb: Invalid service or password string for %s.\n",
uid);
errno=EPERM;
DPRINTF("userdb: Invalid service or password string for %s.\n",
uid);
- return (1);
+ return (
-
1);
}
rc=try_auth_userdb_passwd(NULL, service, uid, opwd_buf, npwd_buf);
}
rc=try_auth_userdb_passwd(NULL, service, uid, opwd_buf, npwd_buf);
@@
-113,8
+107,6
@@
int auth_userdb_passwd(const char *service,
if (rc > 0)
return rc;
if (rc > 0)
return rc;
-#if HAVE_HMACLIB
-
{
int i;
{
int i;
@@
-157,7
+149,6
@@
int auth_userdb_passwd(const char *service,
}
}
}
}
-#endif
if (rc == 0)
{
if (rc == 0)
{
@@
-183,8
+174,6
@@
static int try_auth_userdb_passwd(const char *hmac_flag,
char *npwd;
int rc;
char *npwd;
int rc;
-#if HAVE_HMACLIB
-
if (hmac_flag)
{
DPRINTF("Trying to change password for %s",
if (hmac_flag)
{
DPRINTF("Trying to change password for %s",
@@
-206,7
+195,6
@@
static int try_auth_userdb_passwd(const char *hmac_flag,
}
}
else
}
}
else
-#endif
{
DPRINTF("Trying to change system password for %s",
service);
{
DPRINTF("Trying to change system password for %s",
service);