Merge from branch-2-1

diff --git a/etc/afpd/acls.c b/etc/afpd/acls.c
index 9a413be3547fa113574750e58bfa42199087fdae..c8269c6a7fdb2fdf253526744d1d3562b2630805 100644 (file)
--- a/etc/afpd/acls.c
+++ b/etc/afpd/acls.c
@@ -1230,8 +1230,11 @@ int afp_setacl(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size
             ret = set_acl(vol, s_path->u_name, 0, ibuf);
         if (ret == 0)
             ret = AFP_OK;
-        else
+        else {
+            LOG(log_warning, logtype_afpd, "afp_setacl(\"%s/%s\"): error",
+                getcwdpath(), s_path->u_name);
             ret = AFPERR_MISC;
+        }
     }
 
     LOG(log_debug9, logtype_afpd, "afp_setacl: END");

diff --git a/libatalk/acl/uuid.c b/libatalk/acl/uuid.c
index 63d92142b6368893c6ad652d0af6105aae2d17cb..e8b96504c61a4b5f13388fc4197725cb26b27312 100644 (file)
--- a/libatalk/acl/uuid.c
+++ b/libatalk/acl/uuid.c
@@ -24,6 +24,7 @@
 #include <atalk/logger.h>
 #include <atalk/afp.h>
 #include <atalk/uuid.h>
+#include <atalk/util.h>
 
 #include "aclldap.h"
 #include "cache.h"
@@ -158,7 +159,8 @@ int getnamefromuuid( uuidp_t uuidp, char **name, uuidtype_t *type) {
     if (ret == 0) {     /* found in cache */
 #ifdef DEBUG
         uuid_bin2string( uuidp, &uuid_string);
-        LOG(log_debug9, logtype_afpd, "getnamefromuuid{cache}: UUID: %s -> name: %s, type:%s", uuid_string, *name, uuidtype[*type]);
+        LOG(log_debug9, logtype_afpd, "getnamefromuuid{cache}: UUID: %s -> name: %s, type:%s",
+            uuid_string, *name, uuidtype[*type]);
         free(uuid_string);
         uuid_string = NULL;
 #endif
@@ -166,11 +168,13 @@ int getnamefromuuid( uuidp_t uuidp, char **name, uuidtype_t *type) {
         uuid_bin2string( uuidp, &uuid_string);
         ret = ldap_getnamefromuuid( uuid_string, name, type);
         if (ret != 0) {
-            LOG(log_error, logtype_afpd, "getnamefromuuid: no result from ldap_getnamefromuuid");
+            LOG(log_warning, logtype_afpd, "getnamefromuuid(%s): no result from ldap_getnamefromuuid",
+                uuid_string);
             goto cleanup;
         }
         add_cachebyuuid( uuidp, *name, *type, 0);
-        LOG(log_debug, logtype_afpd, "getnamefromuuid{LDAP}: UUID: %s -> name: %s, type:%s",uuid_string, *name, uuidtype[*type]);
+        LOG(log_debug, logtype_afpd, "getnamefromuuid{LDAP}: UUID: %s -> name: %s, type:%s",
+            uuid_string, *name, uuidtype[*type]);
     }
 
 cleanup: