X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fpasswddb.c;h=445d79f4033f86be32095ca346b641c29a186b87;hb=5437b50633032595afe6f87dc0f989bc92a5aea8;hp=ad14e8ecfb12ce45ff5b202b25842c92fae329b1;hpb=dc017c2fd1686d5a1bb5b04c45f11c69da60421a;p=idzebra-moved-to-github.git

diff --git a/util/passwddb.c b/util/passwddb.c
index ad14e8e..445d79f 100644
--- a/util/passwddb.c
+++ b/util/passwddb.c
@@ -1,27 +1,43 @@
-/*
- * Copyright (C) 1998, Index Data ApS
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: passwddb.c,v $
- * Revision 1.2  1998-06-25 09:55:51  adam
- * Minor changes - fixex headers.
- *
- */
+/* $Id: passwddb.c,v 1.8 2004-11-19 10:27:17 heikki Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+*/
+
+
+#ifdef WIN32
+#else
 #include <unistd.h>
+#endif
 #include <string.h>
 #include <stdio.h>
 
 #ifndef USE_CRYPT
-#define USE_CRYPT 1
+#define USE_CRYPT 0
 #endif
 
 #if USE_CRYPT
 #include <crypt.h>
 #endif
 
-#include <log.h>
-#include <xmalloc.h>
+#include <yaz/ylog.h>
+#include <yaz/xmalloc.h>
 
 #include <passwddb.h>
 
@@ -37,7 +53,7 @@ struct passwd_db {
 
 Passwd_db passwd_db_open (void)
 {
-	struct passwd_db *p = xmalloc (sizeof(*p));
+	struct passwd_db *p = (struct passwd_db *) xmalloc (sizeof(*p));
 	p->entries = 0;
 	return p;
 }
@@ -77,7 +93,7 @@ int passwd_db_file (Passwd_db db, const char *fname)
 		get_entry (&cp, name, 128);
 		get_entry (&cp, des, 128);
 
-		pe = xmalloc (sizeof(*pe));
+		pe = (struct passwd_entry *) xmalloc (sizeof(*pe));
 		pe->name = xstrdup (name);
 		pe->des = xstrdup (des);
 		pe->next = db->entries;
@@ -106,7 +122,7 @@ void passwd_db_show (Passwd_db db)
 {
 	struct passwd_entry *pe;
 	for (pe = db->entries; pe; pe = pe->next)
-		logf (LOG_LOG,"%s:%s", pe->name, pe->des);
+		yaz_log (YLOG_LOG,"%s:%s", pe->name, pe->des);
 }
 
 int passwd_db_auth (Passwd_db db, const char *user, const char *pass)