From 7985d4fed087c21fe0dd5ac97285cfb6f50f8f34 Mon Sep 17 00:00:00 2001 From: Jan Vidar Krey Date: Fri, 20 Mar 2009 18:54:05 +0100 Subject: [PATCH] Cleanup credentials to string handling Signed-off-by: Jan Vidar Krey --- src/auth.c | 2 +- src/auth.h | 2 ++ src/hubevent.c | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/auth.c b/src/auth.c index 2b4b7c3..9d83aa7 100644 --- a/src/auth.c +++ b/src/auth.c @@ -23,7 +23,7 @@ #define ACL_ADD_BOOL(S, L) do { ret = check_cmd_bool(S, L, line, line_count); if (ret != 0) return ret; } while(0) #define ACL_ADD_ADDR(S, L) do { ret = check_cmd_addr(S, L, line, line_count); if (ret != 0) return ret; } while(0) -static const char* get_user_credential_string(enum user_credentials cred) +const char* get_user_credential_string(enum user_credentials cred) { switch (cred) { diff --git a/src/auth.h b/src/auth.h index 3d5da8a..4fe96b5 100644 --- a/src/auth.h +++ b/src/auth.h @@ -48,6 +48,8 @@ enum user_credentials cred_link, /**<<< "User is a link (not used currently)" */ }; +const char* get_user_credential_string(enum user_credentials cred); + struct user_access_info { char* username; /* name of user, cid or IP range */ diff --git a/src/hubevent.c b/src/hubevent.c index 088ace9..aa65cc6 100644 --- a/src/hubevent.c +++ b/src/hubevent.c @@ -21,9 +21,9 @@ static void log_user_login(struct user* u) { - const char* credentials_string[] = { "", "link", "guest", "user", "operator", "super", "admin" }; + const char* cred = get_user_credential_string(u->credentials); const char* addr = ip_convert_to_string(&u->ipaddr); - hub_log(log_user, "LoginOK %s/%s %s \"%s\" (%s) \"%s\"", sid_to_string(u->id.sid), u->id.cid, addr, u->id.nick, credentials_string[u->credentials], u->user_agent); + hub_log(log_user, "LoginOK %s/%s %s \"%s\" (%s) \"%s\"", sid_to_string(u->id.sid), u->id.cid, addr, u->id.nick, cred, u->user_agent); } static void log_user_login_error(struct user* u, enum status_message msg)