X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=util%2Fpasswddb.c;h=f3113be09c5026933b89f6ae79960c5328d32238;hp=f3727282cd80840f5e1e3ae2e63452516196cda5;hb=d513d15e315601b730b0b3a6126c3163d00223fb;hpb=46bfcfb367c08f8badb48093b0031cf33fa9d663

diff --git a/util/passwddb.c b/util/passwddb.c
index f372728..f3113be 100644
--- a/util/passwddb.c
+++ b/util/passwddb.c
@@ -1,8 +1,5 @@
-/* $Id: passwddb.c,v 1.11 2005-05-12 10:10:32 adam Exp $
-   Copyright (C) 1995-2005
-   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
@@ -15,12 +12,15 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+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
@@ -32,12 +32,14 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <crypt.h>
 #endif
 
+#include <assert.h>
 #include <yaz/log.h>
 #include <yaz/xmalloc.h>
 
 #include <passwddb.h>
 
 struct passwd_entry {
+    int encrypt_flag;
     char *name;
     char *des;
     struct passwd_entry *next;
@@ -70,7 +72,8 @@ static int get_entry (const char **p, char *dst, int max)
     return i;
 }
 
-int passwd_db_file (Passwd_db db, const char *fname)
+static int passwd_db_file_int(Passwd_db db, const char *fname,
+			      int encrypt_flag)
 {
     FILE *f;
     char buf[1024];
@@ -92,6 +95,7 @@ int passwd_db_file (Passwd_db db, const char *fname)
 	pe = (struct passwd_entry *) xmalloc (sizeof(*pe));
 	pe->name = xstrdup (name);
 	pe->des = xstrdup (des);
+	pe->encrypt_flag = encrypt_flag;
 	pe->next = db->entries;
 	db->entries = pe;
     }
@@ -99,7 +103,7 @@ int passwd_db_file (Passwd_db db, const char *fname)
     return 0;
 }
 
-void passwd_db_close (Passwd_db db)
+void passwd_db_close(Passwd_db db)
 {
     struct passwd_entry *pe = db->entries;
     while (pe)
@@ -114,39 +118,77 @@ void passwd_db_close (Passwd_db db)
     xfree (db);
 }
 
-void passwd_db_show (Passwd_db db)
+void passwd_db_show(Passwd_db db)
 {
     struct passwd_entry *pe;
     for (pe = db->entries; pe; pe = pe->next)
 	yaz_log (YLOG_LOG,"%s:%s", pe->name, pe->des);
 }
 
-int passwd_db_auth (Passwd_db db, const char *user, const char *pass)
+int passwd_db_auth(Passwd_db db, const char *user, const char *pass)
 {
     struct passwd_entry *pe;
-#if HAVE_CRYPT_H
-    char salt[3];
-    const char *des_try;
-#endif
+
+    assert(db);
     for (pe = db->entries; pe; pe = pe->next)
 	if (user && !strcmp (user, pe->name))
 	    break;
     if (!pe)
 	return -1;
-#if HAVE_CRYPT_H
-    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 (strcmp (des_try, pe->des))
-	return -2;
+    if (pe->encrypt_flag)
+    {
+#if HAVE_CRYPT_H
+	const char *des_try;
+        assert(pe->des);
+	if (strlen (pe->des) < 3)
+	    return -3;
+
+        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
-    if (strcmp (pe->des, pass))
 	return -2;
 #endif
+    }
+    else
+    {
+        assert(pass);
+        assert(pe->des);
+	if (strcmp (pe->des, pass))
+	    return -2;
+    }
     return 0;	
 }
 
+int passwd_db_file_crypt(Passwd_db db, const char *fname)
+{
+#if HAVE_CRYPT_H
+    return passwd_db_file_int(db, fname, 1);
+#else
+    return -1;
+#endif
+}
+
+int passwd_db_file_plain(Passwd_db db, const char *fname)
+{
+    return passwd_db_file_int(db, fname, 0);
+}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+