Merge branch 'crypt' into next

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index a14fff8b6b53c2e03be60781d4cd4c1fac50926b..fc5b5cace3c8e51e4ef1560c4c813131f7966020 100644 (file)
--- a/command.c
+++ b/command.c
@@ -183,17 +183,9 @@ static int check_sender_args(int argc, char * const * argv, struct sender_comman
                break;
        case SENDER_DENY:
        case SENDER_ALLOW:
                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;
                        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:
                break;
        case SENDER_ADD:
        case SENDER_DELETE: