From: Alexander Barton <alex@barton.de>
Date: Sat, 14 Mar 2015 10:13:50 +0000 (+0100)
Subject: Don't send nick name as default PART reason
X-Git-Tag: rel-22.1~5
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=6171beb7ab5dc0586581660852576f437470df63;ds=sidebyside

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 c142243a..aa4abe3d 100644
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.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-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
@@ -448,7 +448,7 @@ IRC_PART(CLIENT * Client, REQUEST * Req)
 
 	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, ",");
 	}
 
diff --git a/src/testsuite/channel-test.e b/src/testsuite/channel-test.e
index 39ad16a9..f65c5196 100644
--- a/src/testsuite/channel-test.e
+++ b/src/testsuite/channel-test.e
@@ -64,10 +64,10 @@ expect {
 	"323 nick :End of LIST"
 }
 
-send "part #channel\r"
+send "part #channel :bye bye\r"
 expect {
 	timeout { exit 1 }
-	"@* PART #channel :nick"
+	"@* PART #channel :bye bye"
 }
 
 send "join #channel\r"
@@ -93,11 +93,11 @@ expect {
 send "join 0\r"
 expect {
 	timeout { exit 1 }
-	"@* PART #channel2 :nick"
+	"@* PART #channel2 :"
 }
 expect {
 	timeout { exit 1 }
-	"@* PART #channel :nick"
+	"@* PART #channel :"
 }
 
 send "quit\r"
diff --git a/src/testsuite/invite-test.e b/src/testsuite/invite-test.e
index 5179d8a7..b9e0c3f9 100644
--- 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}
-	-re "PART #channel :?nick"
+	"@* PART #channel :"
 }
 
 send "invite nick :parameter with spaces\r"
diff --git a/src/testsuite/who-test.e b/src/testsuite/who-test.e
index 39d50ede..39e3a2f1 100644
--- 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 }
-	"@* PART #channel :nick"
+	"@* PART #channel :"
 }
 
 send "who Real?Name\r"