X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=common%2Fdumprmt.c;h=129ce208c4c26d8ce9e82b5ec5a89f2caa1d9d60;hp=4caedfa3384804c3f8ccd6b0f137cd85ac270479;hb=88ac410d747e12ed2c1edd1ed0fdab994de71cf9;hpb=df9ae507502f413c72119dde6ea3d35c91dba5bf diff --git a/common/dumprmt.c b/common/dumprmt.c index 4caedfa..129ce20 100644 --- a/common/dumprmt.c +++ b/common/dumprmt.c @@ -2,7 +2,8 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 + * Stelian Pop , 1999-2000 + * Stelian Pop - Alcôve , 2000-2002 */ /*- @@ -40,30 +41,30 @@ #ifndef lint static const char rcsid[] = - "$Id: dumprmt.c,v 1.6 1999/10/13 09:57:18 stelian Exp $"; + "$Id: dumprmt.c,v 1.21 2002/05/21 15:48:46 stelian Exp $"; #endif /* not lint */ -#ifdef __linux__ -#include -#include -#endif +#include #include #include #include #include #ifdef __linux__ +#include +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include #include -#else -#ifdef sunos +#elif defined sunos #include #include #else #include #endif -#endif #include #include @@ -88,23 +89,26 @@ static const char rcsid[] = #include #endif -#include "pathnames.h" -#include "dump.h" +#include +#include "dump.h" /* for X_STARTUP, X_ABORT etc */ #define TS_CLOSED 0 #define TS_OPEN 1 static int rmtstate = TS_CLOSED; -static int rmtape = -1; +static int tormtape = -1; +static int fromrmtape = -1; +int rshpid = -1; static const char *rmtpeer = 0; static int okname __P((const char *)); static int rmtcall __P((const char *, const char *)); static void rmtconnaborted __P((int)); static int rmtgetb __P((void)); -static void rmtgetconn __P((void)); +static int rmtgetconn __P((void)); static void rmtgets __P((char *, size_t)); static int rmtreply __P((const char *)); +static int piped_child __P((const char **command)); #ifdef KERBEROS int krcmd __P((char **, int /*u_short*/, char *, char *, int *, char *)); #endif @@ -124,10 +128,7 @@ rmthost(const char *host) if ((rmtpeer = strdup(host)) == NULL) rmtpeer = host; signal(SIGPIPE, rmtconnaborted); - rmtgetconn(); - if (rmtape < 0) - return (0); - return (1); + return rmtgetconn(); } static void @@ -157,23 +158,29 @@ rmtconnaborted(int signo) exit(X_ABORT); } -static void +static int rmtgetconn(void) { - register char *cp; - register const char *rmt; + char *cp; + const char *rmt; static struct servent *sp = NULL; static struct passwd *pwd = NULL; const char *tuser; + const char *rsh; int size; int throughput; int on; + char *rmtpeercopy; + + rsh = getenv("RSH"); - if (sp == NULL) { + if (!rsh && sp == NULL) { sp = getservbyname(dokerberos ? "kshell" : "shell", "tcp"); if (sp == NULL) errx(1, "%s/tcp: unknown service", dokerberos ? "kshell" : "shell"); + } + if (pwd == NULL) { pwd = getpwuid(getuid()); if (pwd == NULL) errx(1, "who are you?"); @@ -189,42 +196,71 @@ rmtgetconn(void) if ((rmt = getenv("RMT")) == NULL) rmt = _PATH_RMT; msg(""); + + if (rsh) { + const char *rshcmd[6]; + rshcmd[0] = rsh; + rshcmd[1] = rmtpeer; + rshcmd[2] = "-l"; + rshcmd[3] = tuser; + rshcmd[4] = rmt; + rshcmd[5] = NULL; + + /* Restore the uid and gid. We really don't want + * to execute whatever is put into RSH variable with + * more priviledges than needed... */ + setuid(getuid()); + setgid(getgid()); + + if ((rshpid = piped_child(rshcmd)) < 0) { + msg("cannot open connection\n"); + return 0; + } + } + else { + /* Copy rmtpeer to rmtpeercopy to ignore the + return value from rcmd. I cannot figure if + this is this a bug in rcmd or in my code... */ + rmtpeercopy = (char *)rmtpeer; #ifdef KERBEROS - if (dokerberos) - rmtape = krcmd((char **)&rmtpeer, sp->s_port, tuser, rmt, &errfd, - (char *)0); - else + if (dokerberos) + tormtape = krcmd(&rmtpeercopy, sp->s_port, tuser, rmt, &errfd, + (char *)0); + else #endif - rmtape = rcmd((char **)&rmtpeer, (u_short)sp->s_port, pwd->pw_name, - tuser, rmt, &errfd); - if (rmtape < 0) { - msg("login to %s as %s failed.\n", rmtpeer, tuser); - return; + tormtape = rcmd(&rmtpeercopy, (u_short)sp->s_port, pwd->pw_name, + tuser, rmt, &errfd); + if (tormtape < 0) { + msg("login to %s as %s failed.\n", rmtpeer, tuser); + return 0; + } + size = ntrec * TP_BSIZE; + if (size > 60 * 1024) /* XXX */ + size = 60 * 1024; + /* Leave some space for rmt request/response protocol */ + size += 2 * 1024; + while (size > TP_BSIZE && + setsockopt(tormtape, SOL_SOCKET, SO_SNDBUF, &size, sizeof (size)) < 0) + size -= TP_BSIZE; + (void)setsockopt(tormtape, SOL_SOCKET, SO_RCVBUF, &size, sizeof (size)); + throughput = IPTOS_THROUGHPUT; + if (setsockopt(tormtape, IPPROTO_IP, IP_TOS, + &throughput, sizeof(throughput)) < 0) + perror("IP_TOS:IPTOS_THROUGHPUT setsockopt"); + on = 1; + if (setsockopt(tormtape, IPPROTO_TCP, TCP_NODELAY, &on, sizeof (on)) < 0) + perror("TCP_NODELAY setsockopt"); + fromrmtape = tormtape; } (void)fprintf(stderr, "Connection to %s established.\n", rmtpeer); - size = ntrec * TP_BSIZE; - if (size > 60 * 1024) /* XXX */ - size = 60 * 1024; - /* Leave some space for rmt request/response protocol */ - size += 2 * 1024; - while (size > TP_BSIZE && - setsockopt(rmtape, SOL_SOCKET, SO_SNDBUF, &size, sizeof (size)) < 0) - size -= TP_BSIZE; - (void)setsockopt(rmtape, SOL_SOCKET, SO_RCVBUF, &size, sizeof (size)); - throughput = IPTOS_THROUGHPUT; - if (setsockopt(rmtape, IPPROTO_IP, IP_TOS, - &throughput, sizeof(throughput)) < 0) - perror("IP_TOS:IPTOS_THROUGHPUT setsockopt"); - on = 1; - if (setsockopt(rmtape, IPPROTO_TCP, TCP_NODELAY, &on, sizeof (on)) < 0) - perror("TCP_NODELAY setsockopt"); + return 1; } static int okname(const char *cp0) { - register const char *cp; - register int c; + const char *cp; + int c; for (cp = cp0; *cp; cp++) { c = *cp; @@ -237,11 +273,11 @@ okname(const char *cp0) } int -rmtopen(const char *tape, int mode) +rmtopen(const char *tape, const char *mode) { char buf[MAXPATHLEN]; - (void)snprintf(buf, sizeof (buf), "O%s\n%d\n", tape, mode); + (void)snprintf(buf, sizeof (buf), "O%s\n%s\n", tape, mode); rmtstate = TS_OPEN; return (rmtcall(tape, buf)); } @@ -269,7 +305,7 @@ rmtread(char *buf, size_t count) /* rmtcall() properly sets errno for us on errors. */ return (n); for (i = 0; i < n; i += cc) { - cc = read(rmtape, buf+i, n - i); + cc = read(fromrmtape, buf+i, n - i); if (cc <= 0) rmtconnaborted(0); } @@ -281,9 +317,9 @@ rmtwrite(const char *buf, size_t count) { char line[30]; - (void)snprintf(line, sizeof (line), "W%d\n", count); - write(rmtape, line, strlen(line)); - write(rmtape, buf, count); + (void)snprintf(line, sizeof (line), "W%ld\n", (long)count); + write(tormtape, line, strlen(line)); + write(tormtape, buf, count); return (rmtreply("write")); } @@ -301,8 +337,8 @@ struct mtget mts; struct mtget * rmtstatus(void) { - register int i; - register char *cp; + int i; + char *cp; if (rmtstate != TS_OPEN) return (NULL); @@ -327,7 +363,7 @@ static int rmtcall(const char *cmd, const char *buf) { - if (write(rmtape, buf, strlen(buf)) != strlen(buf)) + if (write(tormtape, buf, strlen(buf)) != strlen(buf)) rmtconnaborted(0); return (rmtreply(cmd)); } @@ -335,7 +371,7 @@ rmtcall(const char *cmd, const char *buf) static int rmtreply(const char *cmd) { - register char *cp; + char *cp; char code[30], emsg[BUFSIZ]; rmtgets(code, sizeof (code)); @@ -365,7 +401,7 @@ rmtgetb(void) { char c; - if (read(rmtape, &c, 1) != 1) + if (read(fromrmtape, &c, 1) != 1) rmtconnaborted(0); return (c); } @@ -374,7 +410,7 @@ rmtgetb(void) static void rmtgets(char *line, size_t len) { - register char *cp = line; + char *cp = line; while (len > 1) { *cp = rmtgetb(); @@ -390,3 +426,56 @@ rmtgets(char *line, size_t len) msg("(rmtgets got \"%s\").\n", line); rmtconnaborted(0); } + +int piped_child(const char **command) { + int pid; + int to_child_pipe[2]; + int from_child_pipe[2]; + + if (pipe (to_child_pipe) < 0) { + msg ("cannot create pipe: %s\n", strerror(errno)); + return -1; + } + if (pipe (from_child_pipe) < 0) { + msg ("cannot create pipe: %s\n", strerror(errno)); + return -1; + } + pid = fork (); + if (pid < 0) { + msg ("cannot fork: %s\n", strerror(errno)); + return -1; + } + if (pid == 0) { + if (dup2 (to_child_pipe[0], STDIN_FILENO) < 0) { + msg ("cannot dup2 pipe: %s\n", strerror(errno)); + exit(1); + } + if (close (to_child_pipe[1]) < 0) { + msg ("cannot close pipe: %s\n", strerror(errno)); + exit(1); + } + if (close (from_child_pipe[0]) < 0) { + msg ("cannot close pipe: %s\n", strerror(errno)); + exit(1); + } + if (dup2 (from_child_pipe[1], STDOUT_FILENO) < 0) { + msg ("cannot dup2 pipe: %s\n", strerror(errno)); + exit(1); + } + setpgid(0, getpid()); + execvp (command[0], (char *const *) command); + msg("cannot exec %s: %s\n", command[0], strerror(errno)); + exit(1); + } + if (close (to_child_pipe[0]) < 0) { + msg ("cannot close pipe: %s\n", strerror(errno)); + return -1; + } + if (close (from_child_pipe[1]) < 0) { + msg ("cannot close pipe: %s\n", strerror(errno)); + return -1; + } + tormtape = to_child_pipe[1]; + fromrmtape = from_child_pipe[0]; + return pid; +}