ngIRCd Release 27

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

diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index 3e83978263adc6d68bff2ad8808466ce2309f164..6aa37574baf415eab29ae30d940200a888b9ebcc 100644 (file)
--- a/src/ngircd/irc-server.c
+++ b/src/ngircd/irc-server.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2024 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,6 +32,7 @@
 #include "numeric.h"
 #include "ngircd.h"
 #include "irc.h"
+#include "irc-channel.h"
 #include "irc-info.h"
 #include "irc-write.h"
 #include "op.h"
@@ -87,6 +88,19 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
                        return DISCONNECTED;
                }
 
+#ifdef SSL_SUPPORT
+               /* Does this server require an SSL connection? */
+               if (Conf_Server[i].SSLConnect &&
+                   !(Conn_Options(Client_Conn(Client)) & CONN_SSL)) {
+                       Log(LOG_ERR,
+                           "Connection %d: Server \"%s\" requires a secure connection!",
+                           Client_Conn(Client), Req->argv[0]);
+                       Conn_Close(Client_Conn(Client), NULL,
+                                  "Secure connection required", true);
+                       return DISCONNECTED;
+               }
+#endif
+
                /* Check server password */
                if (strcmp(Conn_Password(Client_Conn(Client)),
                    Conf_Server[i].pwd_in) != 0) {
@@ -250,7 +264,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 GLOBAL bool
 IRC_NJOIN( CLIENT *Client, REQUEST *Req )
 {
-       char nick_in[COMMAND_LEN], nick_out[COMMAND_LEN], *channame, *ptr, modes[8], *topic;
+       char nick_in[COMMAND_LEN], nick_out[COMMAND_LEN], *channame, *ptr, modes[8];
        bool is_owner, is_chanadmin, is_op, is_halfop, is_voiced;
        CHANNEL *chan;
        CLIENT *c;
@@ -320,26 +334,11 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req )
                IRC_WriteStrChannelPrefix(Client, chan, c, false,
                                          "JOIN :%s", channame);
 
-               /* If the client is connected to me... */
-               if(Client_Conn(c) != NONE) {
-                       /* Send NAMES list to the joined user */
-                       if(IRC_Send_NAMES(c, chan))
-                               IRC_WriteStrClient(c, RPL_ENDOFNAMES_MSG, Client_ID(Client),
-                                       Channel_Name(chan));
-
-                       /* Send topic to the joined user */
-                       topic = Channel_Topic(chan);
-                       assert(topic != NULL);
-                       if (*topic) {
-                               IRC_WriteStrClient(c, RPL_TOPIC_MSG, Client_ID(c), channame, topic);
-#ifndef STRICT_RFC
-                               IRC_WriteStrClient(c, RPL_TOPICSETBY_MSG,
-                                       Client_ID(c), channame,
-                                       Channel_TopicWho(chan),
-                                       Channel_TopicTime(chan));
-#endif
-                       }
-               }
+               /* If the client is connected to this server, it was remotely
+                * joined to the channel by another server/service: So send
+                * TOPIC and NAMES messages like on a regular JOIN command! */
+               if(Client_Conn(c) != NONE)
+                       IRC_Send_Channel_Info(c, chan);
 
                /* Announce "channel user modes" to the channel, if any */
                strlcpy(modes, Channel_UserModes(chan, c), sizeof(modes));