-/* $Id: passwddb.c,v 1.14 2006-08-14 10:40:34 adam Exp $
- Copyright (C) 1995-2006
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1994-2009 Index Data
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
#include <crypt.h>
#endif
+#include <assert.h>
#include <yaz/log.h>
#include <yaz/xmalloc.h>
int passwd_db_auth(Passwd_db db, const char *user, const char *pass)
{
struct passwd_entry *pe;
+
+ assert(db);
for (pe = db->entries; pe; pe = pe->next)
if (user && !strcmp (user, pe->name))
break;
if (!pe)
return -1;
+ if (!pass)
+ return -2;
if (pe->encrypt_flag)
{
#if HAVE_CRYPT_H
- char salt[3];
const char *des_try;
+ assert(pe->des);
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);
+
+ assert(des_try);
if (strcmp (des_try, pe->des))
return -2;
#else
}
else
{
+ assert(pass);
+ assert(pe->des);
if (strcmp (pe->des, pass))
return -2;
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab