X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=command.c;h=1810e5b1f0eb6793a97370604431569431566e2c;hb=4d5a9b90c3e9cbdff019776d05792beb57fbfa31;hp=1ca54da90191fd270c98b3001d16a4b5f5c04c53;hpb=343f3c63fc3a7f9ca4ba4163c9e4cf06cde8d0c3;p=paraslash.git

diff --git a/command.c b/command.c
index 1ca54da9..1810e5b1 100644
--- a/command.c
+++ b/command.c
@@ -185,17 +185,9 @@ static int check_sender_args(int argc, char * const * argv, struct sender_comman
 		break;
 	case SENDER_DENY:
 	case SENDER_ALLOW:
-		if (argc != 4 && argc != 5)
+		if (argc != 4 || parse_cidr(argv[3], scd->host,
+				sizeof(scd->host), &scd->netmask) == NULL)
 			return -E_COMMAND_SYNTAX;
-		if (!is_valid_ipv4_address(argv[3]))
-			return -E_COMMAND_SYNTAX;
-		scd->netmask = 32;
-		if (argc == 5) {
-			scd->netmask = atoi(argv[4]);
-			if (scd->netmask < 0 || scd->netmask > 32)
-				return -E_COMMAND_SYNTAX;
-		}
-		strncpy(scd->host, argv[3], sizeof(scd->host));
 		break;
 	case SENDER_ADD:
 	case SENDER_DELETE:
@@ -315,8 +307,13 @@ int com_stat(int fd, int argc, char * const * argv)
 
 	para_sigaction(SIGUSR1, dummy);
 
-	if (argc > 1)
-		num = atoi(argv[1]);
+	if (argc > 2)
+		return -E_COMMAND_SYNTAX;
+	if (argc > 1) {
+		ret = para_atoi32(argv[1], &num);
+		if (ret < 0)
+			goto out;
+	}
 	for (;;) {
 
 		mmd_dup(nmmd);
@@ -390,10 +387,8 @@ int com_help(int fd, int argc, char * const * argv)
 	}
 	/* argument given for help */
 	cmd = get_cmd_ptr(argv[1], &handler);
-	if (!cmd) {
-		free(handler);
+	if (!cmd)
 		return -E_BAD_CMD;
-	}
 	perms = cmd_perms_itohuman(cmd->perms);
 	ret = send_va_buffer(fd,
 		"%s - %s\n\n"