From: Alexander Barton <alex@barton.de>
Date: Wed, 1 Jan 2014 23:45:05 +0000 (+0100)
Subject: Merge branch 'bug167-WebircIPAnoDNS' of git://arthur.barton.de/ngircd-alex
X-Git-Tag: rel-22-rc1~77
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=2a40112f09cc58d43447cc2665b7924c8a69c580;hp=61b7932e82383f03cf751ff246c0610ce30dfd20

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
---

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index 9e7e2d7a..b7fe5fed 100644
--- a/src/ngircd/irc-login.c
+++ b/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;