* Applied a patch sent in by Wilfried Goesgens which allows the various

[citadel.git] / citadel / citadel.c

diff --git a/citadel/citadel.c b/citadel/citadel.c
index 58846072b990060cad796cc2c3f219aea416b950..2105364a2b98afda41b8c081a58b78b84210ba21 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -211,7 +211,7 @@ void userlist(CtdlIPC *ipc, char *patn)
        int r;                          /* IPC response code */
        char *listing = NULL;
 
-       r = CtdlIPCUserListing(ipc, &listing, buf);
+       r = CtdlIPCUserListing(ipc, patn, &listing, buf);
        if (r / 100 != 1) {
                pprintf("%s\n", buf);
                return;
@@ -1122,7 +1122,13 @@ int main(int argc, char **argv)
                         * guaranteed to have the uid/gid we want.
                         */
                        if (!getuid() || !getgid()) {
-                               if (stat(CTDLDIR "/citadel.config", &st) < 0) {
+                               if (stat(
+#ifndef HAVE_ETC_DIR
+                                                CTDLDIR 
+#else
+                                                ETC_DIR
+#endif
+                                                "/citadel.config", &st) < 0) {
                                        perror("couldn't stat citadel.config");
                                        logoff(NULL, 3);
                                }