adab1e254b
- adjust commented-out paths in sample config file so that sockets used for certain optional features (e.g. the LDA) are placed in a a directory which already exists. ok+help from Brad
23 lines
1007 B
Plaintext
23 lines
1007 B
Plaintext
$OpenBSD: patch-src_master_master-settings_c,v 1.11 2011/03/03 00:40:05 sthen Exp $
|
|
--- src/master/master-settings.c.orig Mon May 24 16:01:15 2010
|
|
+++ src/master/master-settings.c Thu Mar 3 00:21:58 2011
|
|
@@ -633,7 +633,8 @@ static void unlink_auth_sockets(const char *path, cons
|
|
i_error("lstat(%s) failed: %m", str_c(str));
|
|
continue;
|
|
}
|
|
- if (!S_ISSOCK(st.st_mode))
|
|
+ /* delete also FIFOs created by v2.0 */
|
|
+ if (!S_ISSOCK(st.st_mode) && !S_ISFIFO(st.st_mode))
|
|
continue;
|
|
|
|
/* try to avoid unlinking sockets if someone's already
|
|
@@ -641,7 +642,7 @@ static void unlink_auth_sockets(const char *path, cons
|
|
when SIGHUPing a child process might catch the new
|
|
connection before it notices that it's supposed
|
|
to die. null_fd == -1 check is a bit kludgy, but works.. */
|
|
- if (null_fd == -1) {
|
|
+ if (null_fd == -1 && S_ISSOCK(st.st_mode)) {
|
|
int fd = net_connect_unix(str_c(str));
|
|
if (fd != -1 || errno != ECONNREFUSED) {
|
|
i_fatal("Dovecot is already running? "
|