X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Fcollectd.c;h=c9e49f8070536e8d1b99044c74fa0352b7c40178;hb=f2f7049e8faff8043b12d7c7548d9398d3b3ada4;hp=8573579166ab7e0aa13078d934ec92ffbf30324e;hpb=6159b6f81403b90eb2b1f1c60fa8006cd3405d1b;p=collectd.git

diff --git a/src/daemon/collectd.c b/src/daemon/collectd.c
index 85735791..c9e49f80 100644
--- a/src/daemon/collectd.c
+++ b/src/daemon/collectd.c
@@ -101,7 +101,7 @@ static int init_hostname (void)
 	int status;
 
 	str = global_option_get ("Hostname");
-	if (str != NULL)
+	if ((str != NULL) && (str[0] != 0))
 	{
 		sstrncpy (hostname_g, str, sizeof (hostname_g));
 		return (0);
@@ -602,7 +602,7 @@ int main (int argc, char **argv)
 	 * something wrong.
 	 */
 	if (init_global_variables () != 0)
-		return (1);
+		exit (EXIT_FAILURE);
 
 	if (test_config)
 		return (0);