Commit Diff
Diff:
61b7932e82383f03cf751ff246c0610ce30dfd20
2a40112f09cc58d43447cc2665b7924c8a69c580
2a40112f09cc58d43447cc2665b7924c8a69c580
Commit:
2a40112f09cc58d43447cc2665b7924c8a69c580
Tree:
b73a2dd34f953f8773852924d30aaa6afdcc2ce0
Committer:
Alexander Barton <alex@barton.de>
Date:
Wed Jan 1 23:45:05 2014
UTC
Message:
Merge branch 'bug167-WebircIPAnoDNS' of git://arthur.barton.de/ngircd-alex
* 'bug167-WebircIPAnoDNS' of git://arthur.barton.de/ngircd-alex:
WEBIRC: Don't respect hostname when DNS is disabled
--- src/ngircd/irc-login.c
+++ src/ngircd/irc-login.c
@@ -609,7 +609,10 @@ IRC_WEBIRC(CLIENT *Client, REQUEST *Req)
Client_SetUser(Client, Req->argv[1], true);
Client_SetOrigUser(Client, Req->argv[1]);
- Client_SetHostname(Client, Req->argv[2]);
+ if (Conf_DNS)
+ Client_SetHostname(Client, Req->argv[2]);
+ else
+ Client_SetHostname(Client, Req->argv[3]);
Client_SetIPAText(Client, Req->argv[3]);
return CONNECTED;