Changeset 4c225f0

Timestamp:

2011-10-20T03:18:23Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6a45181

Parents:

32bea82

Message:

Drop the on-disk IPC socket by default. Nothing uses it. If one really wants
it, it can be restored using the --ipcsocket= configure option.

Files:

• configure (modified) (2 diffs)
• ipc.c (modified) (1 diff)

configure

@@ -19 +19 @@
 libevent='/usr/'
 pidfile='/var/run/bitlbee.pid'
-ipcsocket='/var/run/bitlbee.sock'
+ipcsocket=''
 pcdir='$prefix/lib/pkgconfig'
 systemlibdirs="/lib /lib64 /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64"
@@ -67 +67 @@
 --pidfile=...                                           $pidfile
 --config=...                                            $config
---ipcsocket=...                                         $ipcsocket
 
 --msn=0/1       Disable/enable MSN part                 $msn

ipc.c

@@ -909 +909 @@
         int serversock;
 
+        if (!IPCSOCKET || !*IPCSOCKET)
+                return 1;
+
         /* Clean up old socket files that were hanging around.. */
         if (unlink(IPCSOCKET) == -1 && errno != ENOENT) {