ngIRCd Release 27

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

diff --git a/src/ngircd/login.c b/src/ngircd/login.c
index 7f427a3a753e0fd3b0b9886d641439b521a3f08b..3412e337a75e6e63a1ef03afd098c1e173878814 100644 (file)
--- a/src/ngircd/login.c
+++ b/src/ngircd/login.c
@@ -31,6 +31,7 @@
 #include "log.h"
 #include "messages.h"
 #include "ngircd.h"
+#include "irc-channel.h"
 #include "irc-info.h"
 #include "irc-mode.h"
 #include "irc-write.h"
@@ -92,7 +93,7 @@ Login_User(CLIENT * Client)
                /* Don't do any PAM authentication at all if PAM is not
                 * enabled, instead emulate the behavior of the daemon
                 * compiled without PAM support. */
-               if (strcmp(Conn_Password(conn), Conf_ServerPwd) == 0) 
+               if (strcmp(Conn_Password(conn), Conf_ServerPwd) == 0)
                        return Login_User_PostAuth(Client);
                Client_Reject(Client, "Bad server password", false);
                return DISCONNECTED;
@@ -192,7 +193,7 @@ Login_User_PostAuth(CLIENT *Client)
        /* Set default user modes */
        if (Conf_DefaultUserModes[0]) {
                snprintf(modes, sizeof(modes), "+%s", Conf_DefaultUserModes);
-               Req.prefix = Client_ThisServer();
+               Req.prefix = Client_ID(Client_ThisServer());
                Req.command = "MODE";
                Req.argc = 2;
                Req.argv[0] = Client_ID(Client);
@@ -201,9 +202,41 @@ Login_User_PostAuth(CLIENT *Client)
        } else
                IRC_SetPenalty(Client, 1);
 
+       /* Autojoin clients to the channels */
+       Login_Autojoin(Client);
+
        return CONNECTED;
 }
 
+/**
+ * Autojoin clients to the channels set by administrator
+ *
+ * Do nothing if autojoin is not set in the configuration or the channel is not
+ * available (any more).
+ **/
+GLOBAL void
+Login_Autojoin(CLIENT *Client)
+{
+       REQUEST Req;
+       const struct Conf_Channel *conf_chan;
+       size_t i, channel_count = array_length(&Conf_Channels, sizeof(*conf_chan));
+
+       conf_chan = array_start(&Conf_Channels);
+       assert(channel_count == 0 || conf_chan != NULL);
+
+       for (i = 0; i < channel_count; i++, conf_chan++) {
+               if(!conf_chan->autojoin)
+                       continue;
+               if (!Channel_Search(conf_chan->name))
+                       continue;
+               Req.prefix = Client_ID(Client_ThisServer());
+               Req.command = "JOIN";
+               Req.argc = 1;
+               Req.argv[0] = (char *)conf_chan->name;
+               IRC_JOIN(Client, &Req);
+       }
+}
+
 #ifdef PAM
 
 /**
@@ -248,7 +281,7 @@ cb_Read_Auth_Result(int r_fd, UNUSED short events)
 
        if (result == true) {
                /* Authentication succeeded, now set the correct user name
-                * supplied by the client (without prepended '~' for exmaple),
+                * supplied by the client (without prepended '~' for example),
                 * but cut it at the first '@' character: */
                strlcpy(user, Client_OrigUser(client), sizeof(user));
                ptr = strchr(user, '@');