Changeset 2226 in MondoRescue

Timestamp:

Jun 17, 2009, 2:33:36 PM (16 years ago)

Author:

Bruno Cornec

Message:

nfs_user is now a pointer which shows the way to go and avoids setup issue, memory management pb, ...

Location:

branches/2.2.9/mondo/src/common

Files:

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

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

@@ -997 +997 @@
             p--;
             *p = '\0';
-            strcpy(bkpinfo->nfs_user,bkpinfo->nfs_mount);
+            mr_asprintf(q,"%s",bkpinfo->nfs_mount);
+            bkpinfo->nfs_user = q;
             strcpy(bkpinfo->nfs_mount,tmp);
         }

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

@@ -2053 +2053 @@
     log_it("isodir = %s", bkpinfo->isodir);
     log_it("nfs_mount = '%s'", bkpinfo->nfs_mount);
-    if (bkpinfo->nfs_user != NULL) {
+    if (bkpinfo->nfs_user) {
         log_it("nfs_user = '%s'", bkpinfo->nfs_user);
     }

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

@@ -133 +133 @@
     old_stderr[0] = '\0';
 
-    if (bkpinfo->nfs_user != NULL) {
+    if (bkpinfo->nfs_user) {
         mr_asprintf(&tmp1, "su - %s -c \"%s\"", bkpinfo->nfs_user, basic_call);
     } else {

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_user = NULL;
     bkpinfo->nfs_remote_dir[0] = '\0';
     bkpinfo->postnuke_tarball[0] = '\0';
@@ -1410 +1410 @@
         paranoid_free(g_serial_string);
         paranoid_free(g_magicdev_command);
+
+        mr_free(bkpinfo->nfs_user);
     }
 

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

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