Always use lchmod() if it is available.

diff --git a/syscall.c b/syscall.c
index cfabc3ebb23ed9a8757a1aa239371bdb29f277ad..ef182d40ff1102070e60112a149f4d6a0cc85f11 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -152,10 +152,11 @@ int do_chmod(const char *path, mode_t mode)
        int code;
        if (dry_run) return 0;
        RETURN_ERROR_IF_RO_OR_LO;
-       if (S_ISLNK(mode)) {
 #ifdef HAVE_LCHMOD
-               code = lchmod(path, mode & CHMOD_BITS);
-#elif defined HAVE_SETATTRLIST
+       code = lchmod(path, mode & CHMOD_BITS);
+#else
+       if (S_ISLNK(mode)) {
+# if defined HAVE_SETATTRLIST
                struct attrlist attrList;
                uint32_t m = mode & CHMOD_BITS; /* manpage is wrong: not mode_t! */
 
@@ -163,11 +164,12 @@ int do_chmod(const char *path, mode_t mode)
                attrList.bitmapcount = ATTR_BIT_MAP_COUNT;
                attrList.commonattr = ATTR_CMN_ACCESSMASK;
                code = setattrlist(path, &attrList, &m, sizeof m, FSOPT_NOFOLLOW);
-#else
+# else
                code = 1;
-#endif
+# endif
        } else
                code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */
+#endif /* !HAVE_LCHMOD */
        if (code != 0 && (preserve_perms || preserve_executability))
                return code;
        return 0;