Changeset 2811940

Timestamp:

2006-07-27T14:55:53Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a36b030

Parents:

6398094

Message:

Copy-paste considered harmful + Fixed double handling of gc->permit/deny
which actually broke the block/allow commands.

Files:

• protocols/msn/msn_util.c (modified) (3 diffs)
• root_commands.c (modified) (1 diff)

protocols/msn/msn_util.c

@@ -54 +54 @@
 {
         struct msn_data *md = gc->proto_data;
-        GSList *l, **lp = NULL;
         char buf[1024], *realname;
-        
-        if( strcmp( list, "AL" ) == 0 )
-                lp = &gc->permit;
-        else if( strcmp( list, "BL" ) == 0 )
-                lp = &gc->deny;
-        
-        if( lp )
-                for( l = *lp; l; l = l->next )
-                        if( g_strcasecmp( l->data, who ) == 0 )
-                                return( 1 );
         
         realname = g_new0( char, strlen( realname_ ) * 3 + 1 );
@@ -76 +65 @@
                 g_free( realname );
                 
-                if( lp )
-                        *lp = g_slist_append( *lp, g_strdup( who ) );
-                
                 return( 1 );
         }
@@ -90 +76 @@
 {
         struct msn_data *md = gc->proto_data;
-        GSList *l = NULL, **lp = NULL;
         char buf[1024];
-        
-        if( strcmp( list, "AL" ) == 0 )
-                lp = &gc->permit;
-        else if( strcmp( list, "BL" ) == 0 )
-                lp = &gc->deny;
-        
-        if( lp )
-        {
-                for( l = *lp; l; l = l->next )
-                        if( g_strcasecmp( l->data, who ) == 0 )
-                                break;
-                
-                if( !l )
-                        return( 1 );
-        }
         
         g_snprintf( buf, sizeof( buf ), "REM %d %s %s\r\n", ++md->trId, list, who );
         if( msn_write( gc, buf, strlen( buf ) ) )
-        {
-                if( lp )
-                        *lp = g_slist_remove( *lp, l->data );
-                
                 return( 1 );
-        }
         
         return( 0 );

root_commands.c

@@ -580 +580 @@
                 
                 irc_usermsg( irc, format, "Handle", "Nickname" );
-                for( l = a->gc->deny; l; l = l->next )
+                for( l = a->gc->permit; l; l = l->next )
                 {
                         user_t *u = user_findhandle( a->gc, l->data );