summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--loader2/net.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f80aa702..50ac0877d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
* loader2/nfsinstall.c (getFileFromNfs): Make sure we only add one
slash for NFS path names (#253539).
+ * loader2/net.c (cidrCallback): If user provided a dotted-quad
+ netmask for IPv4, check it and if it validates, skip the CIDR
+ validation (#243250).
+
2007-08-22 Chris Lumens <clumens@redhat.com>
* anaconda.spec: Update s-c-date dependency (#253444).
diff --git a/loader2/net.c b/loader2/net.c
index c73e682e9..227ed9b0d 100644
--- a/loader2/net.c
+++ b/loader2/net.c
@@ -73,11 +73,15 @@ char *netServerPrompt = \
static void cidrCallback(newtComponent co, void * dptr) {
struct intfconfig_s * data = dptr;
int cidr, upper = 0;
+ struct in_addr addr;
if (co == data->cidr4Entry) {
if (data->cidr4 == NULL && data->ipv4 == NULL)
return;
+ if (inet_pton(AF_INET, data->cidr4, &addr) >= 1)
+ return;
+
cidr = atoi(data->cidr4);
if (strcmp(data->ipv4, ""))