X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=e3b15a5ae0e44985a6279ac2f8e137d19fb3c9be;hp=229ec5c6fcbdfcc6c015ef41e082db2ff3a90f23;hb=33a282ec9378ca6b2d0707c6e9642a3e6b625cb4;hpb=3781a3df94ce9bb28c98369df7a140fb4c086c23

diff --git a/command.c b/command.c
index 229ec5c6..e3b15a5a 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:
@@ -791,8 +783,6 @@ __noreturn void handle_connect(int fd, const char *peername)
 	ret = cmd->handler(fd, argc, argv);
 	mutex_lock(mmd_mutex);
 	mmd->num_commands++;
-	free(mmd->afd.afhi.info_string);
-	free(mmd->afd.afhi.chunk_table);
 	mutex_unlock(mmd_mutex);
 	if (ret >= 0)
 		goto out;