Don't send nick name as default PART reason

No other IRC daemon seems to do this (today?), don't remember why
ngIRCd did it in the first place ...

Closes #185.

Reported by Cahata in #ngircd, thanks!

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index c142243acc655a94e4cbbf2ea9efe9cf550b7a7e..aa4abe3d17afdc49ab2239421661a924df82b168 100644 (file)
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
 /*
  * ngIRCd -- The Next Generation IRC Daemon

- * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2015 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
  *
  * 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


@@ -448,7 +448,7 @@ IRC_PART(CLIENT * Client, REQUEST * Req)
 
        while (chan) {
                Channel_Part(target, Client, chan,
 
        while (chan) {
                Channel_Part(target, Client, chan,

-                            Req->argc > 1 ? Req->argv[1] : Client_ID(target));
+                            Req->argc > 1 ? Req->argv[1] : "");

                chan = strtok(NULL, ",");
        }
 
                chan = strtok(NULL, ",");
        }
 

diff --git a/src/testsuite/channel-test.e b/src/testsuite/channel-test.e
index 39ad16a94ee4da3c454433bae5fdbfc3b6a696c9..f65c519652779a19603feea517cd9ac810ae8cef 100644 (file)
--- a/src/testsuite/channel-test.e
+++ b/src/testsuite/channel-test.e
@@ -64,10 +64,10 @@ expect {
        "323 nick :End of LIST"
 }
 
        "323 nick :End of LIST"
 }
 

-send "part #channel\r"
+send "part #channel :bye bye\r"

 expect {
        timeout { exit 1 }
 expect {
        timeout { exit 1 }

-       "@* PART #channel :nick"
+       "@* PART #channel :bye bye"

 }
 
 send "join #channel\r"
 }
 
 send "join #channel\r"


@@ -93,11 +93,11 @@ expect {
 send "join 0\r"
 expect {
        timeout { exit 1 }
 send "join 0\r"
 expect {
        timeout { exit 1 }

-       "@* PART #channel2 :nick"
+       "@* PART #channel2 :"

 }
 expect {
        timeout { exit 1 }
 }
 expect {
        timeout { exit 1 }

-       "@* PART #channel :nick"
+       "@* PART #channel :"

 }
 
 send "quit\r"
 }
 
 send "quit\r"

diff --git a/src/testsuite/invite-test.e b/src/testsuite/invite-test.e
index 5179d8a7934a753646363bebd724c443aefe0081..b9e0c3f96d213f688a16c6fd471eb73c62485cec 100644 (file)
--- a/src/testsuite/invite-test.e
+++ b/src/testsuite/invite-test.e
@@ -82,7 +82,7 @@ expect {
 send "part #channel\r"
 expect {
        timeout { exit 1}
 send "part #channel\r"
 expect {
        timeout { exit 1}

-       -re "PART #channel :?nick"
+       "@* PART #channel :"

 }
 
 send "invite nick :parameter with spaces\r"
 }
 
 send "invite nick :parameter with spaces\r"

diff --git a/src/testsuite/who-test.e b/src/testsuite/who-test.e
index 39d50eded65897aa0bb35bcde709f443130365cf..39e3a2f15521bafcc858f1dec8c66f2be1c68642 100644 (file)
--- a/src/testsuite/who-test.e
+++ b/src/testsuite/who-test.e
@@ -89,7 +89,7 @@ expect {
 send "part #channel\r"
 expect {
        timeout { exit 1 }
 send "part #channel\r"
 expect {
        timeout { exit 1 }

-       "@* PART #channel :nick"
+       "@* PART #channel :"

 }
 
 send "who Real?Name\r"
 }
 
 send "who Real?Name\r"