From: Andre Noll <maan@systemlinux.org>
Date: Sun, 31 Jan 2010 22:25:16 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.2~63
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=9609fd30e0d3db45ede3ab5c6bc3a77c15b6aef8;hp=a2fb56bdfa2726d401de8c1c3cd569ba96a5ccc3

Merge branch 'maint'

Conflicts:
	recv_common.c
---

diff --git a/recv_common.c b/recv_common.c
index 535d8c16..bbaf1396 100644
--- a/recv_common.c
+++ b/recv_common.c
@@ -47,14 +47,13 @@ static void *parse_receiver_args(int receiver_num, char *options)
 			return NULL;
 		for (i = argc - 1; i >= 0; i--)
 			argv[i + 1] = argv[i];
-		argv[0] = NULL;
 		argc++;
 	} else {
 		argc = 1;
 		argv = para_malloc(2 * sizeof(char*));
-		argv[0] = NULL;
 		argv[1] = NULL;
 	}
+	argv[0] = make_message("%s_recv", r->name);
 	conf = r->parse_config(argc, argv);
 	for (i = 1; i < argc; i++)
 		free(argv[i]);