Use proper e-mail address format everywhere.

[doldaconnect.git] / daemon / conf.c

diff --git a/daemon/conf.c b/daemon/conf.c
index 54a79cb..07e408e 100644 (file)
--- a/daemon/conf.c
+++ b/daemon/conf.c
@@ -1,6 +1,6 @@
 /*
  *  Dolda Connect - Modular multiuser Direct Connect-style client
- *  Copyright (C) 2004 Fredrik Tolf (fredrik@dolda2000.com)
+ *  Copyright (C) 2004 Fredrik Tolf <fredrik@dolda2000.com>
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,10 +16,11 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
+
+#include <stdlib.h>
 #include <langinfo.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <malloc.h>
 #include <string.h>
 #include <sys/types.h>
 #include <errno.h>
@@ -370,7 +371,7 @@ void storevar(char *key, void *val, size_t len)
     GDBM_FILE db;
     datum k, v;
     
-    dbname = findfile("dc-vardb", "dc-vardb", NULL, 1);
+    dbname = findfile("dc-vardb", NULL, 1);
     if((db = gdbm_open(dbname, 0, GDBM_WRCREAT, 0666, NULL)) == NULL)
     {
        flog(LOG_CRIT, "could not open var database for writing, cannot continue: %s", gdbm_strerror(gdbm_errno));
@@ -391,7 +392,7 @@ void *fetchvar(char *key, size_t *lenb)
     GDBM_FILE db;
     datum k, v;
     
-    if((dbname = findfile("dc-vardb", "dc-vardb", NULL, 0)) == NULL)
+    if((dbname = findfile("dc-vardb", NULL, 0)) == NULL)
        return(NULL);
     if((db = gdbm_open(dbname, 0, GDBM_READER, 0666, NULL)) == NULL)
        return(NULL);