commit 2a40112f09cc58d43447cc2665b7924c8a69c580 from: Alexander Barton date: Wed Jan 01 23:45:05 2014 UTC 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 commit - 61b7932e82383f03cf751ff246c0610ce30dfd20 commit + 2a40112f09cc58d43447cc2665b7924c8a69c580 blob - 9e7e2d7a9a9a21a9beb4584748f6cd05628966b4 blob + b7fe5feda3339b9659012f7352563a8c2af3b8cf --- 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;