#ifdef HAVE_LDAP
if ((ret = ldap_getuuidfromname( name, type, &uuid_string)) == 0) {
uuid_string2bin( uuid_string, uuid);
- LOG(log_debug, logtype_afpd, "getuuidfromname{local}: name: %s, type: %s -> UUID: %s",
+ LOG(log_debug, logtype_afpd, "getuuidfromname{LDAP}: name: %s, type: %s -> UUID: %s",
name, uuidtype[type & UUIDTYPESTR_MASK], uuid_bin2string(uuid));
} else {
LOG(log_debug, logtype_afpd, "getuuidfromname(\"%s\",t:%u): no result from ldap search",
* Caller must free name appropiately.
*/
int getnamefromuuid(const uuidp_t uuidp, char **name, uuidtype_t *type) {
- int ret = 0;
+ int ret;
uid_t uid;
gid_t gid;
struct passwd *pwd;
uid = ntohl(*(uint32_t *)(uuidp + 12));
if ((pwd = getpwuid(uid)) == NULL) {
/* not found, add negative entry to cache */
- *type |= UUID_ENOENT;
- *name = "UUID_ENOENT";
+ add_cachebyuuid(uuidp, "UUID_ENOENT", UUID_ENOENT, 0);
+ ret = -1;
+ } else {
+ *name = strdup(pwd->pw_name);
add_cachebyuuid(uuidp, *name, *type, 0);
- return -1;
+ ret = 0;
}
- *name = pwd->pw_name;
- add_cachebyuuid(uuidp, *name, *type, 0);
- return 0;
+ LOG(log_debug, logtype_afpd,
+ "getnamefromuuid{local}: UUID: %s -> name: %s, type:%s",
+ uuid_bin2string(uuidp), *name, uuidtype[(*type) & UUIDTYPESTR_MASK]);
+ return ret;
} else if (memcmp(uuidp, local_group_uuid, 12) == 0) {
*type = UUID_GROUP;
gid = ntohl(*(uint32_t *)(uuidp + 12));
if ((grp = getgrgid(gid)) == NULL) {
/* not found, add negative entry to cache */
- *type |= UUID_ENOENT;
- *name = "UUID_ENOENT";
+ add_cachebyuuid(uuidp, "UUID_ENOENT", UUID_ENOENT, 0);
+ ret = -1;
+ } else {
+ *name = strdup(grp->gr_name);
add_cachebyuuid(uuidp, *name, *type, 0);
- return -1;
+ ret = 0;
}
- *name = grp->gr_name;
- add_cachebyuuid(uuidp, *name, *type, 0);
- return 0;
+ return ret;
}
#ifdef HAVE_LDAP
ret = ldap_getnamefromuuid(uuid_bin2string(uuidp), name, type);
+#else
+ ret = -1;
+#endif
+
if (ret != 0) {
- LOG(log_warning, logtype_afpd, "getnamefromuuid(%s): no result from ldap_getnamefromuuid",
+ LOG(log_debug, logtype_afpd, "getnamefromuuid(%s): not found",
uuid_bin2string(uuidp));
- *type |= UUID_ENOENT;
- *name = "UUID_ENOENT";
- add_cachebyuuid(uuidp, *name, *type, 0);
+ add_cachebyuuid(uuidp, "UUID_ENOENT", UUID_ENOENT, 0);
return -1;
}
-#endif
add_cachebyuuid(uuidp, *name, *type, 0);