X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-server.c;h=85aa820ad6cc90c0ab664ee744cc0b6c29bf0647;hb=6d81286b08b8fbea5827113b55c4ef8f5e193006;hp=ed03b6ff928710c0036b55b060072f524c9e3fd7;hpb=c2f60abe55b5a8d320a27df0ce41790fa1141081;p=ngircd-alex.git

diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index ed03b6ff..85aa820a 100644
--- a/src/ngircd/irc-server.c
+++ b/src/ngircd/irc-server.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc-server.c,v 1.10 2002/05/27 13:09:27 alex Exp $
+ * $Id: irc-server.c,v 1.15 2002/09/02 19:05:03 alex Exp $
  *
  * irc-server.c: IRC-Befehle fuer Server-Links
  */
@@ -32,6 +32,7 @@
 #include "log.h"
 #include "messages.h"
 #include "parse.h"
+#include "ngircd.h"
 
 #include "exp.h"
 #include "irc-server.h"
@@ -92,7 +93,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 		{
 			/* Eingehende Verbindung: Unseren SERVER- und PASS-Befehl senden */
 			ok = TRUE;
-			if( ! IRC_WriteStrClient( Client, "PASS %s "PASSSERVERADD, Conf_Server[i].pwd )) ok = FALSE;
+			if( ! IRC_WriteStrClient( Client, "PASS %s %s", Conf_Server[i].pwd, NGIRCd_ProtoID )) ok = FALSE;
 			else ok = IRC_WriteStrClient( Client, "SERVER %s 1 :%s", Conf_ServerName, Conf_ServerInfo );
 			if( ! ok )
 			{
@@ -248,7 +249,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 GLOBAL BOOLEAN
 IRC_NJOIN( CLIENT *Client, REQUEST *Req )
 {
-	CHAR *channame, *ptr, modes[8];
+	CHAR str[COMMAND_LEN], *channame, *ptr, modes[8];
 	BOOLEAN is_op, is_voiced;
 	CHANNEL *chan;
 	CLIENT *c;
@@ -261,8 +262,11 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req )
 	/* Falsche Anzahl Parameter? */
 	if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
+	strncpy( str, Req->argv[1], COMMAND_LEN - 1 );
+	str[COMMAND_LEN - 1] = '\0';
+
 	channame = Req->argv[0];
-	ptr = strtok( Req->argv[1], "," );
+	ptr = strtok( str, "," );
 	while( ptr )
 	{
 		is_op = is_voiced = FALSE;