X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fstatserv.c;h=a692eb233b41a1f45693f869090e67a11f902a52;hb=80c35fec715148c1c4547cf62aa6e2558884611a;hp=c556df9daaefa759ed02d2deb4766e1da4ba50b1;hpb=5f2823e584b4b138886c985bc1490b35aa6cdd4c;p=yaz-moved-to-github.git

diff --git a/server/statserv.c b/server/statserv.c
index c556df9..a692eb2 100644
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -4,7 +4,28 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: statserv.c,v $
- * Revision 1.21  1995-06-06 08:15:40  quinn
+ * Revision 1.28  1995-09-29 17:12:30  quinn
+ * Smallish
+ *
+ * Revision 1.27  1995/09/27  15:03:02  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.26  1995/08/29  14:44:51  quinn
+ * Reset timeouts.
+ *
+ * Revision 1.25  1995/08/29  11:18:02  quinn
+ * Added code to receive close
+ *
+ * Revision 1.24  1995/06/16  10:31:39  quinn
+ * Added session timeout.
+ *
+ * Revision 1.23  1995/06/15  12:30:48  quinn
+ * Setuid-facility.
+ *
+ * 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
@@ -82,6 +103,9 @@
 #include <sys/wait.h>
 #include <signal.h>
 #include <errno.h>
+#include <sys/types.h>
+#include <pwd.h>
+#include <sys/time.h>
 
 #include <options.h>
 #include <eventl.h>
@@ -105,11 +129,12 @@ static statserv_options_block control_block = {
     LOG_DEFAULT_LEVEL,          /* log level */
     "",                         /* no PDUs */
     "",                         /* diagnostic output to stderr */
-    "tcp:localhost:9999",       /* default listener port */
-    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 */
+    "tcp:@:9999",               /* default listener port */
+    PROTO_Z3950,                /* default application protocol */
+    2*60,                       /* idle timeout (minutes) */
+    1024*1024,                  /* maximum PDU size (approx.) to allow */
+    "default-config",           /* configuration name to pass to backend */
+    ""                          /* set user id */
 };
 
 #define DEFAULT_LISTENER "tcp:localhost:9999"
@@ -228,6 +253,7 @@ static void listener(IOCHAN h, int event)
 	    exit(1);
 	}
 	iochan_setdata(new_chan, newas);
+	iochan_settimeout(new_chan, control_block.idle_timeout * 60);
 	logf(LOG_LOG, "accepted connection");
     }
     else
@@ -263,17 +289,20 @@ static void add_listener(char *where, int what)
 	}
 	type = tcpip_type;
     }
-#ifdef USE_XTIMOSI
     else if (!strcmp(mode, "osi"))
     {
+#ifdef USE_XTIMOSI
     	if (!(ap = mosi_strtoaddr(addr)))
     	{
 	    fprintf(stderr, "Address resolution failed for TCP.\n");
 	    exit(1);
 	}
 	type = mosi_type;
-    }
+#else
+	fprintf(stderr, "OSI Transport not allowed by configuration.\n");
+	exit(1);
 #endif
+    }
     else
     {
     	fprintf(stderr, "You must specify either 'osi:' or 'tcp:'.\n");
@@ -328,7 +357,7 @@ 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)
     {
     	switch (ret)
     	{
@@ -349,8 +378,10 @@ int statserv_main(int argc, char **argv)
 		break;
 	    case 'a':
 	    	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);
 	}
     }
@@ -358,6 +389,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, "%s: Unknown user", 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();