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

[master 2/2] Fixes problems in the manual network configuration screen in loader with IPv6.



A crash occurs after the IPv6 GUI has been enabled when we chose to configure
the network device manually. When the crash is fixed the screen still does not
appear. This patch fixes both the problems.
---
 isys/iface.h |    2 +-
 loader/net.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/isys/iface.h b/isys/iface.h
index 3f97935..820d10b 100644
--- a/isys/iface.h
+++ b/isys/iface.h
@@ -29,7 +29,7 @@
 #include <glib.h>
 
 /* Enumerated types used in iface.c as well as loader's network code */
-enum { IPUNUSED, IPV4, IPV6 };
+enum { IPUNUSED = -1, IPV4, IPV6 };
 
 enum { IPV4_UNUSED_METHOD, IPV4_DHCP_METHOD, IPV4_MANUAL_METHOD, IPV4_IBFT_METHOD, IPV4_IBFT_DHCP_METHOD };
 enum { IPV6_UNUSED_METHOD, IPV6_AUTO_METHOD, IPV6_DHCP_METHOD,
diff --git a/loader/net.c b/loader/net.c
index c3a6a75..75c1872 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -929,7 +929,7 @@ int manualNetConfig(char * device, iface_t * iface,
     }
 
     /* run the form */
-    while ((have[IPV4] != 2) && (have[IPV6] != 2)) {
+    while ((have[IPV4] != 2) || (have[IPV6] != 2)) {
         answer = newtRunForm(f);
 
         /* collect IPv4 data */
-- 
1.6.2.5


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