Moving to v3.

[yaz-moved-to-github.git] / server / statserv.c

diff --git a/server/statserv.c b/server/statserv.c
index ccd95f1..5ac15e9 100644 (file)
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: statserv.c,v $
- * Revision 1.18  1995-05-16 08:51:09  quinn
+ * Revision 1.22  1995-06-15 07:45:17  quinn
+ * Moving to v3.
+ *
+ * Revision 1.21  1995/06/06  08:15:40  quinn
+ * Cosmetic.
+ *
+ * Revision 1.20  1995/05/29  08:12:09  quinn
+ * Moved oid to util
+ *
+ * Revision 1.19  1995/05/16  09:37:27  quinn
+ * Fixed bug
+ *
+ * Revision 1.18  1995/05/16  08:51:09  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.17  1995/05/15  11:56:42  quinn
@@ -73,6 +85,8 @@
 #include <sys/wait.h>
 #include <signal.h>
 #include <errno.h>
+#include <sys/types.h>
+#include <pwd.h>
 
 #include <options.h>
 #include <eventl.h>
@@ -100,7 +114,8 @@ static statserv_options_block control_block = {
     PROTO_Z3950,                /* application protocol */
     60,                         /* idle timeout (minutes) */
     1024*1024*4,                /* maximum PDU size (approx.) to allow */
-    "default-config"            /* configuration name to pass to backend */
+    "default-config",           /* configuration name to pass to backend */
+    ""                          /* set user id */
 };
 
 #define DEFAULT_LISTENER "tcp:localhost:9999"
@@ -294,7 +309,8 @@ static void add_listener(char *where, int what)
 
 static void catchchld(int num)
 {
-    while (waitpid(-1, 0, WNOHANG) > 0);
+    while (waitpid(-1, 0, WNOHANG) > 0)
+       ;
     signal(SIGCHLD, catchchld);
 }
 
@@ -318,21 +334,19 @@ int statserv_main(int argc, char **argv)
     int protocol = control_block.default_proto;
 
     me = argv[0];
-    while ((ret = options("a:szSl:v:", argv, argc, &arg)) != -2)
+    while ((ret = options("a:szSl:v:u:", argv, argc, &arg)) != -2)
     {
-       if (!arg)
-           arg = "";
        switch (ret)
        {
            case 0:
                add_listener(arg, protocol);
                listeners++;
                break;
-           case 'z': protocol = CS_Z3950; break;
-           case 's': protocol = CS_SR; break;
+           case 'z': protocol = PROTO_Z3950; break;
+           case 's': protocol = PROTO_SR; break;
            case 'S': control_block.dynamic = 0; break;
            case 'l':
-               strcpy(control_block.logfile, arg);
+               strcpy(control_block.logfile, arg ? arg : "");
                log_init(control_block.loglevel, me, control_block.logfile);
                break;
            case 'v':
@@ -340,9 +354,11 @@ int statserv_main(int argc, char **argv)
                log_init(control_block.loglevel, me, control_block.logfile);
                break;
            case 'a':
-               strcpy(control_block.apdufile, arg); break;
+               strcpy(control_block.apdufile, arg ? arg : ""); break;
+           case 'u':
+               strcpy(control_block.setuid, arg ? arg : ""); break;
            default:
-               fprintf(stderr, "Usage: %s [ -a <apdufile> -v <loglevel> -l <logfile> -zsS <listener-addr> ... ]\n", me);
+               fprintf(stderr, "Usage: %s [ -a <pdufile> -v <loglevel> -l <logfile> -u <user> -zsS <listener-addr> ... ]\n", me);
                exit(1);
        }
     }
@@ -350,6 +366,21 @@ int statserv_main(int argc, char **argv)
        signal(SIGCHLD, catchchld);
     if (!listeners && *control_block.default_listen)
        add_listener(control_block.default_listen, protocol);
+    if (*control_block.setuid)
+    {
+       struct passwd *pw;
+       
+       if (!(pw = getpwnam(control_block.setuid)))
+       {
+           logf(LOG_FATAL|LOG_ERRNO, "%s", control_block.setuid);
+           exit(1);
+       }
+       if (setuid(pw->pw_uid) < 0)
+       {
+           logf(LOG_FATAL|LOG_ERRNO, "setuid");
+           exit(1);
+       }
+    }
     logf(LOG_LOG, "Entering event loop.");
            
     return event_loop();