nad: remove incomplete and unused ACL handling in cp module

Author: rdmark

bin/nad/nad_cp.c

@@ -106,10 +106,6 @@ static int ftw_copy_file(const struct FTW *, const char *, const struct stat *,
 static int ftw_copy_link(const struct FTW *, const char *, const struct stat *,
                          int);
 static int setfile(const struct stat *, int);
-#if 0
-static int preserve_dir_acls(const struct stat *, char *, char *);
-#endif
-static int preserve_fd_acls(int, int);
 
 static void upfunc(void)
 {
@@ -607,13 +603,6 @@ static int copy(const char *path,
 
         if (pflag && setfile(statp, -1)) {
             rval = 1;
-#if 0
-
-            if (preserve_dir_acls(statp, curr->fts_accpath, to.p_path) != 0) {
-                rval = 1;
-            }
-
-#endif
         }
 
         break;
@@ -911,10 +900,6 @@ static int ftw_copy_file(const struct FTW *entp _U_,
         rval = 1;
     }
 
-    if (pflag && preserve_fd_acls(from_fd, to_fd) != 0) {
-        rval = 1;
-    }
-
     if (close(to_fd)) {
         SLOG("%s: %s", to.p_path, strerror(errno));
         rval = 1;
@@ -1027,169 +1012,3 @@ static int setfile(const struct stat *fs, int fd)
 #endif
     return rval;
 }
-
-static int preserve_fd_acls(int source_fd _U_, int dest_fd _U_)
-{
-#if 0
-    acl_t acl;
-    acl_type_t acl_type;
-    int acl_supported = 0, ret, trivial;
-    ret = fpathconf(source_fd, _PC_ACL_NFS4);
-
-    if (ret > 0) {
-        acl_supported = 1;
-        acl_type = ACL_TYPE_NFS4;
-    } else if (ret < 0 && errno != EINVAL) {
-        warn("fpathconf(..., _PC_ACL_NFS4) failed for %s", to.p_path);
-        return 1;
-    }
-
-    if (acl_supported == 0) {
-        ret = fpathconf(source_fd, _PC_ACL_EXTENDED);
-
-        if (ret > 0) {
-            acl_supported = 1;
-            acl_type = ACL_TYPE_ACCESS;
-        } else if (ret < 0 && errno != EINVAL) {
-            warn("fpathconf(..., _PC_ACL_EXTENDED) failed for %s",
-                 to.p_path);
-            return 1;
-        }
-    }
-
-    if (acl_supported == 0) {
-        return 0;
-    }
-
-    acl = acl_get_fd_np(source_fd, acl_type);
-
-    if (acl == NULL) {
-        warn("failed to get acl entries while setting %s", to.p_path);
-        return 1;
-    }
-
-    if (acl_is_trivial_np(acl, &trivial)) {
-        warn("acl_is_trivial() failed for %s", to.p_path);
-        acl_free(acl);
-        return 1;
-    }
-
-    if (trivial) {
-        acl_free(acl);
-        return 0;
-    }
-
-    if (acl_set_fd_np(dest_fd, acl, acl_type) < 0) {
-        warn("failed to set acl entries for %s", to.p_path);
-        acl_free(acl);
-        return 1;
-    }
-
-    acl_free(acl);
-#endif
-    return 0;
-}
-
-#if 0
-static int preserve_dir_acls(const struct stat *fs, char *source_dir,
-                             char *dest_dir)
-{
-    acl_t (*aclgetf)(const char *, acl_type_t);
-    int (*aclsetf)(const char *, acl_type_t, acl_t);
-    struct acl *aclp;
-    acl_t acl;
-    acl_type_t acl_type;
-    int acl_supported = 0, ret, trivial;
-    ret = pathconf(source_dir, _PC_ACL_NFS4);
-
-    if (ret > 0) {
-        acl_supported = 1;
-        acl_type = ACL_TYPE_NFS4;
-    } else if (ret < 0 && errno != EINVAL) {
-        warn("fpathconf(..., _PC_ACL_NFS4) failed for %s", source_dir);
-        return 1;
-    }
-
-    if (acl_supported == 0) {
-        ret = pathconf(source_dir, _PC_ACL_EXTENDED);
-
-        if (ret > 0) {
-            acl_supported = 1;
-            acl_type = ACL_TYPE_ACCESS;
-        } else if (ret < 0 && errno != EINVAL) {
-            warn("fpathconf(..., _PC_ACL_EXTENDED) failed for %s",
-                 source_dir);
-            return 1;
-        }
-    }
-
-    if (acl_supported == 0) {
-        return 0;
-    }
-
-    /*
-     * If the file is a link we will not follow it
-     */
-    if (S_ISLNK(fs->st_mode)) {
-        aclgetf = acl_get_link_np;
-        aclsetf = acl_set_link_np;
-    } else {
-        aclgetf = acl_get_file;
-        aclsetf = acl_set_file;
-    }
-
-    if (acl_type == ACL_TYPE_ACCESS) {
-        /*
-         * Even if there is no ACL_TYPE_DEFAULT entry here, a zero
-         * size ACL will be returned. So it is not safe to simply
-         * check the pointer to see if the default ACL is present.
-         */
-        acl = aclgetf(source_dir, ACL_TYPE_DEFAULT);
-
-        if (acl == NULL) {
-            warn("failed to get default acl entries on %s",
-                 source_dir);
-            return 1;
-        }
-
-        aclp = &acl->ats_acl;
-
-        if (aclp->acl_cnt != 0 && aclsetf(dest_dir,
-                                          ACL_TYPE_DEFAULT, acl) < 0) {
-            warn("failed to set default acl entries on %s",
-                 dest_dir);
-            acl_free(acl);
-            return 1;
-        }
-
-        acl_free(acl);
-    }
-
-    acl = aclgetf(source_dir, acl_type);
-
-    if (acl == NULL) {
-        warn("failed to get acl entries on %s", source_dir);
-        return 1;
-    }
-
-    if (acl_is_trivial_np(acl, &trivial)) {
-        warn("acl_is_trivial() failed on %s", source_dir);
-        acl_free(acl);
-        return 1;
-    }
-
-    if (trivial) {
-        acl_free(acl);
-        return 0;
-    }
-
-    if (aclsetf(dest_dir, acl_type, acl) < 0) {
-        warn("failed to set acl entries on %s", dest_dir);
-        acl_free(acl);
-        return 1;
-    }
-
-    acl_free(acl);
-    return 0;
-}
-#endif