Merge from branch-2-1

[netatalk.git] / libatalk / acl / unix.c

diff --git a/libatalk/acl/unix.c b/libatalk/acl/unix.c
index c08ae8d6929b5cb241a7c1b3dacf2d03abdb85e8..e290ff34730eab5b6b464270a26637df9f3f86c3 100644 (file)
--- a/libatalk/acl/unix.c
+++ b/libatalk/acl/unix.c
@@ -16,7 +16,7 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#ifdef HAVE_NFSv4_ACLS
+#ifdef HAVE_SOLARIS_ACLS
 
 #include <unistd.h>
 #include <sys/types.h>
@@ -241,10 +241,9 @@ exit:
     if (cacl) free(cacl);
 
     LOG(log_debug, logtype_afpd, "nfsv4_chmod(\"%s/%s\", %04o): result: %u",
-        ret, getcwdpath(), name, mode);
+        getcwdpath(), name, mode, ret);
 
     return ret;
 }
 
-
-#endif /* HAVE_NFSv4_ACLS */
+#endif /* HAVE_SOLARIS_ACLS */