Imported Debian patch 2.5.1p1-1

[debian/amanda] / client-src / rundump.c

diff --git a/client-src/rundump.c b/client-src/rundump.c
index 26814e6173a93e42a6b087d0f9df47115d319b01..f42ed27803695f0f98894bd88e531a1337a5512c 100644 (file)
--- a/client-src/rundump.c
+++ b/client-src/rundump.c
@@ -24,16 +24,22 @@
  * file named AUTHORS, in the root directory of this distribution.
  */
 /*
- * $Id: rundump.c,v 1.23.2.3.6.1 2002/10/27 14:31:18 martinea Exp $
+ * $Id: rundump.c,v 1.33 2006/07/25 18:27:56 martinea Exp $
  *
  * runs DUMP program as root
+ *
+ * argv[0] is the rundump program name
+ * argv[1] is the config name or NOCONFIG
+ * argv[2] will be argv[0] of the DUMP program
+ * ...
  */
 #include "amanda.h"
 #include "version.h"
 
-int main P((int argc, char **argv));
+int main(int argc, char **argv);
 
 #if defined(VDUMP) || defined(XFSDUMP)
+#  undef USE_RUNDUMP
 #  define USE_RUNDUMP
 #endif
 
@@ -47,33 +53,32 @@ int main P((int argc, char **argv));
 #  endif
 #endif
 
-int main(argc, argv)
-int argc;
-char **argv;
+int
+main(
+    int                argc,
+    char **    argv)
 {
 #ifndef ERRMSG
     char *dump_program;
     int i;
     char *e;
 #endif /* ERRMSG */
-    int fd;
-
-    for(fd = 3; fd < FD_SETSIZE; fd++) {
-       /*
-        * Make sure nobody spoofs us with a lot of extra open files
-        * that would cause an open we do to get a very high file
-        * descriptor, which in turn might be used as an index into
-        * an array (e.g. an fd_set).
-        */
-       close(fd);
-    }
 
+    safe_fd(-1, 0);
     safe_cd();
 
     set_pname("rundump");
 
-    dbopen();
-    dbprintf(("%s: version %s\n", argv[0], version()));
+    /* Don't die when child closes pipe */
+    signal(SIGPIPE, SIG_IGN);
+
+    dbopen(DBG_SUBDIR_CLIENT);
+    if (argc < 3) {
+       error("%s: Need at least 3 arguments\n", debug_prefix(NULL));
+       /*NOTREACHED*/
+    }
+
+    dbprintf(("%s: version %s\n", debug_prefix(NULL), version()));
 
 #ifdef ERRMSG                                                  /* { */
 
@@ -86,15 +91,18 @@ char **argv;
 
     if(client_uid == (uid_t) -1) {
        error("error [cannot find user %s in passwd file]\n", CLIENT_LOGIN);
+       /*NOTREACHED*/
     }
 
 #ifdef FORCE_USERID
     if (getuid() != client_uid) {
        error("error [must be invoked by %s]\n", CLIENT_LOGIN);
+       /*NOTREACHED*/
     }
 
     if (geteuid() != 0) {
        error("error [must be setuid root]\n");
+       /*NOTREACHED*/
     }
 #endif /* FORCE_USERID */
 
@@ -102,6 +110,16 @@ char **argv;
     setuid(0);
 #endif
 
+    /* skip argv[0] */
+    argc--;
+    argv++;
+
+    dbprintf(("config: %s\n", argv[0]));
+    if (strcmp(argv[0], "NOCONFIG") != 0)
+       dbrename(argv[0], DBG_SUBDIR_CLIENT);
+    argc--;
+    argv++;
+
 #ifdef XFSDUMP
 
     if (strcmp(argv[0], "xfsdump") == 0)
@@ -148,7 +166,7 @@ char **argv;
     execve(dump_program, argv, safe_env());
 
     e = strerror(errno);
-    dbprintf(("execve of %s failed (%s)\n", dump_program, e));
+    dbprintf(("failed (%s)\n", e));
     dbclose();
 
     fprintf(stderr, "rundump: could not exec %s: %s\n", dump_program, e);