Bump year. Change Aps->ApS

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

diff --git a/util/passwddb.c b/util/passwddb.c
index 4595f43..e57eb0d 100644 (file)
--- a/util/passwddb.c
+++ b/util/passwddb.c
@@ -1,17 +1,27 @@
-/*
- * Copyright (C) 1998, Index Data ApS
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: passwddb.c,v $
- * Revision 1.3  1998-06-25 19:16:32  adam
- * Minor changes to Visual C++ project.
- *
- * Revision 1.2  1998/06/25 09:55:51  adam
- * Minor changes - fixex headers.
- *
- */
-#ifdef WINDOWS
+/* $Id: passwddb.c,v 1.10 2005-01-15 19:38:42 adam Exp $
+   Copyright (C) 1995-2005
+   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
@@ -26,8 +36,8 @@
 #include <crypt.h>
 #endif
 
-#include <log.h>
-#include <xmalloc.h>
+#include <yaz/log.h>
+#include <yaz/xmalloc.h>
 
 #include <passwddb.h>
 
@@ -43,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;
 }
@@ -83,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;
@@ -112,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)