Bump copyright year

[idzebra-moved-to-github.git] / util / passwddb.c

diff --git a/util/passwddb.c b/util/passwddb.c
index f1e9f26..79cd659 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) 2004-2013 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
@@ -21,6 +18,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -57,7 +57,7 @@ Passwd_db passwd_db_open (void)
 }
 
 static int get_entry (const char **p, char *dst, int max)
-{      
+{
     int i = 0;
     while ((*p)[i] != ':' && (*p)[i])
        i++;
@@ -109,7 +109,7 @@ void passwd_db_close(Passwd_db db)
     while (pe)
     {
        struct passwd_entry *pe_next = pe->next;
-       
+
        xfree (pe->name);
        xfree (pe->des);
        xfree (pe);
@@ -135,6 +135,8 @@ int passwd_db_auth(Passwd_db db, const char *user, const char *pass)
            break;
     if (!pe)
        return -1;
+    if (!pass)
+       return -2;
     if (pe->encrypt_flag)
     {
 #if HAVE_CRYPT_H
@@ -142,8 +144,6 @@ int passwd_db_auth(Passwd_db db, const char *user, const char *pass)
         assert(pe->des);
        if (strlen (pe->des) < 3)
            return -3;
-       if (!pass)
-           return -2;
 
         if (pe->des[0] != '$') /* Not MD5? (assume DES) */
         {
@@ -166,7 +166,7 @@ int passwd_db_auth(Passwd_db db, const char *user, const char *pass)
        if (strcmp (pe->des, pass))
            return -2;
     }
-    return 0;  
+    return 0;
 }
 
 int passwd_db_file_crypt(Passwd_db db, const char *fname)
@@ -186,6 +186,7 @@ int passwd_db_file_plain(Passwd_db db, const char *fname)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab