X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fngircd%2Firc-channel.c;h=cab20c493bcb493f95bf3398528118a06f322874;hb=8ae2cdfce9f8ba75fe72d65603d4c05c87f6d9c2;hp=78332ea113e7706abb3d97bf35e26ff121adba87;hpb=c8b12af1d2d155ec79dc2044a4ff177cf07de4fe;p=ngircd-alex.git

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 78332ea1..cab20c49 100644
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -129,7 +129,7 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame,
 		return false;
 	}
 
-	if (Channel_HasMode(chan, 'O') && !Client_OperByMe(Client)) {
+	if (Channel_HasMode(chan, 'O') && !Client_HasMode(Client, 'o')) {
 		/* Only IRC operators are allowed! */
 		IRC_WriteErrClient(Client, ERR_OPONLYCHANNEL_MSG,
 				   Client_ID(Client), channame);
@@ -309,7 +309,6 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 	assert (Client != NULL);
 	assert (Req != NULL);
 
-	_IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2)
 	_IRC_GET_SENDER_OR_RETURN_(target, Req, Client)
 
 	/* Is argument "0"? */
@@ -324,7 +323,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 	channame = strtok_r(channame, ",", &lastchan);
 
 	/* Make sure that "channame" is not the empty string ("JOIN :") */
-	if (! channame)
+	if (!channame)
 		return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
 					  Client_ID(Client), Req->command);
 
@@ -341,12 +340,6 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 		}
 
 		chan = Channel_Search(channame);
-		if (!chan && !strchr(Conf_AllowedChannelTypes, channame[0])) {
-			 /* channel must be created, but forbidden by config */
-			IRC_WriteErrClient(Client, ERR_NOSUCHCHANNEL_MSG,
-					   Client_ID(Client), channame);
-			goto join_next;
-		}
 
 		/* Local client? */
 		if (Client_Type(Client) == CLIENT_USER) {
@@ -354,6 +347,15 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 				/* Already existing channel: already member? */
 				if (Channel_IsMemberOf(chan, Client))
 				    goto join_next;
+			} else {
+				/* Channel must be created */
+				if (!strchr(Conf_AllowedChannelTypes, channame[0])) {
+					/* ... but channel type is not allowed! */
+					IRC_WriteErrClient(Client,
+						ERR_NOSUCHCHANNEL_MSG,
+						Client_ID(Client), channame);
+					goto join_next;
+				}
 			}
 
 			/* Test if the user has reached the channel limit */
@@ -437,14 +439,13 @@ IRC_PART(CLIENT * Client, REQUEST * Req)
 	assert(Client != NULL);
 	assert(Req != NULL);
 
-	_IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2)
 	_IRC_GET_SENDER_OR_RETURN_(target, Req, Client)
 
 	/* Loop over all the given channel names */
 	chan = strtok(Req->argv[0], ",");
 
 	/* Make sure that "chan" is not the empty string ("PART :") */
-	if (! chan)
+	if (!chan)
 		return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
 					  Client_ID(Client), Req->command);
 
@@ -479,9 +480,6 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	IRC_SetPenalty(Client, 1);
-
-	_IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2)
 	_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
 	chan = Channel_Search(Req->argv[0]);
@@ -578,9 +576,6 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
 	assert(Client != NULL);
 	assert(Req != NULL);
 
-	IRC_SetPenalty(Client, 2);
-
-	_IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
 	_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
 	if (Req->argc > 0)
@@ -616,7 +611,10 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
 				/* Gotcha! */
 				if (!Channel_HasMode(chan, 's')
 				    || Channel_IsMemberOf(chan, from)
-				    || (!Conf_MorePrivacy && Client_OperByMe(Client))) {
+				    || (!Conf_MorePrivacy
+					&& Client_HasMode(Client, 'o')
+					&& Client_Conn(Client) > NONE))
+				{
 					if ((Conf_MaxListSize > 0)
 					    && IRC_CheckListTooBig(from, count,
 								   Conf_MaxListSize,