Merge commit 'fml/master'

[adu.git] / select.c

diff --git a/select.c b/select.c
index 4ebfbbfa02b10903a3766b1855cbf950810af9e9..e30697ee9f0dc51d629d6ccbfaa789b6428e996a 100644 (file)
--- a/select.c
+++ b/select.c
@@ -912,8 +912,7 @@ int run_select_query(struct uid_range *admissible_uids, struct format_info *fi)
        if (ret < 0)
                goto out;
        check_signals();
-       ret = open_admissible_user_tables(conf.database_dir_arg,
-               admissible_uids);
+       ret = open_admissible_user_tables(admissible_uids);
        if (ret < 0)
                goto out;
        check_signals();
@@ -1063,7 +1062,7 @@ int com_select(void)
        ret = parse_select_options(conf.select_options_arg, &params,
                &admissible_uids, &fi);
        if (ret > 0) {
-               ret = read_uid_file(conf.database_dir_arg);
+               ret = read_uid_file();
                if (ret < 0)
                        goto out;
                ret = run_select_query(admissible_uids, fi);