Merge branch 'move-connection-password' of git://arthur.barton.de/ngircd-alex

[ngircd-alex.git] / src / ngircd / irc-server.c

diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index b592eb9dd5a3be52ac19fd3966f5f0a4bf4517be..8526a573ec361b0851222314343e079b447114f6 100644 (file)
--- a/src/ngircd/irc-server.c
+++ b/src/ngircd/irc-server.c
@@ -80,7 +80,8 @@ 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 +278,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 +303,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]);