Remove imp.h and exp.h header files

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

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index d1b4033b3a54d70ef83bab9e729eeafd5123f177..c8cff24d845debc3f4bdb415cfd74c36cb1231dc 100644 (file)
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -16,7 +16,6 @@
  * Login and logout
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -36,7 +35,6 @@
 #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,
@@ -80,7 +78,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 +271,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 +370,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 +607,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;
@@ -630,7 +627,7 @@ GLOBAL bool
 IRC_QUIT( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *target;
-       char quitmsg[LINE_LEN];
+       char quitmsg[COMMAND_LEN];
 
        assert(Client != NULL);
        assert(Req != NULL);