Set version to 2.1

[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 236e00de318b59a915fc411bb86b415af0c8e93d..6fda59e95c96afa930cc8a0a09d0169ed573fb3f 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.18 2009-10-18 19:02:43 didg Exp $
+ * $Id: cnid_metad.c,v 1.22 2009-11-16 02:04:47 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -29,13 +29,10 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include <stdlib.h>
-
-#ifdef HAVE_UNISTD_H
-#define __USE_GNU
 #include <unistd.h>
 #undef __USE_GNU
-#endif /* HAVE_UNISTD_H */
+
+#include <stdlib.h>
 #include <sys/param.h>
 #include <errno.h>
 #include <string.h>
@@ -86,14 +83,14 @@
 #define USE_SETRESUID 1
 #define SWITCH_TO_GID(gid)  ((setresgid(gid,gid,gid) < 0 || setgid(gid) < 0) ? -1 : 0)
 #define SWITCH_TO_UID(uid)  ((setresuid(uid,uid,uid) < 0 || setuid(uid) < 0) ? -1 : 0)
-#endif
-#else
+#endif  /* USE_SETRESUID */
+#else   /* ! linux */
 #ifndef USE_SETEUID
 #define USE_SETEUID 1
 #define SWITCH_TO_GID(gid)  ((setegid(gid) < 0 || setgid(gid) < 0) ? -1 : 0)
 #define SWITCH_TO_UID(uid)  ((setuid(uid) < 0 || seteuid(uid) < 0 || setuid(uid) < 0) ? -1 : 0)
-#endif
-#endif
+#endif  /* USE_SETEUID */
+#endif  /* linux */
 
 #include <atalk/util.h>
 #include <atalk/logger.h>
@@ -107,7 +104,6 @@
 
 static int srvfd;
 static int rqstfd;
-static volatile sig_atomic_t alarmed = 0;
 static volatile sig_atomic_t sigchild = 0;
 
 #define MAXSPAWN   3                   /* Max times respawned in.. */
@@ -115,7 +111,7 @@ static volatile sig_atomic_t sigchild = 0;
                                         * to reconnect every 5 secondes, catch it */
 #define MAXVOLS    512
 #define DEFAULTHOST  "localhost"
-#define DEFAULTPORT  4700
+#define DEFAULTPORT  "4700"
 
 struct server {
     char  *name;
@@ -381,10 +377,6 @@ static gid_t group_to_gid ( char *group)
 }
 
 /* ------------------ */
-static void catch_alarm(int sig _U_) {
-    alarmed = 1;
-}
-
 static void catch_child(int sig _U_) 
 {
     sigchild = 1;
@@ -397,7 +389,6 @@ static void set_signal(void)
     sigset_t set;
 
     signal(SIGPIPE, SIG_IGN);
-    signal(SIGALRM, catch_alarm);
 
     sv.sa_handler = catch_child;
     sv.sa_flags = SA_NOCLDSTOP;
@@ -421,7 +412,7 @@ int main(int argc, char *argv[])
     int   status;
     char  *dbdpn = _PATH_CNID_DBD;
     char  *host = DEFAULTHOST;
-    u_int16_t   port = DEFAULTPORT;
+    char  *port = DEFAULTPORT;
     struct db_param *dbp;
     int    i;
     int    cc;
@@ -459,7 +450,7 @@ int main(int argc, char *argv[])
             }
             break;
         case 'p':
-            port = atoi(optarg);
+            port = strdup(optarg);
             break;
         case 's':
             dbdpn = strdup(optarg);
@@ -573,21 +564,13 @@ int main(int argc, char *argv[])
 
         /* TODO: Check out read errors, broken pipe etc. in libatalk. Is
            SIGIPE ignored there? Answer: Ignored for dsi, but not for asp ... */
-        alarm(5); /* to prevent read from getting stuck */
         ret = read(rqstfd, &len, sizeof(int));
-        alarm(0);
-        if (alarmed) {
-            alarmed = 0;
-            LOG(log_severe, logtype_cnid, "Read(1) bailed with alarm (timeout)");
-            goto loop_end;
-        }
-
         if (!ret) {
             /* already close */
             goto loop_end;
         }
         else if (ret < 0) {
-            LOG(log_error, logtype_cnid, "error read: %s", strerror(errno));
+            LOG(log_severe, logtype_cnid, "error read: %s", strerror(errno));
             goto loop_end;
         }
         else if (ret != sizeof(int)) {
@@ -603,12 +586,9 @@ int main(int argc, char *argv[])
             goto loop_end;
         }
 
-        alarm(5);
         actual_len = read(rqstfd, dbdir, len);
-        alarm(0);
-        if (alarmed) {
-            alarmed = 0;
-            LOG(log_severe, logtype_cnid, "Read(2) bailed with alarm (timeout)");
+        if (actual_len < 0) {
+            LOG(log_severe, logtype_cnid, "Read(2) error : %s", strerror(errno));
             goto loop_end;
         }
         if (actual_len != len) {