BSD 4_3_Net_2 release

[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 2456813..cd5aba2 100644 (file)
--- a/usr/src/usr.bin/rdist/docmd.c
+++ b/usr/src/usr.bin/rdist/docmd.c
@@ -1,21 +1,55 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+

 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)docmd.c     4.20 (Berkeley) 84/05/03";
-#endif
+static char sccsid[] = "@(#)docmd.c    5.8 (Berkeley) 3/1/91";
+#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 */
 struct subcmd *subcmds;        /* list of sub-commands for current cmd */
 jmp_buf        env;
 
 
 FILE   *lfp;                   /* log file for recording files updated */
 struct subcmd *subcmds;        /* list of sub-commands for current cmd */
 jmp_buf        env;
 

-int    cleanup();
-int    lostconn();
+void cleanup(), lostconn();

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

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

        int argc;
        char **argv;
 {
        int argc;
        char **argv;
 {


@@ -30,6 +64,13 @@ 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 &&
                if (argc) {
                        for (cpp = argv; *cpp; cpp++) {
                                if (c->c_label != NULL &&


@@ -71,7 +112,7 @@ doarrow(filev, files, rhost, cmds)
        register struct namelist *f;
        register struct subcmd *sc;
        register char **cpp;
        register struct namelist *f;
        register struct subcmd *sc;
        register char **cpp;

-       int n, ddir;
+       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);


@@ -91,8 +132,8 @@ doarrow(filev, files, rhost, cmds)
                signal(SIGPIPE, lostconn);
                if (!makeconn(rhost))
                        return;
                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);
                }
        }
                        exit(1);
                }
        }


@@ -113,6 +154,7 @@ doarrow(filev, 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);
                }
                if (n == 0)
                        install(f->n_name, NULL, 0, options);


@@ -125,9 +167,17 @@ done:
        }
        for (sc = cmds; sc != NULL; sc = sc->sc_next)
                if (sc->sc_type == NOTIFY)
        }
        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);
+               }
+       }

 }
 
 /*
 }
 
 /*


@@ -138,8 +188,11 @@ makeconn(rhost)
 {
        register char *ruser, *cp;
        static char *cur_host = NULL;
 {
        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);


@@ -149,26 +202,42 @@ makeconn(rhost)
                        return(1);
                closeconn();
        }
                        return(1);
                closeconn();
        }

-
-       ruser = rindex(rhost, '.');
-       if (ruser != NULL) {
-               *ruser++ = '\0';
-               if (!okname(ruser))
+       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);

-       (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);

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

        if (rem < 0)
                return(0);
        cp = buf;
        if (rem < 0)
                return(0);
        cp = buf;


@@ -186,8 +255,9 @@ 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\n");
+               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");

        closeconn();
        return(0);
 }
        closeconn();
        return(0);
 }


@@ -207,6 +277,7 @@ closeconn()
        }
 }
 
        }
 }
 

+void

 lostconn()
 {
        if (iamremote)
 lostconn()
 {
        if (iamremote)


@@ -263,7 +334,7 @@ dodcolon(filev, files, stamp, cmds)
                return;
        }
        if (stat(stamp, &stb) < 0) {
                return;
        }
        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)


@@ -274,8 +345,8 @@ dodcolon(filev, files, stamp, cmds)
        if (nflag || (options & VERIFY))
                tfp = NULL;
        else {
        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);


@@ -299,9 +370,9 @@ dodcolon(filev, 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);

 }
 
 /*
 }
 
 /*


@@ -334,7 +405,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;
        }
 


@@ -368,7 +439,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;


@@ -419,11 +490,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;
        }


@@ -434,9 +505,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;
        }