X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=e8f6948437aac8c0f03b538381afc5ea20b55fe4;hp=eac09f056af21cbfc9c5b4994c7150f200606ae5;hb=030a9d5c9fe28328d5db977bf2c8ddbf7302673d;hpb=837cd1ab890645d9fd7d0d85139fdf076d987ea4

diff --git a/command.c b/command.c
index eac09f05..e8f69484 100644
--- a/command.c
+++ b/command.c
@@ -171,7 +171,7 @@ static int check_sender_args(int argc, char * const * argv, struct sender_comman
 	const char *subcmds[] = {"add", "delete", "allow", "deny", "on", "off", NULL};
 
 	scd->sender_num = -1;
-	if (argc < 2)
+	if (argc < 3)
 		return -E_COMMAND_SYNTAX;
 	for (i = 0; senders[i].name; i++)
 		if (!strcmp(senders[i].name, argv[1]))
@@ -425,9 +425,10 @@ static int com_version(struct command_context *cc)
 	char *msg;
 	size_t len;
 
-	if (cc->argc != 1)
-		return -E_COMMAND_SYNTAX;
-	len = xasprintf(&msg, "%s", version_text("server"));
+	if (cc->argc > 1 && strcmp(cc->argv[1], "-v") == 0)
+		len = xasprintf(&msg, "%s", version_text("server"));
+	else
+		len = xasprintf(&msg, "%s\n", version_single_line("server"));
 	return send_sb(&cc->scc, msg, len, SBD_OUTPUT, false);
 }