X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fui.c;h=94241e7fbde0d294ea0e28f9a779689ca08cfd57;hb=efc05613724470915c842b3217ec0625dc8147a7;hp=7d74fb6e0954d279b65257e9af2aa5336f992cbf;hpb=3ea7528f421c6fb41172073504e03c555c87d9fb;p=doldaconnect.git

diff --git a/daemon/ui.c b/daemon/ui.c
index 7d74fb6..94241e7 100644
--- a/daemon/ui.c
+++ b/daemon/ui.c
@@ -558,6 +558,7 @@ static void cmd_fnetconnect(struct socket *sk, struct uidata *data, int argc, wc
     char *buf;
     int err;
     struct fnetnode *fn;
+    struct wcspair *args;
     
     haveargs(3);
     havepriv(PERM_FNETCTL);
@@ -566,7 +567,10 @@ static void cmd_fnetconnect(struct socket *sk, struct uidata *data, int argc, wc
 	sq(sk, 0, L"504", L"Could not convert data to locale charset", NULL);
 	return;
     }
-    fn = fnetinitconnect(argv[1], buf);
+    args = NULL;
+    for(i = 3; i < argc - 1; i += 2)
+	newwcspair(argv[i], argv[i + 1], &args);
+    fn = fnetinitconnect(argv[1], buf, args);
     err = errno;
     free(buf);
     if(fn == NULL)
@@ -577,11 +581,6 @@ static void cmd_fnetconnect(struct socket *sk, struct uidata *data, int argc, wc
 	    sq(sk, 0, L"509", L"Could not parse the address", L"%%s", strerror(err), NULL);
 	return;
     }
-    for(i = 3; i < argc - 1; i += 2)
-    {
-	if(!wcscmp(argv[i], L"nick"))
-	    fnetsetnick(fn, argv[i + 1]);
-    }
     linkfnetnode(fn);
     fnetsetname(fn, argv[2]);
     putfnetnode(fn);