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
Do not use old define from proto.h
[idzebra-moved-to-github.git]
/
util
/
passwddb.c
diff --git
a/util/passwddb.c
b/util/passwddb.c
index
f1e9f26
..
61961b6
100644
(file)
--- a/
util/passwddb.c
+++ b/
util/passwddb.c
@@
-1,8
+1,5
@@
-/* $Id: passwddb.c,v 1.17 2007-10-29 08:19:39 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-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
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
@@
-135,6
+132,8
@@
int passwd_db_auth(Passwd_db db, const char *user, const char *pass)
break;
if (!pe)
return -1;
break;
if (!pe)
return -1;
+ if (!pass)
+ return -2;
if (pe->encrypt_flag)
{
#if HAVE_CRYPT_H
if (pe->encrypt_flag)
{
#if HAVE_CRYPT_H
@@
-142,8
+141,6
@@
int passwd_db_auth(Passwd_db db, const char *user, const char *pass)
assert(pe->des);
if (strlen (pe->des) < 3)
return -3;
assert(pe->des);
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) */
{
@@
-186,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