ngircd: use setgid/setuid errno value in error path

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

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 17ecbf9308c9c17b455b81f1b6d9ea5e55c0c96e..78332ea113e7706abb3d97bf35e26ff121adba87 100644 (file)
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -309,8 +309,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
        assert (Client != NULL);
        assert (Req != NULL);
 
-       _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1)
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
+       _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2)
        _IRC_GET_SENDER_OR_RETURN_(target, Req, Client)
 
        /* Is argument "0"? */
@@ -438,8 +437,7 @@ IRC_PART(CLIENT * Client, REQUEST * Req)
        assert(Client != NULL);
        assert(Req != NULL);
 
-       _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1)
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
+       _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2)
        _IRC_GET_SENDER_OR_RETURN_(target, Req, Client)
 
        /* Loop over all the given channel names */
@@ -483,8 +481,7 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req )
 
        IRC_SetPenalty(Client, 1);
 
-       _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1)
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
+       _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
        chan = Channel_Search(Req->argv[0]);
@@ -688,7 +685,7 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
                return CONNECTED;
 
        if (Req->argv[1][0] == '+') {
-               if (!Channel_Modes(chan)) {
+               if (!*Channel_Modes(chan)) {
                        /* OK, this channel doesn't have modes yet,
                         * set the received ones: */
                        Channel_SetModes(chan, &Req->argv[1][1]);
@@ -727,7 +724,7 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
 
        if (arg_topic > 0) {
                /* We got a topic */
-               if (!Channel_Topic( chan ) && Req->argv[arg_topic][0]) {
+               if (!*Channel_Topic(chan) && Req->argv[arg_topic][0]) {
                        /* OK, there is no topic jet */
                        Channel_SetTopic(chan, Client, Req->argv[arg_topic]);
                        IRC_WriteStrChannelPrefix(Client, chan, from, false,