X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-server.c;h=5d5ee634a42772f1979d79d56bc6ed8d4f4430f4;hb=164954a78856893c9be03d95dac73e781e4f78f5;hp=b592eb9dd5a3be52ac19fd3966f5f0a4bf4517be;hpb=2a7dd06ebd9cc72d45a6a4becdbef5213d7b7800;p=ngircd-alex.git

diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index b592eb9d..5d5ee634 100644
--- a/src/ngircd/irc-server.c
+++ b/src/ngircd/irc-server.c
@@ -80,7 +80,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 			Conn_Close( Client_Conn( Client ), NULL, "Server not configured here", true);
 			return DISCONNECTED;
 		}
-		if( strcmp( Client_Password( Client ), Conf_Server[i].pwd_in ) != 0 )
+		if( strcmp( Conn_Password( Client_Conn( Client ) ), Conf_Server[i].pwd_in ) != 0 )
 		{
 			/* wrong password */
 			Log( LOG_ERR, "Connection %d: Got bad password from server \"%s\"!", Client_Conn( Client ), Req->argv[0] );
@@ -277,6 +277,7 @@ IRC_SQUIT(CLIENT * Client, REQUEST * Req)
 	char msg[COMMAND_LEN], logmsg[COMMAND_LEN];
 	CLIENT *from, *target;
 	CONN_ID con;
+	int loglevel;
 
 	assert(Client != NULL);
 	assert(Req != NULL);
@@ -301,7 +302,11 @@ IRC_SQUIT(CLIENT * Client, REQUEST * Req)
 		return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
 					  Client_ID(Client), Req->prefix);
 
-	Log(LOG_DEBUG, "Got SQUIT from %s for \"%s\": \"%s\" ...",
+	if (Client_Type(Client) == CLIENT_USER)
+		loglevel = LOG_NOTICE | LOG_snotice;
+	else
+		loglevel = LOG_DEBUG;
+	Log(loglevel, "Got SQUIT from %s for \"%s\": \"%s\" ...",
 	    Client_ID(from), Req->argv[0], Req->argv[1]);
 
 	target = Client_Search(Req->argv[0]);