X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=common%2Fdumprmt.c;h=941f7dd74163b2fad6d670dc3c2a6815bad8d1d8;hp=db18d328547cb717a37cc586b04b950d68313c62;hb=e46507f206f7adcb8d2e218963d2115236e86604;hpb=0c62667d42afb10ad85e1bbeff43ad2f6a8a4e2a

diff --git a/common/dumprmt.c b/common/dumprmt.c
index db18d32..941f7dd 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 <card@Linux.EU.Org>, 1994-1997
- *	Stelian Pop <pop@cybercable.fr>, 1999
+ *	Stelian Pop <pop@noos.fr>, 1999-2000
+ *	Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
  */
 
 /*-
@@ -40,30 +41,30 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: dumprmt.c,v 1.7 1999/10/30 22:55:50 tiniou Exp $";
+	"$Id: dumprmt.c,v 1.18 2001/08/13 16:17:52 stelian Exp $";
 #endif /* not lint */
 
-#ifdef __linux__
-#include <sys/types.h>
-#include <linux/types.h>
-#endif
+#include <config.h>
 #include <sys/param.h>
 #include <sys/mtio.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #ifdef __linux__
+#include <sys/types.h>
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
 #include <linux/ext2_fs.h>
+#endif
 #include <bsdcompat.h>
 #include <signal.h>
-#else
-#ifdef sunos
+#elif defined sunos
 #include <sys/vnode.h>
 
 #include <ufs/inode.h>
 #else
 #include <ufs/ufs/dinode.h>
 #endif
-#endif
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
@@ -88,8 +89,8 @@ static const char rcsid[] =
 #include <ext2fs/ext2fs.h>
 #endif
 
-#include "pathnames.h"
-#include "dump.h"
+#include <pathnames.h>
+#include "dump.h"	/* for X_STARTUP, X_ABORT etc */
 
 #define	TS_CLOSED	0
 #define	TS_OPEN		1
@@ -97,6 +98,7 @@ static const char rcsid[] =
 static	int rmtstate = TS_CLOSED;
 static	int tormtape = -1;
 static	int fromrmtape = -1;
+int rshpid = -1;
 static	const char *rmtpeer = 0;
 
 static	int okname __P((const char *));
@@ -168,6 +170,7 @@ rmtgetconn(void)
 	int size;
 	int throughput;
 	int on;
+	char *rmtpeercopy;
 
 	rsh = getenv("RSH");
 
@@ -203,19 +206,29 @@ rmtgetconn(void)
 		rshcmd[4] = rmt;
 		rshcmd[5] = NULL;
 
-		if (piped_child(rshcmd) < 0) {
+		/* 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)
-			tormtape = krcmd((char **)&rmtpeer, sp->s_port, tuser, rmt, &errfd,
+			tormtape = krcmd(&rmtpeercopy, sp->s_port, tuser, rmt, &errfd,
 				       (char *)0);
 		else
 #endif
-			tormtape = rcmd((char **)&rmtpeer, (u_short)sp->s_port, pwd->pw_name,
+			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);
@@ -304,7 +317,7 @@ rmtwrite(const char *buf, size_t count)
 {
 	char line[30];
 
-	(void)snprintf(line, sizeof (line), "W%d\n", count);
+	(void)snprintf(line, sizeof (line), "W%ld\n", (long)count);
 	write(tormtape, line, strlen(line));
 	write(tormtape, buf, count);
 	return (rmtreply("write"));
@@ -449,6 +462,7 @@ int piped_child(const char **command) {
 			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);