Don't try to run bogus startup scripts.

[tripe] / tripe.c

diff --git a/tripe.c b/tripe.c
index 33a97b7cc98b9e6c91c77fd34f4d7bfd491359b9..adbd7a11e54ab3f298ef9578ee63c28c0be05f36 100644 (file)
--- a/tripe.c
+++ b/tripe.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: tripe.c,v 1.8 2002/01/13 17:28:29 mdw Exp $
+ * $Id: tripe.c,v 1.11 2003/05/17 11:02:03 mdw Exp $
  *
  * Main program
  *
@@ -29,6 +29,15 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: tripe.c,v $
+ * Revision 1.11  2003/05/17 11:02:03  mdw
+ * Document the new `-b' option.
+ *
+ * Revision 1.10  2003/05/16 12:09:03  mdw
+ * Allow binding to a chosen address.
+ *
+ * Revision 1.9  2003/04/15 14:11:09  mdw
+ * Rationalize the behaviour of the `-G' and `-U' options.
+ *
  * Revision 1.8  2002/01/13 17:28:29  mdw
  * Don't turn tracing on if tracing is turned off (!).
  *
@@ -103,7 +112,8 @@ void interval(struct timeval *tv, void *v)
 
 static void usage(FILE *fp)
 {
-  pquis(fp, "Usage: $ [-D] [-p port] [-T trace-opts] [-d dir] [-a socket]\n\
+  pquis(fp, "Usage: $ [-D] [-d dir] [-b addr] [-p port]\n\
+       [-U user] [-G group] [-a socket] [-T trace-opts]\n\
        [-k priv-keyring] [-K pub-keyring] [-t key-tag]\n");
 }
 
@@ -126,7 +136,10 @@ Options:\n\
 \n\
 -D, --daemon           Run in the background.\n\
 -d, --directory=DIR    Switch to directory DIR (default $TRIPEDIR).\n\
+-b, --bind-address=ADDR        Bind UDP socket to this IP ADDR.\n\
 -p, --port=PORT                Select UDP port to listen to.\n\
+-U, --setuid=USER      Set uid to USER after initialization.\n\
+-G, --setgid=GROUP     Set gid to GROUP after initialization.\n\
 -k, --priv-keyring=FILE        Get private key from FILE.\n\
 -K, --pub-keyring=FILE Get public keys from FILE.\n\
 -t, --tag=KEYTAG       Use private key labelled TAG.\n\
@@ -145,6 +158,7 @@ int main(int argc, char *argv[])
   const char *dir = "/var/lib/tripe";
   const char *p;
   unsigned port = 0;
+  struct in_addr baddr = { INADDR_ANY };
   unsigned f = 0;
   uid_t u = -1;
   gid_t g = -1;
@@ -169,6 +183,7 @@ int main(int argc, char *argv[])
       { "setuid",      OPTF_ARGREQ,    0,      'U' },
       { "gid",         OPTF_ARGREQ,    0,      'G' },
       { "setgid",      OPTF_ARGREQ,    0,      'G' },
+      { "bind-address",        OPTF_ARGREQ,    0,      'b' },
       { "port",                OPTF_ARGREQ,    0,      'p' },
       { "directory",   OPTF_ARGREQ,    0,      'd' },
       { "priv-keyring",        OPTF_ARGREQ,    0,      'k' },
@@ -182,7 +197,7 @@ int main(int argc, char *argv[])
       { 0,             0,              0,      0 }
     };
 
-    int i = mdwopt(argc, argv, "hvu DU:G: p:d:k:K:t:a:" T("T:"),
+    int i = mdwopt(argc, argv, "hvu DU:G: b:p:d:k:K:t:a:" T("T:"),
                   opts, 0, 0, 0);
     if (i < 0)
       break;
@@ -201,30 +216,38 @@ int main(int argc, char *argv[])
        f |= f_daemon;
        break;
       case 'U': {
+       struct passwd *pw;
        char *p;
        unsigned long i = strtoul(optarg, &p, 0);
        if (!*p)
-         u = i;
-       else {
-         struct passwd *pw;
-         if ((pw = getpwnam(optarg)) == 0)
-           die(EXIT_FAILURE, "user name `%s' not found", optarg);
-         u = pw->pw_uid;
-       }
+         pw = getpwuid(i);
+       else
+         pw = getpwnam(optarg);
+       if (!pw)
+         die(EXIT_FAILURE, "user `%s' not found", optarg);
+       u = pw->pw_uid;
+       if (g == -1)
+         g = pw->pw_gid;
       } break;
       case 'G': {
+       struct group *gr;
        char *p;
        unsigned long i = strtoul(optarg, &p, 0);
        if (!*p)
-         g = i;
-       else {
-         struct group *gr;
-         if ((gr = getgrnam(optarg)) == 0)
-           die(EXIT_FAILURE, "group name `%s' not found", optarg);
-         g = gr->gr_gid;
-       }
+         gr = getgrgid(i);
+       else
+         gr = getgrnam(optarg);
+       if (!gr)
+         die(EXIT_FAILURE, "group `%s' not found", optarg);
+       g = gr->gr_gid;
+      } break;
+
+      case 'b': {
+       struct hostent *h = gethostbyname(optarg);
+       if (!h)
+         die(EXIT_FAILURE, "unknown host name `%s'", optarg);
+       memcpy(&baddr, h->h_addr, sizeof(struct in_addr));
       } break;
-         
       case 'p': {
        char *p;
        unsigned long i = strtoul(optarg, &p, 0);
@@ -281,16 +304,16 @@ int main(int argc, char *argv[])
   rand_seed(RAND_GLOBAL, RMD160_HASHSZ);
   signal(SIGPIPE, SIG_IGN);
   tun_init();
-  p_init(port);
+  p_init(baddr, port);
   if (!(f & f_daemon))
     a_create(STDIN_FILENO, STDOUT_FILENO);
-  if (g != -1) {
-    if (setgid(g)) {
+  if (g != (gid_t)-1) {
+    if (setgid(g) || (getuid() == 0 && setgroups(1, &g))) {
       die(EXIT_FAILURE, "couldn't setgid to %u: %s",
          (unsigned)g, strerror(errno));
     }
   }
-  if (u != -1) {
+  if (u != (uid_t)-1) {
     if (setuid(u)) {
       die(EXIT_FAILURE, "couldn't setuid to %u: %s",
          (unsigned)u, strerror(errno));