Changeset af9f2ca for ipc.c

Timestamp:

2010-07-11T10:59:56Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

133cdff

Parents:

1e52e1f

Message:

Added allow_takeover setting for people who don't like this new functionality.

File:

• ipc.c (modified) (3 diffs)

ipc.c

@@ -317 +317 @@
         {
                 /* Master->New connection */
+                if( !set_getbool( &irc->b->set, "allow_takeover" ) )
+                {
+                        ipc_child_cmd_takeover_no( irc );
+                        return;
+                }
+                
                 /* Offer to take over the old session, unless for some reason
                    we're already logging into IM connections. */
@@ -336 +342 @@
                     ipc_child_recv_fd != -1 &&
                     strcmp( irc->user->nick, cmd[2] ) == 0 &&
-                    strcmp( irc->password, cmd[3] ) == 0 )
+                    strcmp( irc->password, cmd[3] ) == 0 &&
+                    set_getbool( &irc->b->set, "allow_takeover" ) )
                 {
                         irc_switch_fd( irc, ipc_child_recv_fd );
@@ -464 +471 @@
                                 break;
                 }
-                if( l == NULL )
+                if( l == NULL ||
+                    !set_getbool( &irc->b->set, "allow_takeover" ) ||
+                    !set_getbool( &old->b->set, "allow_takeover" ) )
                         return FALSE;