oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

permission: store passwords in GHashTable

Browse Source 
Eliminating the deprecated linked list library.
This commit is contained in:
Max Kellermann 2008-11-01 14:33:25 +01:00
parent aa772ebc02
commit 83f6222ae7
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/permission.c
View File

@ -19,11 +19,13 @@
#include "permission.h" #include "permission.h"
#include "conf.h" #include "conf.h"
#include "list.h"
#include "log.h" #include "log.h"
#include "utils.h" #include "utils.h"
#include "os_compat.h" #include "os_compat.h"
#include <glib.h>
#include <stdbool.h>
#define PERMISSION_PASSWORD_CHAR "@" #define PERMISSION_PASSWORD_CHAR "@"
#define PERMISSION_SEPERATOR "," #define PERMISSION_SEPERATOR ","
@ -32,7 +34,7 @@
#define PERMISSION_CONTROL_STRING "control" #define PERMISSION_CONTROL_STRING "control"
#define PERMISSION_ADMIN_STRING "admin" #define PERMISSION_ADMIN_STRING "admin"
static List *permission_passwords; static GHashTable *permission_passwords;
static unsigned permission_default; static unsigned permission_default;
@ -70,10 +72,11 @@ void initPermissions(void)
char *temp; char *temp;
char *cp2; char *cp2;
char *password; char *password;
unsigned *permission; unsigned permission;
ConfigParam *param; ConfigParam *param;
permission_passwords = makeList(free, 1); permission_passwords = g_hash_table_new_full(g_str_hash, g_str_equal,
g_free, NULL);
permission_default = PERMISSION_READ | PERMISSION_ADD | permission_default = PERMISSION_READ | PERMISSION_ADD |
PERMISSION_CONTROL | PERMISSION_ADMIN; PERMISSION_CONTROL | PERMISSION_ADMIN;
@ -99,12 +102,12 @@ void initPermissions(void)
password = temp; password = temp;
permission = xmalloc(sizeof(unsigned)); permission =
*permission =
parsePermissions(strtok_r(NULL, "", &cp2)); parsePermissions(strtok_r(NULL, "", &cp2));
insertInList(permission_passwords, password, g_hash_table_replace(permission_passwords,
permission); g_strdup(password),
GINT_TO_POINTER(permission));
} while ((param = getNextConfigParam(CONF_PASSWORD, param))); } while ((param = getNextConfigParam(CONF_PASSWORD, param)));
} }
@ -112,25 +115,25 @@ void initPermissions(void)
if (param) if (param)
permission_default = parsePermissions(param->value); permission_default = parsePermissions(param->value);
sortList(permission_passwords);
} }
int getPermissionFromPassword(char *password, unsigned *permission) int getPermissionFromPassword(char *password, unsigned *permission)
{ {
void *foundPermission; bool found;
gpointer key, value;
if (findInList(permission_passwords, password, &foundPermission)) {
*permission = *((unsigned *)foundPermission);
return 0;
}
found = g_hash_table_lookup_extended(permission_passwords,
password, &key, &value);
if (!found)
return -1; return -1;
*permission = GPOINTER_TO_INT(value);
return 0;
} }
void finishPermissions(void) void finishPermissions(void)
{ {
freeList(permission_passwords); g_hash_table_destroy(permission_passwords);
} }
unsigned getDefaultPermissions(void) unsigned getDefaultPermissions(void)