#include "config.h"
#endif /* HAVE_CONFIG_H */
-#ifdef HAVE_NFSv4_ACLS
+#ifdef HAVE_SOLARIS_ACLS
#include <unistd.h>
#include <sys/types.h>
*retAces = NULL;
/* Only call acl() for regular files and directories, otherwise just return 0 */
- if (lstat(name, &st) != 0)
+ if (lstat(name, &st) != 0) {
+ LOG(log_warning, logtype_afpd, "get_nfsv4_acl(\"%s/%s\"): %s", getcwdpath(), name, strerror(errno));
return -1;
- if ( ! (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode)))
+ }
+
+ if (S_ISLNK(st.st_mode))
+ /* sorry, no ACLs for symlinks */
return 0;
- if ((ace_count = acl(name, ACE_GETACLCNT, 0, NULL)) == 0)
+ if ( ! (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode))) {
+ LOG(log_warning, logtype_afpd, "get_nfsv4_acl(\"%s/%s\"): special", getcwdpath(), name);
return 0;
+ }
+
+ if ((ace_count = acl(name, ACE_GETACLCNT, 0, NULL)) == 0) {
+ LOG(log_warning, logtype_afpd, "get_nfsv4_acl(\"%s/%s\"): 0 ACEs", getcwdpath(), name);
+ return 0;
+ }
if (ace_count == -1) {
LOG(log_error, logtype_afpd, "get_nfsv4_acl: acl('%s/%s', ACE_GETACLCNT): ace_count %i, error: %s",
{
int ret = -1;
int noaces, nnaces;
- ace_t *oacl = NULL, *nacl = NULL, *cacl;
+ ace_t *oacl = NULL, *nacl = NULL, *cacl = NULL;
LOG(log_debug, logtype_afpd, "nfsv4_chmod(\"%s/%s\", %04o)",
getcwdpath(), name, mode);
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 */