#include "imp.h"
#include <assert.h>
#include <stdlib.h>
+#include <string.h>
#include <strings.h>
#include <unistd.h>
#include "conn.h"
#include "class.h"
#include "client.h"
+#include "client-cap.h"
#include "channel.h"
#include "conf.h"
#include "io.h"
}
#endif
+ /* Still waiting for "CAP END" command? */
+ if (Client_Cap(Client) & CLIENT_CAP_PENDING) {
+ Client_SetType(Client, CLIENT_WAITCAPEND);
+ LogDebug("Connection %d: Waiting for CAP END ...", conn);
+ return CONNECTED;
+ }
+
#ifdef PAM
if (!Conf_PAM) {
/* Don't do any PAM authentication at all, instead emulate
* the beahiour of the daemon compiled without PAM support:
* because there can't be any "server password", all
* passwords supplied are classified as "wrong". */
- if(Client_Password(Client)[0] == '\0')
+ if(Conn_Password(conn)[0] == '\0')
return Login_User_PostAuth(Client);
Client_Reject(Client, "Non-empty password", false);
return DISCONNECTED;
}
- if (Conf_PAMIsOptional && strcmp(Client_Password(Client), "") == 0) {
+ if (Conf_PAMIsOptional &&
+ strcmp(Conn_Password(conn), "") == 0) {
/* Clients are not required to send a password and to be PAM-
* authenticated at all. If not, they won't become "identified"
* and keep the "~" in their supplied user name.
}
#else
/* Check global server password ... */
- if (strcmp(Client_Password(Client), Conf_ServerPwd) != 0) {
+ if (strcmp(Conn_Password(conn), Conf_ServerPwd) != 0) {
/* Bad password! */
Client_Reject(Client, "Bad server password", false);
return DISCONNECTED;
return false;
if (!IRC_WriteStrClient
(Client, RPL_YOURHOST_MSG, Client_ID(Client),
- Client_ID(Client_ThisServer()), PACKAGE_VERSION, TARGET_CPU,
- TARGET_VENDOR, TARGET_OS))
+ Client_ID(Client_ThisServer()), PACKAGE_VERSION, HOST_CPU,
+ HOST_VENDOR, HOST_OS))
return false;
if (!IRC_WriteStrClient
(Client, RPL_CREATED_MSG, Client_ID(Client), NGIRCd_StartStr))