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
Fix null ptr WRT sortkeys check
[idzebra-moved-to-github.git]
/
util
/
passwddb.c
diff --git
a/util/passwddb.c
b/util/passwddb.c
index
a0f4ddc
..
63375a0
100644
(file)
--- a/
util/passwddb.c
+++ b/
util/passwddb.c
@@
-1,8
+1,5
@@
-/* $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.
+/* This file is part of the Zebra server.
+ Copyright (C) 1994-2011 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
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
@@
-32,6
+29,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <crypt.h>
#endif
#include <crypt.h>
#endif
+#include <assert.h>
#include <yaz/log.h>
#include <yaz/xmalloc.h>
#include <yaz/log.h>
#include <yaz/xmalloc.h>
@@
-127,19
+125,22
@@
void passwd_db_show(Passwd_db db)
int passwd_db_auth(Passwd_db db, const char *user, const char *pass)
{
struct passwd_entry *pe;
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;
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
const char *des_try;
if (pe->encrypt_flag)
{
#if HAVE_CRYPT_H
const char *des_try;
+ assert(pe->des);
if (strlen (pe->des) < 3)
return -3;
if (strlen (pe->des) < 3)
return -3;
- if (!pass)
- return -2;
if (pe->des[0] != '$') /* Not MD5? (assume DES) */
{
if (pe->des[0] != '$') /* Not MD5? (assume DES) */
{
@@
-148,6
+149,7
@@
int passwd_db_auth(Passwd_db db, const char *user, const char *pass)
}
des_try = crypt (pass, pe->des);
}
des_try = crypt (pass, pe->des);
+ assert(des_try);
if (strcmp (des_try, pe->des))
return -2;
#else
if (strcmp (des_try, pe->des))
return -2;
#else
@@
-156,6
+158,8
@@
int passwd_db_auth(Passwd_db db, const char *user, const char *pass)
}
else
{
}
else
{
+ assert(pass);
+ assert(pe->des);
if (strcmp (pe->des, pass))
return -2;
}
if (strcmp (pe->des, pass))
return -2;
}
@@
-179,6
+183,7
@@
int passwd_db_file_plain(Passwd_db db, const char *fname)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab