* helper function
********************************************************/
-static int dumpcache() {
+void uuidcache_dump(void) {
int i;
int ret = 0;
cacheduser_t *entry;
continue;
if (strftime(timestr, 200, "%c", tmp) == 0)
continue;
- LOG(log_debug9, logtype_default, "namecache{%d}: name:%s, uuid:%s, type: %s, cached: %s",
- i, entry->name, uuid_bin2string(entry->uuid), uuidtype[entry->type], timestr);
+ LOG(log_debug, logtype_default,
+ "namecache{%d}: name:%s, uuid:%s, type%s: %s, cached: %s",
+ i,
+ entry->name,
+ uuid_bin2string(entry->uuid),
+ (entry->type & UUID_ENOENT) == UUID_ENOENT ? "[negative]" : "",
+ uuidtype[entry->type & UUIDTYPESTR_MASK],
+ timestr);
} while ((entry = entry->next) != NULL);
}
}
continue;
if (strftime(timestr, 200, "%c", tmp) == 0)
continue;
- LOG(log_debug9, logtype_default, "uuidcache{%d}: uuid:%s, name:%s, type: %s, cached: %s",
- i, uuid_bin2string(entry->uuid), entry->name, uuidtype[entry->type], timestr);
+ LOG(log_debug, logtype_default,
+ "uuidcache{%d}: uuid:%s, name:%s, type%s: %s, cached: %s",
+ i,
+ uuid_bin2string(entry->uuid),
+ entry->name,
+ (entry->type & UUID_ENOENT) == UUID_ENOENT ? "[negative]" : "",
+ uuidtype[entry->type & UUIDTYPESTR_MASK],
+ timestr);
} while ((entry = entry->next) != NULL);
}
}
-
- return ret;
}
/* hash string it into unsigned char */
cacheduser_t *cacheduser = NULL;
unsigned char hash;
-#ifdef DEBUG
- dumpcache();
-#endif
-
/* allocate mem and copy values */
name = malloc(strlen(inname)+1);
if (!name) {
free(cacheduser);
}
-#ifdef DEBUG
- dumpcache();
-#endif
-
return ret;
}
-/*
- * Caller provides buffer uuid for result
+/*!
+ * Search cache by name and uuid type
+ *
+ * @args name (r) name to search
+ * @args type (rw) type (user or group) of name, returns found type here which might
+ * mark it as a negative entry
+ * @args uuid (w) found uuid is returned here
+ * @returns 0 on sucess, entry found
+ * -1 no entry found
*/
-int search_cachebyname( const char *name, uuidtype_t type, uuidp_t uuid) {
+int search_cachebyname(const char *name, uuidtype_t *type, uuidp_t uuid) {
int ret;
unsigned char hash;
cacheduser_t *entry;
time_t tim;
-#ifdef DEBUG
- dumpcache();
-#endif
-
hash = hashstring((unsigned char *)name);
if (namecache[hash] == NULL)
entry = namecache[hash];
while (entry) {
ret = strcmp(entry->name, name);
- if (ret == 0 && type == entry->type) {
+ if (ret == 0 && *type == (entry->type & UUIDTYPESTR_MASK)) {
/* found, now check if expired */
tim = time(NULL);
if ((tim - entry->creationtime) > CACHESECONDS) {
- LOG(log_debug, logtype_default, "search_cachebyname: expired: name:\'%s\' in queue {%d}", entry->name, hash);
+ LOG(log_debug, logtype_default, "search_cachebyname: expired: name:\"%s\"", entry->name);
/* remove item */
if (entry->prev) {
/* 2nd to last in queue */
free(entry->name);
free(entry->uuid);
free(entry);
-#ifdef DEBUG
- dumpcache();
-#endif
return -1;
} else {
memcpy(uuid, entry->uuid, UUID_BINSIZE);
-#ifdef DEBUG
- dumpcache();
-#endif
+ *type = entry->type;
return 0;
}
}
entry = entry->next;
}
-#ifdef DEBUG
- dumpcache();
-#endif
+
return -1;
}
cacheduser_t *entry;
time_t tim;
-#ifdef DEBUG
- dumpcache();
-#endif
-
hash = hashuuid(uuidp);
if (! uuidcache[hash])
free(entry->name);
free(entry->uuid);
free(entry);
-#ifdef DEBUG
- dumpcache();
-#endif
return -1;
} else {
*name = malloc(strlen(entry->name)+1);
strcpy(*name, entry->name);
*type = entry->type;
-#ifdef DEBUG
- dumpcache();
-#endif
return 0;
}
}
entry = entry->next;
}
-#ifdef DEBUG
- dumpcache();
-#endif
-
return -1;
}
cacheduser_t *entry;
unsigned char hash;
-#ifdef DEBUG
- dumpcache();
-#endif
-
/* allocate mem and copy values */
name = malloc(strlen(inname)+1);
if (!name) {
free(cacheduser);
}
-#ifdef DEBUG
- dumpcache();
-#endif
-
return ret;
}
#include "aclldap.h"
#include "cache.h"
-char *uuidtype[] = {"NULL","USER", "GROUP", "LOCAL"};
+char *uuidtype[] = {"USER", "GROUP", "LOCAL"};
/********************************************************
* Public helper function
static unsigned char local_group_uuid[] = {0xab, 0xcd, 0xef,
0xab, 0xcd, 0xef,
- 0xab, 0xcd, 0xef,
+ 0xab, 0xcd, 0xef,
0xab, 0xcd, 0xef};
static unsigned char local_user_uuid[] = {0xff, 0xff, 0xee, 0xee, 0xdd, 0xdd,
return;
}
-/*
+/*
* convert ascii string that can include dashes to binary uuid.
* caller must provide a buffer.
*/
}
-/*!
+/*!
* Convert 16 byte binary uuid to neat ascii represantation including dashes.
- *
+ *
* Returns pointer to static buffer.
*/
const char *uuid_bin2string(unsigned char *uuid) {
* type: and type (UUID_USER or UUID_GROUP)
* uuid: pointer to uuid_t storage that the caller must provide
* returns 0 on success !=0 on errror
- */
+ */
int getuuidfromname( const char *name, uuidtype_t type, uuidp_t uuid) {
int ret = 0;
+ uuidtype_t mytype = type;
+ char nulluuid[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0};
#ifdef HAVE_LDAP
char *uuid_string = NULL;
#endif
- ret = search_cachebyname( name, type, uuid);
+
+ ret = search_cachebyname(name, &mytype, uuid);
+
if (ret == 0) {
/* found in cache */
- LOG(log_debug, logtype_afpd, "getuuidfromname{cache}: name: %s, type: %s -> UUID: %s",
- name, uuidtype[type], uuid_bin2string(uuid));
+ LOG(log_debug, logtype_afpd,
+ "getuuidfromname{cache}: name: %s, type%s: %s -> UUID: %s",
+ name,
+ (mytype & UUID_ENOENT) == UUID_ENOENT ? "[negative]" : "",
+ uuidtype[type & UUIDTYPESTR_MASK],
+ uuid_bin2string(uuid));
+ if ((mytype & UUID_ENOENT) == UUID_ENOENT)
+ return -1;
} else {
/* if not found in cache */
#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",
- name, uuidtype[type], uuid_bin2string(uuid));
+ name, uuidtype[type & UUIDTYPESTR_MASK], uuid_bin2string(uuid));
} else {
LOG(log_debug, logtype_afpd, "getuuidfromname(\"%s\",t:%u): no result from ldap search",
name, type);
struct passwd *pwd;
if ((pwd = getpwnam(name)) == NULL) {
LOG(log_error, logtype_afpd, "getuuidfromname(\"%s\",t:%u): unknown user",
- name, uuidtype[type]);
- goto cleanup;
+ name, uuidtype[type & UUIDTYPESTR_MASK]);
+ mytype |= UUID_ENOENT;
+ memcpy(uuid, nulluuid, 16);
+ } else {
+ localuuid_from_id(uuid, UUID_USER, pwd->pw_uid);
+ ret = 0;
+ LOG(log_debug, logtype_afpd, "getuuidfromname{local}: name: %s, type: %s -> UUID: %s",
+ name, uuidtype[type & UUIDTYPESTR_MASK], uuid_bin2string(uuid));
}
- localuuid_from_id(uuid, UUID_USER, pwd->pw_uid);
} else {
struct group *grp;
if ((grp = getgrnam(name)) == NULL) {
LOG(log_error, logtype_afpd, "getuuidfromname(\"%s\",t:%u): unknown user",
- name, uuidtype[type]);
- goto cleanup;
+ name, uuidtype[type & UUIDTYPESTR_MASK]);
+ mytype |= UUID_ENOENT;
+ memcpy(uuid, nulluuid, 16);
+ } else {
+ localuuid_from_id(uuid, UUID_GROUP, grp->gr_gid);
+ ret = 0;
+ LOG(log_debug, logtype_afpd, "getuuidfromname{local}: name: %s, type: %s -> UUID: %s",
+ name, uuidtype[type & UUIDTYPESTR_MASK], uuid_bin2string(uuid));
}
- localuuid_from_id(uuid, UUID_GROUP, grp->gr_gid);
}
- LOG(log_debug, logtype_afpd, "getuuidfromname{local}: name: %s, type: %s -> UUID: %s",
- name, uuidtype[type], uuid_bin2string(uuid));
}
- ret = 0;
- add_cachebyname( name, uuid, type, 0);
+ add_cachebyname(name, uuid, mytype, 0);
}
cleanup:
* Caller must free name appropiately.
*/
int getnamefromuuid(const uuidp_t uuidp, char **name, uuidtype_t *type) {
- int ret;
+ int ret = 0;
+ uid_t uid;
+ gid_t gid;
+ struct passwd *pwd;
+ struct group *grp;
- ret = search_cachebyuuid( uuidp, name, type);
- if (ret == 0) {
+ if (search_cachebyuuid(uuidp, name, type) == 0) {
/* found in cache */
- LOG(log_debug9, logtype_afpd, "getnamefromuuid{cache}: UUID: %s -> name: %s, type:%s",
- uuid_bin2string(uuidp), *name, uuidtype[*type]);
- } else {
- /* not found in cache */
-
- /* Check if UUID is a client local one */
- if (memcmp(uuidp, local_user_uuid, 12) == 0
- || memcmp(uuidp, local_group_uuid, 12) == 0) {
- LOG(log_debug, logtype_afpd, "getnamefromuuid: local UUID: %" PRIu32 "",
- ntohl(*(uint32_t *)(uuidp + 12)));
- *type = UUID_LOCAL;
- *name = strdup("UUID_LOCAL");
- return 0;
+ LOG(log_debug, logtype_afpd,
+ "getnamefromuuid{cache}: UUID: %s -> name: %s, type%s: %s",
+ uuid_bin2string(uuidp),
+ *name,
+ (*type & UUID_ENOENT) == UUID_ENOENT ? "[negative]" : "",
+ uuidtype[(*type) & UUIDTYPESTR_MASK]);
+ if ((*type & UUID_ENOENT) == UUID_ENOENT)
+ return -1;
+ return 0;
+ }
+
+ /* not found in cache */
+
+ /* Check if UUID is a client local one */
+ if (memcmp(uuidp, local_user_uuid, 12) == 0) {
+ *type = UUID_USER;
+ 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, *name, *type, 0);
+ return -1;
+ }
+ *name = pwd->pw_name;
+ add_cachebyuuid(uuidp, *name, *type, 0);
+ return 0;
+ } 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, *name, *type, 0);
+ return -1;
}
+ *name = grp->gr_name;
+ add_cachebyuuid(uuidp, *name, *type, 0);
+ return 0;
+ }
#ifdef HAVE_LDAP
- ret = ldap_getnamefromuuid(uuid_bin2string(uuidp), name, type);
- if (ret != 0) {
- LOG(log_warning, logtype_afpd, "getnamefromuuid(%s): no result from ldap_getnamefromuuid",
- uuid_bin2string(uuidp));
- goto cleanup;
- }
- add_cachebyuuid( uuidp, *name, *type, 0);
- LOG(log_debug, logtype_afpd, "getnamefromuuid{LDAP}: UUID: %s -> name: %s, type:%s",
- uuid_bin2string(uuidp), *name, uuidtype[*type]);
-#endif
+ ret = ldap_getnamefromuuid(uuid_bin2string(uuidp), name, type);
+ if (ret != 0) {
+ LOG(log_warning, logtype_afpd, "getnamefromuuid(%s): no result from ldap_getnamefromuuid",
+ uuid_bin2string(uuidp));
+ *type |= UUID_ENOENT;
+ *name = "UUID_ENOENT";
+ add_cachebyuuid(uuidp, *name, *type, 0);
+ return -1;
}
+#endif
-cleanup:
- return ret;
+ add_cachebyuuid(uuidp, *name, *type, 0);
+
+ LOG(log_debug, logtype_afpd, "getnamefromuuid{LDAP}: UUID: %s -> name: %s, type:%s",
+ uuid_bin2string(uuidp), *name, uuidtype[(*type) & UUIDTYPESTR_MASK]);
+
+ return 0;
}
projects / netatalk.git / commitdiff