X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=util%2Fpasswddb.c;fp=util%2Fpasswddb.c;h=8f23d5b688f62c4643e59da627b74968839c3837;hp=f3727282cd80840f5e1e3ae2e63452516196cda5;hb=bbdba174c32cd0f6f45781d6123d41186617ba5f;hpb=e14b48004c060bfbb6649e35e635dacd0983ac3e

diff --git a/util/passwddb.c b/util/passwddb.c
index f372728..8f23d5b 100644
--- a/util/passwddb.c
+++ b/util/passwddb.c
@@ -1,4 +1,4 @@
-/* $Id: passwddb.c,v 1.11 2005-05-12 10:10:32 adam Exp $
+/* $Id: passwddb.c,v 1.12 2005-05-30 13:27:08 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -38,6 +38,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <passwddb.h>
 
 struct passwd_entry {
+    int encrypt_flag;
     char *name;
     char *des;
     struct passwd_entry *next;
@@ -70,7 +71,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 +94,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 +102,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 +117,58 @@ 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
     for (pe = db->entries; pe; pe = pe->next)
 	if (user && !strcmp (user, pe->name))
 	    break;
     if (!pe)
 	return -1;
+    if (pe->encrypt_flag)
+    {
 #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;
+	char salt[3];
+	const char *des_try;
+	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;
 #else
-    if (strcmp (pe->des, pass))
 	return -2;
 #endif
+    }
+    else
+    {
+	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);
+}
+