Merge commit 'fml/master'

[adu.git] / user.c

diff --git a/user.c b/user.c
index 026d65be741fdc3a100c24f6cce379f8eaa124e0..0ae4a6c9af04fe3eab521f38f9c14b74e4f69a8c 100644 (file)
--- a/user.c
+++ b/user.c
@@ -10,7 +10,6 @@
 #include <dirent.h> /* readdir() */
 #include <sys/types.h>
 #include <pwd.h>
-#include "cmdline.h" /* TODO: This file should be independent of command line options */
 #include "user.h"
 #include "fd.h"
 #include "string.h"
@@ -267,7 +266,7 @@ static int open_user_table(struct user_info *ui, int create)
        ui->desc->num_columns = NUM_UT_COLUMNS;
        ui->desc->flags = 0;
        ui->desc->column_descriptions = user_table_cols;
-       ui->desc->dir = adu_strdup(conf.database_dir_arg);
+       ui->desc->dir = adu_strdup(database_dir);
        ui->desc->name = make_message("%u", (unsigned)ui->uid);
        pw = getpwuid(ui->uid);
        if (pw && pw->pw_name)
@@ -452,7 +451,7 @@ int create_user_table(uint32_t uid, struct user_info **ui_ptr)
 
 static char *get_uid_list_name(void)
 {
-       return make_message("%s/uid_list", conf.database_dir_arg);
+       return make_message("%s/uid_list", database_dir);
 }
 /**
  * Open the osl tables for all admissible uids.