From 50d754b2f4cca707e1165cc3dbc5deaded1fead5 Mon Sep 17 00:00:00 2001 From: franklahm Date: Mon, 21 Dec 2009 07:49:44 +0000 Subject: [PATCH] logger: write to fd 1 directly instead of /dev/tty. The latter cant be redirected --- etc/cnid_dbd/cmd_dbd.c | 4 +++- libatalk/util/logger.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/cnid_dbd/cmd_dbd.c b/etc/cnid_dbd/cmd_dbd.c index 4e609020..287912b6 100644 --- a/etc/cnid_dbd/cmd_dbd.c +++ b/etc/cnid_dbd/cmd_dbd.c @@ -1,5 +1,5 @@ /* - $Id: cmd_dbd.c,v 1.22 2009-12-21 07:32:01 franklahm Exp $ + $Id: cmd_dbd.c,v 1.23 2009-12-21 07:49:44 franklahm Exp $ Copyright (c) 2009 Frank Lahm @@ -342,6 +342,8 @@ int main(int argc, char **argv) } volpath = argv[optind]; + setvbuf(stdout, (char *) NULL, _IONBF, 0); + /* Remember cwd */ if ((cdir = open(".", O_RDONLY)) < 0) { dbd_log( LOGSTD, "Can't open dir: %s", strerror(errno)); diff --git a/libatalk/util/logger.c b/libatalk/util/logger.c index 477021c2..0664b09c 100644 --- a/libatalk/util/logger.c +++ b/libatalk/util/logger.c @@ -360,7 +360,7 @@ void log_setup(const char *filename, enum loglevels loglevel, enum logtypes logt /* Open log file as OPEN_LOGS_AS_UID*/ /* Is it /dev/tty ? */ if (strcmp(file_configs[logtype].filename, "/dev/tty") == 0) { - file_configs[logtype].fd = open( file_configs[logtype].filename, O_WRONLY); + file_configs[logtype].fd = 1; /* stdout */ } else { process_uid = geteuid(); if (process_uid) { -- 2.39.2