Changeset 912 in MondoRescue

Timestamp:

Nov 2, 2006, 1:22:57 AM (17 years ago)

Author:

Bruno Cornec

Message:

Attempt to fix #66 (setfacl not existing => no error)

Location:

branches/stable/mondo/src

Files:

• common/libmondo-filelist.c (modified) (3 diffs)
• mondorestore/mondo-restore.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools-EXT.h (modified) (1 diff)
• mondorestore/mondo-rstr-tools.h (modified) (1 diff)

branches/stable/mondo/src/common/libmondo-filelist.c

@@ -645 +645 @@
 
 
-/*
-int set_acl_list(char*masklist, char*acl_fname)
-{
-  char*command;
-  int retval=0;
-  
-  if (length_of_file(acl_fname) <= 0) { return(0); }
-  log_msg(1, "FIXME - not using masklist");  
-  malloc_string(command);
-  if (find_home_of_exe("setfacl"))
-    {
-      sprintf(command, "gzip -dc %s | setfacl --restore - 2>> %s", acl_fname, MONDO_LOGFILE);
-      log_msg(1, "command = %s", command);
-      retval = system(command);
-    }
-  paranoid_free(command);
-  return(retval);
-}
-*/
-
-
-
 int set_EXAT_list(char *orig_msklist, char *original_exat_fname,
                   char *executable)
@@ -820 +798 @@
 int set_fattr_list(char *masklist, char *fattr_fname)
 {
-    return (set_EXAT_list(masklist, fattr_fname, "setfattr"));
+    if (find_home_of_exe("setfattr")) {
+        return (set_EXAT_list(masklist, fattr_fname, "setfattr"));
+    } else {
+        log_msg(1, "ERROR: set_EXAT_list: setfattr doesn't exist");
+        return(0);
+    }
 }
 
@@ -827 +810 @@
 int set_acl_list(char *masklist, char *acl_fname)
 {
-    return (set_EXAT_list(masklist, acl_fname, "setfacl"));
-}
-
-/*
-  if (find_home_of_exe("setfattr"))
-    {
-      sprintf(command, "gzip -dc %s | setfattr --restore - 2>> %s", acl_fname, MONDO_LOGFILE);
-      log_msg(1, "command = %s", command);
-      retval = system(command);
-    }
-  paranoid_free(acl_subset_fname);
-  paranoid_free(syscall_pin);
-  paranoid_free(command);
-  return(retval);
-*/
-
-
-
-
+    if (find_home_of_exe("setfacl")) {
+        return (set_EXAT_list(masklist, acl_fname, "setfacl"));
+    } else {
+        log_msg(1, "ERROR: set_EXAT_list: setfacl doesn't exist");
+        return(0);
+    }
+}
 
 

branches/stable/mondo/src/mondorestore/mondo-restore.c

@@ -2456 +2456 @@
         sprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
         sprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
-        if (length_of_file(acl_fname) > 0 && find_home_of_exe("setfacl")) {
+        if (length_of_file(acl_fname) > 0) {
             set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
         }
-        if (length_of_file(xattr_fname) > 0
-            && find_home_of_exe("setfattr")) {
+        if (length_of_file(xattr_fname) > 0) {
             set_fattr_list(biggies_whose_EXATs_we_should_set, xattr_fname);
         }

branches/stable/mondo/src/mondorestore/mondo-rstr-tools-EXT.h

@@ -10 +10 @@
 extern int modify_rclocal_one_time(char *path);
 extern int mount_cdrom(struct s_bkpinfo *bkpinfo);
-extern int mount_device(char *, char *, char *, bool);
 extern int mount_all_devices(struct mountlist_itself *, bool);
 extern void protect_against_braindead_sysadmins(void);

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.h

@@ -10 +10 @@
 int modify_rclocal_one_time(char *path);
 int mount_cdrom(struct s_bkpinfo *bkpinfo);
-int mount_device(char *, char *, char *, bool);
 int mount_all_devices(struct mountlist_itself *, bool);
 void protect_against_braindead_sysadmins(void);