From d0ec200a279e5ccef414685979f13f7063702ba6 Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Fri, 1 Dec 2006 19:22:42 +0000 Subject: [PATCH 1/3] Unlink any existing socket before binding --- src/mini-atd/setup.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mini-atd/setup.c b/src/mini-atd/setup.c index 0f20317..32bff7d 100644 --- a/src/mini-atd/setup.c +++ b/src/mini-atd/setup.c @@ -128,6 +128,7 @@ int setup_socket(const char* name, int perms) addr.sun_family = AF_UNIX; strcpy(addr.sun_path, name); // main() ensures it is less than UNIX_PATH_MAX bytes + unlink(name); // unlink any existing socket, but ignore errors if(bind(fd, (struct sockaddr*)&addr, sizeof(addr))) { LOG(LOG_CRIT, "Couldn't bind socket (fd %d) to file ``%s'' - %s (%d).", fd, name, strerror(errno), errno); From 2b14f820400ce7311c07024e25bf78e3939328de Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Fri, 1 Dec 2006 19:25:46 +0000 Subject: [PATCH 2/3] Always log to syslog, regardless of mode --- src/mini-atd/setup.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mini-atd/setup.c b/src/mini-atd/setup.c index 32bff7d..612d23f 100644 --- a/src/mini-atd/setup.c +++ b/src/mini-atd/setup.c @@ -29,9 +29,8 @@ void do_log(int level, const char* fmt, ...) va_start(va, fmt); - if(Daemon) { - vsyslog(level, fmt, va); - } else { + vsyslog(level, fmt, va); + if(!Daemon) { FILE* out = stdout; switch(level) { From 5586bf98f920b5a93e5e6a2d5f589f8c3d1b9f21 Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Fri, 1 Dec 2006 19:26:08 +0000 Subject: [PATCH 3/3] Bump version --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index cf11b33..4705925 100644 --- a/version +++ b/version @@ -12,7 +12,7 @@ # suffixed with a string. VERMAJOR=1 VERMINOR=1 -VERMICRO=0 +VERMICRO=1 VEREXTRA="" # kate: replace-trailing-space-save true; space-indent true; tab-width 4;