From: Andre Noll <maan@systemlinux.org>
Date: Sun, 18 Apr 2010 23:14:18 +0000 (+0200)
Subject: Merge remote branch 'athcx/v0.2' into v0.2
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=c44b4b4d6b229e64389947ede9c4716969f2a780;hp=f2bddd301ffc825f860ff9f10763ac5a4b25616d;p=paraslash.git

Merge remote branch 'athcx/v0.2' into v0.2
---

diff --git a/fade.ggo b/fade.ggo
index f467c199..a2bb3112 100644
--- a/fade.ggo
+++ b/fade.ggo
@@ -65,9 +65,9 @@ playing if unset"
 
 option "wake_hour" H
 #~~~~~~~~~~~~~~~~~~~
- "(0-23)"
+"(0-23) (default: now + 8 hours)"
+
 	int typestr="hour"
-	default="8"
 	optional
 
 option "wake_min" M
diff --git a/net.c b/net.c
index 88eb20e5..032b02c3 100644
--- a/net.c
+++ b/net.c
@@ -120,7 +120,7 @@ static int sendall(int fd, const char *buf, size_t *len)
 		total += n;
 		bytesleft -= n;
 		if (total < *len)
-			PARA_DEBUG_LOG("short write (%zd byte(s) left)",
+			PARA_DEBUG_LOG("short write (%zd byte(s) left)\n",
 				*len - total);
 	}
 	*len = total; /* return number actually sent here */
diff --git a/server.c b/server.c
index e39354e7..b2242e07 100644
--- a/server.c
+++ b/server.c
@@ -216,7 +216,7 @@ static void parse_config(int override)
 	char *cf;
 
 	if (conf.config_file_given)
-		cf = conf.config_file_arg;
+		cf = para_strdup(conf.config_file_arg);
 	else
 		cf = make_message("%s/.paraslash/server.conf", home);
 	free(user_list_file);