X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-login.c;h=b7fe5feda3339b9659012f7352563a8c2af3b8cf;hb=e73d70ce6fab3acdefe914520a4296acb6d50eac;hp=469527209ac2dfdf423014c26fc3d4b0a116104a;hpb=62865f7e1910d08ad8d72cb89f830f6d9411ffa2;p=ngircd-alex.git

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index 46952720..b7fe5fed 100644
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -80,7 +80,6 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
 	} else if (Client_Type(Client) == CLIENT_UNKNOWN ||
 		   Client_Type(Client) == CLIENT_UNKNOWNSERVER) {
 		/* Unregistered connection, but wrong number of arguments: */
-		IRC_SetPenalty(Client, 2);
 		return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
 					  Client_ID(Client), Req->command);
 	} else {
@@ -274,11 +273,9 @@ IRC_NICK( CLIENT *Client, REQUEST *Req )
 		/* Server or service introduces new client */
 
 		/* Bad number of parameters? */
-		if (Req->argc != 2 && Req->argc != 7) {
-			IRC_SetPenalty(Client, 2);
+		if (Req->argc != 2 && Req->argc != 7)
 			return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
 						  Client_ID(Client), Req->command);
-		}
 
 		if (Req->argc >= 7) {
 			/* RFC 2813 compatible syntax */
@@ -375,10 +372,9 @@ IRC_SVSNICK(CLIENT *Client, REQUEST *Req)
 
 	/* Search the target */
 	target = Client_Search(Req->argv[0]);
-	if (!target || Client_Type(target) != CLIENT_USER) {
+	if (!target || Client_Type(target) != CLIENT_USER)
 		return IRC_WriteErrClient(Client, ERR_NOSUCHNICK_MSG,
 					  Client_ID(Client), Req->argv[0]);
-	}
 
 	if (Client_Conn(target) <= NONE) {
 		/* We have to forward the message to the server handling
@@ -613,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;