Changeset 2224 in MondoRescue for branches/2.2.9/mondo/src

Timestamp:

Jun 17, 2009, 4:43:35 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Add support of user for NFS write and fixes #316

Location:

branches/2.2.9/mondo/src/common

Files:

• libmondo-cli.c (modified) (3 diffs)
• libmondo-devices.c (modified) (5 diffs)
• libmondo-fork.c (modified) (5 diffs)
• libmondo-tools.c (modified) (1 diff)
• mondostructures.h (modified) (1 diff)

branches/2.2.9/mondo/src/common/libmondo-cli.c

@@ -988 +988 @@
             strncpy(bkpinfo->nfs_remote_dir, "/", MAX_STR_LEN);
         }
+        /* test if we specified a user for the NFS dialog */
+        p = strchr(bkpinfo->nfs_mount, '@');
+        if (p != NULL) {
+            /* User found. Store the 2 values */
+            p++;
+            /* new NFS mount */
+            strcpy(tmp,p);
+            p--;
+            *p = '\0';
+            strcpy(bkpinfo->nfs_user,bkpinfo->nfs_mount);
+            strcpy(bkpinfo->nfs_mount,tmp);
+        }
         sprintf(tmp, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3",
                 bkpinfo->nfs_mount);
@@ -1136 +1148 @@
     {
 //      strncpy(psz, list_of_NFS_devices_and_mounts(), MAX_STR_LEN);
-        asprintf(&psz, "%s", list_of_NFS_mounts_only());
+        mr_asprintf(&psz, "%s", list_of_NFS_mounts_only());
         if (bkpinfo->exclude_paths[0]) {
             strncat(bkpinfo->exclude_paths, " ", 4*MAX_STR_LEN);
@@ -1228 +1240 @@
     if ((flag_set['n']) && (! bkpinfo->restore_data)) {
         mr_asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->nfs_remote_dir);
-        sprintf(tmp, "echo hi > %s", tmp1);
+        if (bkpinfo->nfs_user) {
+            sprintf(tmp, "sudo -u %s echo hi > %s", bkpinfo->nfs_user, tmp1);
+        } else {
+            sprintf(tmp, "echo hi > %s", tmp1);
+        }
         if (run_program_and_log_output(tmp, 2)) {
             retval++;

branches/2.2.9/mondo/src/common/libmondo-devices.c

@@ -1283 +1283 @@
     make_hole_for_dir(mountpoint);
 
-#ifndef __FreeBSD__
+#ifdef __FreeBSD__
     char *dev = NULL;
+#else
     char *options = NULL;
     mr_asprintf(&options, "ro");
@@ -1469 +1470 @@
 {
     char *tmp = NULL;
-    char *tmp1 = NULL;
     char *sz_size;
     char *command;
@@ -2053 +2053 @@
     log_it("isodir = %s", bkpinfo->isodir);
     log_it("nfs_mount = '%s'", bkpinfo->nfs_mount);
+    if (bkpinfo->nfs_user != NULL) {
+        log_it("nfs_user = '%s'", bkpinfo->nfs_user);
+    }
 #endif
 
@@ -2101 +2104 @@
     static char result_sz[1024];
 
-    mr_asprintf(exclude_these_directories,"%s",list_of_NFS_mounts_only());
-    mr_asprintf(exclude_these_devices,"%s",
+    mr_asprintf(&exclude_these_directories,"%s",list_of_NFS_mounts_only());
+    mr_asprintf(&exclude_these_devices,"%s",
            call_program_and_get_last_line_of_output
            ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|nfs4|smbfs|cifs|afs|gfs|ocfs|ocfs2|mvfs|nsspool|nsvol) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
-    snprintf(result_sz, "%s %s", exclude_these_directories,
-            exclude_these_devices, 1023);
+    snprintf(result_sz, 1023, "%s %s", exclude_these_directories, exclude_these_devices);
     mr_free(exclude_these_devices);
     mr_free(exclude_these_directories);
@@ -2129 +2131 @@
            call_program_and_get_last_line_of_output
            ("mount -t coda,ncpfs,nfs,nfs4,smbfs,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
-    snprintf(result_sz, "%s", exclude_these_directories, 511);
+    snprintf(result_sz, 511, "%s", exclude_these_directories);
     mr_free(exclude_these_directories);
     return (result_sz);

branches/2.2.9/mondo/src/common/libmondo-fork.c

@@ -7 +7 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "libmondo-fork.h"
@@ -103 +104 @@
         *old_stderr, *cd_number_str;
     char *p;
+    char *tmp1 = NULL;
 
 /*@***********   End Variables ***************************************/
@@ -131 +133 @@
     old_stderr[0] = '\0';
 
+    if (bkpinfo->nfs_user != NULL) {
+        mr_asprintf(&tmp1, "sudo -u %s %s", bkpinfo->nfs_user, basic_call);
+    } else {
+        mr_asprintf(&tmp1, "%s", basic_call);
+    }
+
     sprintf(cd_number_str, "%d", cd_no);
-    resolve_naff_tokens(midway_call, basic_call, isofile, "_ISO_");
+    resolve_naff_tokens(midway_call, tmp1, isofile, "_ISO_");
     resolve_naff_tokens(tmp, midway_call, cd_number_str, "_CD#_");
     resolve_naff_tokens(ultimate_call, tmp, MONDO_LOGFILE, "_ERR_");
-    log_msg(4, "basic call = '%s'", basic_call);
+    log_msg(4, "basic call = '%s'", tmp1);
     log_msg(4, "midway_call = '%s'", midway_call);
     log_msg(4, "tmp = '%s'", tmp);
@@ -169 +177 @@
         }
         if (retval) {
-            log_msg(2, "Basic call '%s' returned an error.", basic_call);
+            log_msg(2, "Basic call '%s' returned an error.", tmp1);
             popup_and_OK("Press ENTER to continue.");
             popup_and_OK
@@ -184 +192 @@
     }
 
+    mr_free(tmp1);
     paranoid_free(midway_call);
     paranoid_free(ultimate_call);

branches/2.2.9/mondo/src/common/libmondo-tools.c

@@ -857 +857 @@
     bkpinfo->kernel_path[0] = '\0';
     bkpinfo->nfs_mount[0] = '\0';
+    bkpinfo->nfs_user[0] = '\0';
     bkpinfo->nfs_remote_dir[0] = '\0';
     bkpinfo->postnuke_tarball[0] = '\0';

branches/2.2.9/mondo/src/common/mondostructures.h

@@ -570 +570 @@
    */
     char nfs_remote_dir[MAX_STR_LEN];
+
+  /**
+   * The potential user to use for NFS backup
+   */
+    char nfs_user[MAX_STR_LEN/4];
 
   /**