From aeb968e015a63be74f01e35d982951e708d55633 Mon Sep 17 00:00:00 2001 From: Wouter Verhelst Date: Fri, 14 Aug 2009 11:16:33 +0200 Subject: [PATCH] Fix error output dousers() previously tried to call g_message directly. Since we're running as daemon already at this point, g_message won't produce output. Fix by using err() instead. --- nbd-server.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/nbd-server.c b/nbd-server.c index 8774d51..1a2d79d 100644 --- a/nbd-server.c +++ b/nbd-server.c @@ -1626,26 +1626,25 @@ void serve_err(SERVER* serve, const char* msg) { void dousers(void) { struct passwd *pw; struct group *gr; + gchar* str; if(rungroup) { gr=getgrnam(rungroup); if(!gr) { - g_message("Invalid group name: %s", rungroup); - exit(EXIT_FAILURE); + str = g_strdup_printf("Invalid group name: %s", rungroup); + err(str); } if(setgid(gr->gr_gid)<0) { - g_message("Could not set GID: %s", strerror(errno)); - exit(EXIT_FAILURE); + err("Could not set GID: %m"); } } if(runuser) { pw=getpwnam(runuser); if(!pw) { - g_message("Invalid user name: %s", runuser); - exit(EXIT_FAILURE); + str = g_strdup_printf("Invalid user name: %s", runuser); + err(str); } if(setuid(pw->pw_uid)<0) { - g_message("Could not set UID: %s", strerror(errno)); - exit(EXIT_FAILURE); + err("Could not set UID: %m"); } } } -- 1.7.10.4