Changeset 601e813 for ipc.c

Timestamp:

2006-05-24T23:04:18Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

80c1e4d

Parents:

46ad029 (diff), fc630f9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

[merge] Wilmer

File:

• ipc.c (modified) (3 diffs)

ipc.c

@@ -84 +84 @@
 void ipc_master_cmd_restart( irc_t *data, char **cmd )
 {
-        struct bitlbee_child *child = (void*) data;
-        
         if( global.conf->runmode != RUNMODE_FORKDAEMON )
         {
@@ -509 +507 @@
         }
 
-        if (bind(serversock, &un_addr, sizeof(un_addr)) == -1) {
+        if (bind(serversock, (struct sockaddr *)&un_addr, sizeof(un_addr)) == -1) {
                 log_message( LOGLVL_WARNING, "Unable to bind UNIX socket to %s: %s", IPCSOCKET, strerror(errno) );
                 return 0;
@@ -573 +571 @@
         ipc_to_children_str( "OPERMSG :New BitlBee master process started (version " BITLBEE_VERSION ")\r\n" );
         
+        fclose( fp );
         return 1;
 }