projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Towards 2.0.12
[idzebra-moved-to-github.git]
/
util
/
passwddb.c
diff --git
a/util/passwddb.c
b/util/passwddb.c
index
114da06
..
a0f4ddc
100644
(file)
--- a/
util/passwddb.c
+++ b/
util/passwddb.c
@@
-1,5
+1,5
@@
-/* $Id: passwddb.c,v 1.14 2006-08-14 10:40:34 adam Exp $
- Copyright (C) 1995-2006
+/* $Id: passwddb.c,v 1.16 2007-01-15 15:10:26 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
Index Data ApS
This file is part of the Zebra server.
@@
-135,15
+135,19
@@
int passwd_db_auth(Passwd_db db, const char *user, const char *pass)
if (pe->encrypt_flag)
{
#if HAVE_CRYPT_H
if (pe->encrypt_flag)
{
#if HAVE_CRYPT_H
- char salt[3];
const char *des_try;
if (strlen (pe->des) < 3)
return -3;
if (!pass)
return -2;
const char *des_try;
if (strlen (pe->des) < 3)
return -3;
if (!pass)
return -2;
- memcpy (salt, pe->des, 2);
- salt[2] = '\0';
- des_try = crypt (pass, salt);
+
+ if (pe->des[0] != '$') /* Not MD5? (assume DES) */
+ {
+ if (strlen(pass) > 8) /* maximum key length is 8 */
+ return -2;
+ }
+ des_try = crypt (pass, pe->des);
+
if (strcmp (des_try, pe->des))
return -2;
#else
if (strcmp (des_try, pe->des))
return -2;
#else