cnid_metad don't drop the slot if it's outside the respawn window, reuse it

[netatalk.git] / etc / cnid_dbd / cnid_metad.c

diff --git a/etc/cnid_dbd/cnid_metad.c b/etc/cnid_dbd/cnid_metad.c
index 324505ca162524fa563c15d7622192a70f0cda28..51eed6c27d208ccb3ca9b21db7cbf4513a87f6dd 100644 (file)
--- a/etc/cnid_dbd/cnid_metad.c
+++ b/etc/cnid_dbd/cnid_metad.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_metad.c,v 1.11 2009-05-26 07:16:56 franklahm Exp $
+ * $Id: cnid_metad.c,v 1.17 2009-10-18 18:25:13 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -76,10 +76,6 @@
 #define WTERMSIG(status)      ((status) & 0x7f)
 #endif
 
-#ifdef ATACC
-#define fork aTaC_fork
-#endif
-
 /* functions for username and group */
 #include <pwd.h>
 #include <grp.h>
@@ -99,6 +95,7 @@
 #endif
 #endif
 
+#include <atalk/util.h>
 #include <atalk/logger.h>
 #include <atalk/cnid_dbd_private.h>
 
@@ -110,7 +107,7 @@
 
 static int srvfd;
 static int rqstfd;
-volatile sig_atomic_t alarmed = 0;
+static volatile sig_atomic_t alarmed = 0;
 
 #define MAXSPAWN   3                   /* Max times respawned in.. */
 #define TESTTIME   42                  /* this much seconds apfd client tries to  *
@@ -130,7 +127,7 @@ struct server {
 static struct server srv[MAXVOLS];
 
 /* Default logging config: log to syslog with level log_note */
-static char *logconfig = "default log_note";
+static char logconfig[MAXPATHLEN + 21 + 1] = "default log_note";
 
 static struct server *test_usockfn(char *dir)
 {
@@ -247,11 +244,10 @@ static int maybe_start_dbd(char *dbdpn, char *dbdir, char *usockfn)
             LOG(log_maxdebug, logtype_cnid, "maybe_start_dbd: respawn too fast just exiting");
             return -1; /* just exit, dont sleep, because we might have work to do for another client  */
         }
-        if ( t >= (up->tm + TESTTIME) ) { /* drop slot */
-            LOG(log_maxdebug, logtype_cnid, "maybe_start_dbd: respawn window ended, dropping slot");
-            free(up->name);
-            up->name = NULL;
-            return -1; /* next time we'll try again with a new slot */
+        if ( t >= (up->tm + TESTTIME) ) { /* out of respawn too fast windows reset the count */
+            LOG(log_maxdebug, logtype_cnid, "maybe_start_dbd: respawn window ended");
+            up->tm = t;
+            up->count = 0;
         }
         up->count++;
         LOG(log_maxdebug, logtype_cnid, "maybe_start_dbd: respawn count now is: %u", up->count);
@@ -346,8 +342,7 @@ static int set_dbdir(char *dbdir, int len)
 }
 
 /* ------------------ */
-uid_t user_to_uid ( username )
-    char    *username;
+static uid_t user_to_uid (char *username)
 {
     struct passwd *this_passwd;
 
@@ -366,8 +361,7 @@ uid_t user_to_uid ( username )
 }
 
 /* ------------------ */
-gid_t group_to_gid ( group )
-    char    *group;
+static gid_t group_to_gid ( char *group)
 {
     struct group *this_group;
 
@@ -386,7 +380,7 @@ gid_t group_to_gid ( group )
 }
 
 /* ------------------ */
-void catch_alarm(int sig) {
+static void catch_alarm(int sig _U_) {
     alarmed = 1;
 }
 
@@ -408,10 +402,12 @@ int main(int argc, char *argv[])
     int    err = 0;
     int    debug = 0;
     int    ret;
+    char   *loglevel = NULL;
+    char   *logfile  = NULL;
 
     set_processname("cnid_metad");
 
-    while (( cc = getopt( argc, argv, "ds:p:h:u:g:l:")) != -1 ) {
+    while (( cc = getopt( argc, argv, "ds:p:h:u:g:l:f:")) != -1 ) {
         switch (cc) {
         case 'd':
             debug = 1;
@@ -440,7 +436,10 @@ int main(int argc, char *argv[])
             dbdpn = strdup(optarg);
             break;
         case 'l':
-            logconfig = strdup(optarg);
+            loglevel = strdup(optarg);
+            break;
+        case 'f':
+            logfile = strdup(optarg);
             break;
         default:
             err++;
@@ -448,6 +447,15 @@ int main(int argc, char *argv[])
         }
     }
 
+    if (loglevel) {
+        strlcpy(logconfig + 8, loglevel, 13);
+        free(loglevel);
+        strcat(logconfig, " ");
+    }
+    if (logfile) {
+        strlcat(logconfig, logfile, MAXPATHLEN);
+        free(logfile);
+    }
     setuplog(logconfig);
 
     if (err) {