Use findfile instead of findconfig file.

[doldaconnect.git] / daemon / ui.c

diff --git a/daemon/ui.c b/daemon/ui.c
index 0e7fba1..b3a514d 100644 (file)
--- a/daemon/ui.c
+++ b/daemon/ui.c
@@ -144,7 +144,7 @@ struct uidata
     size_t inbufsize, indata;
     /* Wordset storage */
     wchar_t **argv;
-    int argc, args;
+    size_t argc, args;
     /* WCS conversation stuff */
     wchar_t *cb; /* Conversation buffer */
     size_t cbsize, cbdata;
@@ -597,8 +597,8 @@ static void cmd_fnetconnect(struct socket *sk, struct uidata *data, int argc, wc
     }
     linkfnetnode(fn);
     fnetsetname(fn, argv[2]);
+    sq(sk, 0, L"200", L"%%i", fn->id, L"Connection under way", NULL);
     putfnetnode(fn);
-    sq(sk, 0, L"200", L"Connection under way", NULL);
 }
 
 static void cmd_lsnodes(struct socket *sk, struct uidata *data, int argc, wchar_t **argv)
@@ -1124,7 +1124,7 @@ static void cmd_filtercmd(struct socket *sk, struct uidata *data, int argc, wcha
        sq(sk, 0, L"505", L"System error - Could not fork session", "Internal error", NULL);
        return;
     }
-    if((filtercmd = findfile(icswcstombs(confgetstr("ui", "filtercmd"), NULL, NULL), "dcdl-filtercmd", pwent->pw_dir)) == NULL)
+    if((filtercmd = findfile(icswcstombs(confgetstr("ui", "filtercmd"), NULL, NULL), "dcdl-filtercmd", pwent->pw_dir, 0)) == NULL)
     {
        flog(LOG_WARNING, "could not find filtercmd executable for user %s", pwent->pw_name);
        sq(sk, 0, L"505", L"System error - Could not fork session", L"Could not find filtercmd executable", NULL);