X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-login.c;h=98ac0e7f5e07ead740eed5297eb8b45802b59b8d;hp=9e7e2d7a9a9a21a9beb4584748f6cd05628966b4;hb=c41f18e3f90512afcf38f42695c26708a1f34772;hpb=48ea69d778279e7256a167e6f4147eb5766bbdda

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index 9e7e2d7a..98ac0e7f 100644
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,15 +16,14 @@
  * Login and logout
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
+#include <time.h>
 
 #include "conn-func.h"
-#include "class.h"
 #include "conf.h"
 #include "channel.h"
 #include "log.h"
@@ -32,11 +31,9 @@
 #include "messages.h"
 #include "parse.h"
 #include "irc.h"
-#include "irc-info.h"
 #include "irc-macros.h"
 #include "irc-write.h"
 
-#include "exp.h"
 #include "irc-login.h"
 
 static void Change_Nick PARAMS((CLIENT * Origin, CLIENT * Target, char *NewNick,
@@ -246,7 +243,7 @@ IRC_NICK( CLIENT *Client, REQUEST *Req )
 #else
 				Conn_SetAuthPing(Client_Conn(Client), rand());
 #endif
-				IRC_WriteStrClient(Client, "PING :%ld",
+				Conn_WriteStr(Client_Conn(Client), "PING :%ld",
 					Conn_GetAuthPing(Client_Conn(Client)));
 				LogDebug("Connection %d: sent AUTH PING %ld ...",
 					Client_Conn(Client),
@@ -609,7 +606,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;
@@ -832,14 +832,14 @@ IRC_PONG(CLIENT *Client, REQUEST *Req)
 	if (auth_ping) {
 		LogDebug("AUTH PONG: waiting for token \"%ld\", got \"%s\" ...",
 			 auth_ping, Req->argv[0]);
-		if (auth_ping == atoi(Req->argv[0])) {
+		if (auth_ping == atol(Req->argv[0])) {
 			Conn_SetAuthPing(conn, 0);
 			if (Client_Type(Client) == CLIENT_WAITAUTHPING)
 				Login_User(Client);
 		} else
 			if (!IRC_WriteStrClient(Client,
-					"To connect, type /QUOTE PONG %ld",
-					auth_ping))
+					"NOTICE %s :To connect, type /QUOTE PONG %ld",
+					Client_ID(Client), auth_ping))
 				return DISCONNECTED;
 	}
 #endif