use seteuid instead of setreuid

[unix-history] / usr / src / usr.bin / rdist / docmd.c

diff --git a/usr/src/usr.bin/rdist/docmd.c b/usr/src/usr.bin/rdist/docmd.c
index 60c09bd..4f0decf 100644 (file)
--- a/usr/src/usr.bin/rdist/docmd.c
+++ b/usr/src/usr.bin/rdist/docmd.c
@@ -1,25 +1,45 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ */
+

 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)docmd.c     4.16 (Berkeley) 84/03/13";
-#endif
+static char sccsid[] = "@(#)docmd.c    5.11 (Berkeley) %G%";
+#endif /* not lint */

 
 #include "defs.h"
 #include <setjmp.h>
 
 #include "defs.h"
 #include <setjmp.h>

+#include <netdb.h>

 
 FILE   *lfp;                   /* log file for recording files updated */
 
 FILE   *lfp;                   /* log file for recording files updated */

-struct subcmd *special;        /* list of special commands */
+struct subcmd *subcmds;        /* list of sub-commands for current cmd */

 jmp_buf        env;
 
 jmp_buf        env;
 

-int    cleanup();
-int    lostconn();
+static int      makeconn __P((char *));
+static int      okname __P((char *));
+static void     closeconn __P((void));
+static void     cmptime __P((char *));
+static void     doarrow __P((char **,
+                   struct namelist *, char *, struct subcmd *));
+static void     dodcolon __P((char **,
+                   struct namelist *, char *, struct subcmd *));
+static void     notify __P((char *, char *, struct namelist *, time_t));
+static void     rcmptime __P((struct stat *));

 
 /*
  * Do the commands in cmds (initialized by yyparse).
  */
 
 /*
  * Do the commands in cmds (initialized by yyparse).
  */

-docmds(argc, argv)
+void
+docmds(dhosts, argc, argv)
+       char **dhosts;

        int argc;
        char **argv;
 {
        register struct cmd *c;
        int argc;
        char **argv;
 {
        register struct cmd *c;

+       register struct namelist *f;
+       register char **cpp;

        extern struct cmd *cmds;
 
        signal(SIGHUP, cleanup);
        extern struct cmd *cmds;
 
        signal(SIGHUP, cleanup);


@@ -28,12 +48,34 @@ docmds(argc, argv)
        signal(SIGTERM, cleanup);
 
        for (c = cmds; c != NULL; c = c->c_next) {
        signal(SIGTERM, cleanup);
 
        for (c = cmds; c != NULL; c = c->c_next) {

+               if (dhosts != NULL && *dhosts != NULL) {
+                       for (cpp = dhosts; *cpp; cpp++)
+                               if (strcmp(c->c_name, *cpp) == 0)
+                                       goto fndhost;
+                       continue;
+               }
+       fndhost:
+               if (argc) {
+                       for (cpp = argv; *cpp; cpp++) {
+                               if (c->c_label != NULL &&
+                                   strcmp(c->c_label, *cpp) == 0) {
+                                       cpp = NULL;
+                                       goto found;
+                               }
+                               for (f = c->c_files; f != NULL; f = f->n_next)
+                                       if (strcmp(f->n_name, *cpp) == 0)
+                                               goto found;
+                       }
+                       continue;
+               } else
+                       cpp = NULL;
+       found:

                switch (c->c_type) {
                case ARROW:
                switch (c->c_type) {
                case ARROW:

-                       doarrow(c->c_files, c->c_name, c->c_cmds);
+                       doarrow(cpp, c->c_files, c->c_name, c->c_cmds);

                        break;
                case DCOLON:
                        break;
                case DCOLON:

-                       dodcolon(c->c_files, c->c_name, c->c_cmds);
+                       dodcolon(cpp, c->c_files, c->c_name, c->c_cmds);

                        break;
                default:
                        fatal("illegal command type %d\n", c->c_type);
                        break;
                default:
                        fatal("illegal command type %d\n", c->c_type);


@@ -45,14 +87,17 @@ docmds(argc, argv)
 /*
  * Process commands for sending files to other machines.
  */
 /*
  * Process commands for sending files to other machines.
  */

-doarrow(files, rhost, cmds)
+static void
+doarrow(filev, files, rhost, cmds)
+       char **filev;

        struct namelist *files;
        char *rhost;
        struct subcmd *cmds;
 {
        register struct namelist *f;
        register struct subcmd *sc;
        struct namelist *files;
        char *rhost;
        struct subcmd *cmds;
 {
        register struct namelist *f;
        register struct subcmd *sc;

-       int n, ddir;
+       register char **cpp;
+       int n, ddir, opts = options;

 
        if (debug)
                printf("doarrow(%x, %s, %x)\n", files, rhost, cmds);
 
        if (debug)
                printf("doarrow(%x, %s, %x)\n", files, rhost, cmds);


@@ -61,39 +106,32 @@ doarrow(files, rhost, cmds)
                error("no files to be updated\n");
                return;
        }
                error("no files to be updated\n");
                return;
        }

-       if (!mkexceptlist(cmds))
-               return;
-       special = cmds;

 
 

+       subcmds = cmds;

        ddir = files->n_next != NULL;   /* destination is a directory */
        ddir = files->n_next != NULL;   /* destination is a directory */

-

        if (nflag)
                printf("updating host %s\n", rhost);
        else {
        if (nflag)
                printf("updating host %s\n", rhost);
        else {

-               if (setjmp(env) != 0)
+               if (setjmp(env))

                        goto done;
                signal(SIGPIPE, lostconn);
                if (!makeconn(rhost))
                        return;
                        goto done;
                signal(SIGPIPE, lostconn);
                if (!makeconn(rhost))
                        return;

-               if ((lfp = fopen(tmpfile, "w")) == NULL) {
-                       fatal("cannot open %s\n", tmpfile);
+               if ((lfp = fopen(tempfile, "w")) == NULL) {
+                       fatal("cannot open %s\n", tempfile);

                        exit(1);
                }
        }
        for (f = files; f != NULL; f = f->n_next) {
                        exit(1);
                }
        }
        for (f = files; f != NULL; f = f->n_next) {

-#ifdef notdef
-               if (filec) {
-                       register char **cpp;
-
+               if (filev) {

                        for (cpp = filev; *cpp; cpp++)
                        for (cpp = filev; *cpp; cpp++)

-                               if (!strcmp(f->b_name, *cpp))
+                               if (strcmp(f->n_name, *cpp) == 0)

                                        goto found;
                        if (!nflag)
                                (void) fclose(lfp);
                        continue;
                }
        found:
                                        goto found;
                        if (!nflag)
                                (void) fclose(lfp);
                        continue;
                }
        found:

-#endif

                n = 0;
                for (sc = cmds; sc != NULL; sc = sc->sc_next) {
                        if (sc->sc_type != INSTALL)
                n = 0;
                for (sc = cmds; sc != NULL; sc = sc->sc_next) {
                        if (sc->sc_type != INSTALL)


@@ -101,70 +139,100 @@ doarrow(files, rhost, cmds)
                        n++;
                        install(f->n_name, sc->sc_name,
                                sc->sc_name == NULL ? 0 : ddir, sc->sc_options);
                        n++;
                        install(f->n_name, sc->sc_name,
                                sc->sc_name == NULL ? 0 : ddir, sc->sc_options);

+                       opts = sc->sc_options;

                }
                if (n == 0)
                        install(f->n_name, NULL, 0, options);
        }
 done:
        if (!nflag) {
                }
                if (n == 0)
                        install(f->n_name, NULL, 0, options);
        }
 done:
        if (!nflag) {

-               (void) signal(SIGPIPE, SIG_DFL);
+               (void) signal(SIGPIPE, cleanup);

                (void) fclose(lfp);
                lfp = NULL;
        }
        for (sc = cmds; sc != NULL; sc = sc->sc_next)
                if (sc->sc_type == NOTIFY)
                (void) fclose(lfp);
                lfp = NULL;
        }
        for (sc = cmds; sc != NULL; sc = sc->sc_next)
                if (sc->sc_type == NOTIFY)

-                       notify(tmpfile, rhost, sc->sc_args, 0);
-       if (!nflag)
-               (void) unlink(tmpfile);
+                       notify(tempfile, rhost, sc->sc_args, 0);
+       if (!nflag) {
+               (void) unlink(tempfile);
+               for (; ihead != NULL; ihead = ihead->nextp) {
+                       free(ihead);
+                       if ((opts & IGNLNKS) || ihead->count == 0)
+                               continue;
+                       log(lfp, "%s: Warning: missing links\n",
+                               ihead->pathname);
+               }
+       }

 }
 
 /*
  * Create a connection to the rdist server on the machine rhost.
  */
 }
 
 /*
  * Create a connection to the rdist server on the machine rhost.
  */

+static int

 makeconn(rhost)
        char *rhost;
 {
        register char *ruser, *cp;
        static char *cur_host = NULL;
 makeconn(rhost)
        char *rhost;
 {
        register char *ruser, *cp;
        static char *cur_host = NULL;

+       static int port = -1;
+       char tuser[20];

        int n;
        extern char user[];
        int n;
        extern char user[];

+       extern int userid;

 
        if (debug)
                printf("makeconn(%s)\n", rhost);
 
 
        if (debug)
                printf("makeconn(%s)\n", rhost);
 

-       if (cur_host != NULL && strcmp(cur_host, rhost) == 0)
-               return(1);
-
-       closeconn();
-
-       ruser = rindex(rhost, '.');
-       if (ruser != NULL) {
-               *ruser++ = '\0';
-               if (!okname(ruser))
+       if (cur_host != NULL && rem >= 0) {
+               if (strcmp(cur_host, rhost) == 0)
+                       return(1);
+               closeconn();
+       }
+       cur_host = rhost;
+       cp = index(rhost, '@');
+       if (cp != NULL) {
+               char c = *cp;
+
+               *cp = '\0';
+               strncpy(tuser, rhost, sizeof(tuser)-1);
+               *cp = c;
+               rhost = cp + 1;
+               ruser = tuser;
+               if (*ruser == '\0')
+                       ruser = user;
+               else if (!okname(ruser))

                        return(0);
        } else
                ruser = user;
        if (!qflag)
                printf("updating host %s\n", rhost);
                        return(0);
        } else
                ruser = user;
        if (!qflag)
                printf("updating host %s\n", rhost);

-       cur_host = rhost;
-       (void) sprintf(buf, "/usr/local/rdist -Server%s", qflag ? " -q" : "");
+       (void) sprintf(buf, "%s -Server%s", _PATH_RDIST, qflag ? " -q" : "");
+       if (port < 0) {
+               struct servent *sp;
+
+               if ((sp = getservbyname("shell", "tcp")) == NULL)
+                       fatal("shell/tcp: unknown service");
+               port = sp->s_port;
+       }

 
        if (debug) {
 
        if (debug) {

-               printf("luser = %s, ruser = %s\n", user, ruser);
+               printf("port = %d, luser = %s, ruser = %s\n", ntohs(port), user, ruser);

                printf("buf = %s\n", buf);
        }
 
        fflush(stdout);
                printf("buf = %s\n", buf);
        }
 
        fflush(stdout);

-       rem = rcmd(&rhost, IPPORT_CMDSERVER, user, ruser, buf, 0);
+       seteuid(0);
+       rem = rcmd(&rhost, port, user, ruser, buf, 0);
+       setreuid(0, userid);

        if (rem < 0)
                return(0);
        cp = buf;
        if (read(rem, cp, 1) != 1)
        if (rem < 0)
                return(0);
        cp = buf;
        if (read(rem, cp, 1) != 1)

-               lostconn();
+               lostconn(0);

        if (*cp == 'V') {
                do {
                        if (read(rem, cp, 1) != 1)
        if (*cp == 'V') {
                do {
                        if (read(rem, cp, 1) != 1)

-                               lostconn();
+                               lostconn(0);

                } while (*cp++ != '\n' && cp < &buf[BUFSIZ]);
                *--cp = '\0';
                cp = buf;
                } while (*cp++ != '\n' && cp < &buf[BUFSIZ]);
                *--cp = '\0';
                cp = buf;


@@ -173,14 +241,22 @@ makeconn(rhost)
                        n = (n * 10) + (*cp++ - '0');
                if (*cp == '\0' && n == VERSION)
                        return(1);
                        n = (n * 10) + (*cp++ - '0');
                if (*cp == '\0' && n == VERSION)
                        return(1);

+               error("connection failed: version numbers don't match (local %d, remote %d)\n", VERSION, n);
+       } else {
+               error("connection failed: version numbers don't match\n");
+               error("got unexpected input:");
+               do {
+                       error("%c", *cp);
+               } while (*cp != '\n' && read(rem, cp, 1) == 1);

        }
        }

-       error("connection failed: version numbers don't match\n");
+       closeconn();

        return(0);
 }
 
 /*
  * Signal end of previous connection.
  */
        return(0);
 }
 
 /*
  * Signal end of previous connection.
  */

+static void

 closeconn()
 {
        if (debug)
 closeconn()
 {
        if (debug)


@@ -193,13 +269,17 @@ closeconn()
        }
 }
 
        }
 }
 

-lostconn()
+void
+lostconn(signo)
+       int signo;

 {
 {

-       fflush(stdout);
-       fprintf(stderr, "rdist: lost connection\n");
+       if (iamremote)
+               cleanup(0);
+       log(lfp, "rdist: lost connection\n");

        longjmp(env, 1);
 }
 
        longjmp(env, 1);
 }
 

+static int

 okname(name)
        register char *name;
 {
 okname(name)
        register char *name;
 {


@@ -227,7 +307,9 @@ extern      char target[], *tp;
 /*
  * Process commands for comparing files to time stamp files.
  */
 /*
  * Process commands for comparing files to time stamp files.
  */

-dodcolon(files, stamp, cmds)
+static void
+dodcolon(filev, files, stamp, cmds)
+       char **filev;

        struct namelist *files;
        char *stamp;
        struct subcmd *cmds;
        struct namelist *files;
        char *stamp;
        struct subcmd *cmds;


@@ -246,22 +328,20 @@ dodcolon(files, stamp, cmds)
                error("no files to be updated\n");
                return;
        }
                error("no files to be updated\n");
                return;
        }

-       if (!mkexceptlist(cmds))
-               return;
-

        if (stat(stamp, &stb) < 0) {
        if (stat(stamp, &stb) < 0) {

-               error("%s: %s\n", stamp, sys_errlist[errno]);
+               error("%s: %s\n", stamp, strerror(errno));

                return;
        }
        if (debug)
                return;
        }
        if (debug)

-               printf("%s: %d\n", stamp, stb.st_mtime);
+               printf("%s: %ld\n", stamp, stb.st_mtime);

 
 

+       subcmds = cmds;

        lastmod = stb.st_mtime;
        if (nflag || (options & VERIFY))
                tfp = NULL;
        else {
        lastmod = stb.st_mtime;
        if (nflag || (options & VERIFY))
                tfp = NULL;
        else {

-               if ((tfp = fopen(tmpfile, "w")) == NULL) {
-                       error("%s: %s\n", stamp, sys_errlist[errno]);
+               if ((tfp = fopen(tempfile, "w")) == NULL) {
+                       error("%s: %s\n", stamp, strerror(errno));

                        return;
                }
                (void) gettimeofday(&tv[0], &tz);
                        return;
                }
                (void) gettimeofday(&tv[0], &tz);


@@ -270,15 +350,13 @@ dodcolon(files, stamp, cmds)
        }
 
        for (f = files; f != NULL; f = f->n_next) {
        }
 
        for (f = files; f != NULL; f = f->n_next) {

-#ifdef notdef
-               if (filec) {
+               if (filev) {

                        for (cpp = filev; *cpp; cpp++)
                        for (cpp = filev; *cpp; cpp++)

-                               if (!strcmp(b->b_name, *cpp))
+                               if (strcmp(f->n_name, *cpp) == 0)

                                        goto found;
                        continue;
                }
        found:
                                        goto found;
                        continue;
                }
        found:

-#endif

                tp = NULL;
                cmptime(f->n_name);
        }
                tp = NULL;
                cmptime(f->n_name);
        }


@@ -287,14 +365,15 @@ dodcolon(files, stamp, cmds)
                (void) fclose(tfp);
        for (sc = cmds; sc != NULL; sc = sc->sc_next)
                if (sc->sc_type == NOTIFY)
                (void) fclose(tfp);
        for (sc = cmds; sc != NULL; sc = sc->sc_next)
                if (sc->sc_type == NOTIFY)

-                       notify(tmpfile, NULL, sc->sc_args, lastmod);
+                       notify(tempfile, NULL, sc->sc_args, lastmod);

        if (!nflag && !(options & VERIFY))
        if (!nflag && !(options & VERIFY))

-               (void) unlink(tmpfile);
+               (void) unlink(tempfile);

 }
 
 /*
  * Compare the mtime of file to the list of time stamps.
  */
 }
 
 /*
  * Compare the mtime of file to the list of time stamps.
  */

+static void

 cmptime(name)
        char *name;
 {
 cmptime(name)
        char *name;
 {


@@ -303,7 +382,7 @@ cmptime(name)
        if (debug)
                printf("cmptime(%s)\n", name);
 
        if (debug)
                printf("cmptime(%s)\n", name);
 

-       if (inlist(except, name))
+       if (except(name))

                return;
 
        if (nflag) {
                return;
 
        if (nflag) {


@@ -322,7 +401,7 @@ cmptime(name)
                        tp++;
        }
        if (access(name, 4) < 0 || stat(name, &stb) < 0) {
                        tp++;
        }
        if (access(name, 4) < 0 || stat(name, &stb) < 0) {

-               error("%s: %s\n", name, sys_errlist[errno]);
+               error("%s: %s\n", name, strerror(errno));

                return;
        }
 
                return;
        }
 


@@ -343,6 +422,7 @@ cmptime(name)
                log(tfp, "new: %s\n", name);
 }
 
                log(tfp, "new: %s\n", name);
 }
 

+static void

 rcmptime(st)
        struct stat *st;
 {
 rcmptime(st)
        struct stat *st;
 {


@@ -356,7 +436,7 @@ rcmptime(st)
                printf("rcmptime(%x)\n", st);
 
        if ((d = opendir(target)) == NULL) {
                printf("rcmptime(%x)\n", st);
 
        if ((d = opendir(target)) == NULL) {

-               error("%s: %s\n", target, sys_errlist[errno]);
+               error("%s: %s\n", target, strerror(errno));

                return;
        }
        otp = tp;
                return;
        }
        otp = tp;


@@ -386,14 +466,15 @@ rcmptime(st)
  * rhost == NULL if we are mailing a list of changes compared to at time
  * stamp file.
  */
  * rhost == NULL if we are mailing a list of changes compared to at time
  * stamp file.
  */

+static void

 notify(file, rhost, to, lmod)
        char *file, *rhost;
        register struct namelist *to;
        time_t lmod;
 {
        register int fd, len;
 notify(file, rhost, to, lmod)
        char *file, *rhost;
        register struct namelist *to;
        time_t lmod;
 {
        register int fd, len;

-       FILE *pf, *popen();

        struct stat stb;
        struct stat stb;

+       FILE *pf;

 
        if ((options & VERIFY) || to == NULL)
                return;
 
        if ((options & VERIFY) || to == NULL)
                return;


@@ -407,11 +488,11 @@ notify(file, rhost, to, lmod)
                return;
 
        if ((fd = open(file, 0)) < 0) {
                return;
 
        if ((fd = open(file, 0)) < 0) {

-               error("%s: %s\n", file, sys_errlist[errno]);
+               error("%s: %s\n", file, strerror(errno));

                return;
        }
        if (fstat(fd, &stb) < 0) {
                return;
        }
        if (fstat(fd, &stb) < 0) {

-               error("%s: %s\n", file, sys_errlist[errno]);
+               error("%s: %s\n", file, strerror(errno));

                (void) close(fd);
                return;
        }
                (void) close(fd);
                return;
        }


@@ -422,9 +503,10 @@ notify(file, rhost, to, lmod)
        /*
         * Create a pipe to mailling program.
         */
        /*
         * Create a pipe to mailling program.
         */

-       pf = popen(MAILCMD, "w");
+       (void)sprintf(buf, "%s -oi -t", _PATH_SENDMAIL);
+       pf = popen(buf, "w");

        if (pf == NULL) {
        if (pf == NULL) {

-               error("notify: \"%s\" failed\n", MAILCMD);
+               error("notify: \"%s\" failed\n", _PATH_SENDMAIL);

                (void) close(fd);
                return;
        }
                (void) close(fd);
                return;
        }


@@ -459,11 +541,10 @@ notify(file, rhost, to, lmod)
        (void) pclose(pf);
 }
 
        (void) pclose(pf);
 }
 

-struct namelist *except;               /* list of files to exclude */
-

 /*
  * Return true if name is in the list.
  */
 /*
  * Return true if name is in the list.
  */

+int

 inlist(list, file)
        struct namelist *list;
        char *file;
 inlist(list, file)
        struct namelist *list;
        char *file;


@@ -477,35 +558,33 @@ inlist(list, file)
 }
 
 /*
 }
 
 /*

- * Build the exception list from the EXCEPT commands.
+ * Return TRUE if file is in the exception list.

  */
  */

-mkexceptlist(cmds)
-       struct subcmd *cmds;
+int
+except(file)
+       char *file;

 {
 {

-       register struct subcmd *sc;
-       register struct namelist *el, *nl;
+       register struct subcmd *sc;
+       register struct namelist *nl;

 
        if (debug)
 
        if (debug)

-               printf("mkexceptlist()\n");
+               printf("except(%s)\n", file);

 
 

-       except = el = NULL;
-       for (sc = cmds; sc != NULL; sc = sc->sc_next) {
-               if (sc->sc_type != EXCEPT)
+       for (sc = subcmds; sc != NULL; sc = sc->sc_next) {
+               if (sc->sc_type != EXCEPT && sc->sc_type != PATTERN)

                        continue;
                for (nl = sc->sc_args; nl != NULL; nl = nl->n_next) {
                        continue;
                for (nl = sc->sc_args; nl != NULL; nl = nl->n_next) {

-                       if (el == NULL)
-                               except = el = makenl(nl->n_name);
-                       else {
-                               el->n_next = makenl(nl->n_name);
-                               el = el->n_next;
+                       if (sc->sc_type == EXCEPT) {
+                               if (!strcmp(file, nl->n_name))
+                                       return(1);
+                               continue;

                        }
                        }

+                       re_comp(nl->n_name);
+                       if (re_exec(file) > 0)
+                               return(1);

                }
        }
                }
        }

-       if (debug) {
-               printf("except = ");
-               prnames(except);
-       }
-       return(1);
+       return(0);

 }
 
 char *
 }
 
 char *