Merge remote-tracking branch 'origin/next'

[ipfire-2.x.git] / src / misc-progs / setaliases.c

diff --git a/src/misc-progs/setaliases.c b/src/misc-progs/setaliases.c
index 93af1cb0a4ecd1e7832aad8b6943c9d903695680..10ffd438d934cd99e1f0977cbc7ff4c806d4fb2f 100644 (file)
--- a/src/misc-progs/setaliases.c
+++ b/src/misc-progs/setaliases.c
@@ -39,7 +39,6 @@ int main(void)
        char s[STRING_SIZE];
        char command[STRING_SIZE];
        char red_netmask[STRING_SIZE];
-       char red_broadcast[STRING_SIZE];
        char red_dev[STRING_SIZE];
        char default_gateway[STRING_SIZE];
        char *aliasip;
@@ -94,7 +93,7 @@ int main(void)
                exit(0);
 
        /* Get the RED interface details */
-       if((!findkey(kv, "RED_NETMASK", red_netmask)) || (!findkey(kv, "RED_BROADCAST", red_broadcast)) || 
+       if((!findkey(kv, "RED_NETMASK", red_netmask)) ||
                (!findkey(kv, "RED_DEV", red_dev)) || (!findkey(kv, "DEFAULT_GATEWAY", default_gateway)))
        {
                fprintf(stderr, "Cannot read RED settings\n");
@@ -113,12 +112,6 @@ int main(void)
                exit(1);
        }
 
-       if (!VALID_IP(red_broadcast))
-       {
-               fprintf(stderr, "Bad red_broadcast : %s\n", red_broadcast);
-               exit(1);
-       }
-
        if (!VALID_IP(default_gateway))
        {
                fprintf(stderr, "Bad default_gateway : %s\n", default_gateway);
@@ -184,8 +177,8 @@ int main(void)
 
                memset(command, 0, STRING_SIZE);
                snprintf(command, STRING_SIZE-1,
-                               "/sbin/ifconfig %s:%d %s netmask %s broadcast %s up",
-                            red_dev, alias, aliasip, red_netmask, red_broadcast);
+                               "/sbin/ifconfig %s:%d %s netmask %s up",
+                            red_dev, alias, aliasip, red_netmask);
                safe_system(command);
                memset(command, 0, STRING_SIZE);
                snprintf(command, STRING_SIZE-1,