Don't play games with FILE* stdin/out/err, only touch "real" descriptors.

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

diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index 28e5327e07dc36625d53ad9596b37580290c851c..69820d1d28d5da4e725039427d16d68eecf8e199 100644 (file)
--- a/src/ngircd/irc-mode.c
+++ b/src/ngircd/irc-mode.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-mode.c,v 1.33 2004/02/29 16:28:44 alex Exp $";
+static char UNUSED id[] = "$Id: irc-mode.c,v 1.35 2004/04/25 15:42:05 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -635,6 +635,7 @@ LOCAL BOOLEAN
 Add_Invite( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
 {
        CHAR *mask;
+       BOOLEAN already;
 
        assert( Client != NULL );
        assert( Channel != NULL );
@@ -642,7 +643,12 @@ Add_Invite( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
 
        mask = Lists_MakeMask( Pattern );
 
-       if( ! Lists_AddInvited( Prefix, mask, Channel, FALSE )) return CONNECTED;
+       already = Lists_IsInviteEntry( mask, Channel );
+       
+       if( ! Lists_AddInvited( mask, Channel, FALSE )) return CONNECTED;
+       
+       if(( Client_Type( Prefix ) == CLIENT_SERVER ) && ( already == TRUE )) return CONNECTED;
+
        return Send_ListChange( "+I", Prefix, Client, Channel, mask );
 } /* Add_Invite */
 
@@ -651,6 +657,7 @@ LOCAL BOOLEAN
 Add_Ban( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
 {
        CHAR *mask;
+       BOOLEAN already;
 
        assert( Client != NULL );
        assert( Channel != NULL );
@@ -658,7 +665,12 @@ Add_Ban( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
 
        mask = Lists_MakeMask( Pattern );
 
-       if( ! Lists_AddBanned( Prefix, mask, Channel )) return CONNECTED;
+       already = Lists_IsBanEntry( mask, Channel );
+
+       if( ! Lists_AddBanned( mask, Channel )) return CONNECTED;
+
+       if(( Client_Type( Prefix ) == CLIENT_SERVER ) && ( already == TRUE )) return CONNECTED;
+
        return Send_ListChange( "+b", Prefix, Client, Channel, mask );
 } /* Add_Ban */