diff --git a/src/mini-atd/setup.c b/src/mini-atd/setup.c index 0f20317..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) { @@ -128,6 +127,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); 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;