Re: [PATCH 2/3] Reset network setting input counters for IPv4 and IPv6 (#553761).

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Ack.

On 01/19/2010 03:43 AM, David Cantrell wrote:
In loader, the manual TCP/IP configuration loop prompts the user then
validates the input.  Each time a particular piece of input validates,
the counter is incremented.  If the counter does not equal the right now
at the end of the loop, we tell the user to re-enter the information
correctly.  But the second time around, if any input was valid the first
time, it will be counted again, throwing off the count we check at the
end of the loop.

This patch just resets the IPv4 and IPv6 counters if we detected invalid
input.
---
  loader/net.c |    2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/loader/net.c b/loader/net.c
index 9ecfeab..9e4daa1 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -1093,6 +1093,7 @@ int manualNetConfig(char * device, iface_t * iface,

          /* we might be done now */
          if (stack[IPV4]&&  have[IPV4] != 2) {
+            have[IPV4] = 0;
              newtWinMessage(_("Missing Information"), _("Retry"),
                             _("You must enter both a valid IPv4 address and a "
                               "network mask or CIDR prefix."));
@@ -1100,6 +1101,7 @@ int manualNetConfig(char * device, iface_t * iface,

  #ifdef ENABLE_IPV6
          if (stack[IPV6]&&  have[IPV6] != 2) {
+            have[IPV6] = 0;
              newtWinMessage(_("Missing Information"), _("Retry"),
                             _("You must enter both a valid IPv6 address and a "
                               "CIDR prefix."));

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux