revert revert revert

1 files changed, 17 insertions, 34 deletions

diff --git a/loader/net.c b/loader/net.c
index df3843c57..d1bdff79b 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -263,10 +263,6 @@ static int getDnsServers(struct networkDeviceConfig * cfg) {
 				      { NULL, NULL, 0 } };
 
     do {
-      	struct in_addr addr;
-
-        pumpIaExtCode *dns;
-
 	rc = newtWinEntries(_("Nameserver"), 
 		_("Your dynamic IP request returned IP configuration "
 		  "information, but it did not include a DNS nameserver. "
@@ -277,16 +273,17 @@ static int getDnsServers(struct networkDeviceConfig * cfg) {
 
 	if (rc == 2) return LOADER_BACK;
 
-        dns = pumpGetAddrArray(&cfg->dev.servers, PUMP_BOOTP_OPTION_DNS);
-	if (dns && ns && *ns && !inet_aton(ns, &addr)) {
+	if (ns && *ns && !inet_aton(ns, &cfg->dev.dnsServers[0])) {
 	    newtWinMessage(_("Invalid IP Information"), _("Retry"),
 			_("You entered an invalid IP address."));
 	    rc = 2;
 	} 
-	else
-	    pumpAddAddress(&cfg->dev.servers, PUMP_BOOTP_OPTION_DNS, &addr);
 
     } while (rc == 2);
+
+    cfg->dev.set |= PUMP_NETINFO_HAS_DNS;
+    cfg->dev.numDns = 1;
+
     return LOADER_OK;
 }
 
@@ -299,7 +296,6 @@ int readNetConfig(char * device, struct networkDeviceConfig * cfg, int flags) {
     struct in_addr addr;
     char dhcpChoice;
     char * chptr;
-    pumpIaExtCode * dns;
 
     text = newtTextboxReflowed(-1, -1, 
 		_("Please enter the IP configuration for this machine. Each "
@@ -326,8 +322,6 @@ int readNetConfig(char * device, struct networkDeviceConfig * cfg, int flags) {
     c.nsEntry = newtEntry(-1, -1, NULL, 16, &c.ns, 0);
 
     if (!cfg->isDynamic) {
-        pumpIaExtCode *dns;
-
 	if (cfg->dev.set & PUMP_INTFINFO_HAS_IP)
 	    newtEntrySet(c.ipEntry, inet_ntoa(cfg->dev.ip), 1);
 
@@ -337,9 +331,8 @@ int readNetConfig(char * device, struct networkDeviceConfig * cfg, int flags) {
 	if (cfg->dev.set & PUMP_NETINFO_HAS_GATEWAY)
 	    newtEntrySet(c.gwEntry, inet_ntoa(cfg->dev.gateway), 1);
 
-        dns = pumpGetAddrArray(&cfg->dev.servers, PUMP_BOOTP_OPTION_DNS);
-	if (dns != NULL)
-	    newtEntrySet(c.nsEntry, inet_ntoa(*dns->servers), 1);
+	if (cfg->dev.numDns)
+	    newtEntrySet(c.nsEntry, inet_ntoa(cfg->dev.dnsServers[0]), 1);
 
     	dhcpChoice = ' ';
     } else {
@@ -429,7 +422,7 @@ int readNetConfig(char * device, struct networkDeviceConfig * cfg, int flags) {
 #ifdef __STANDALONE__
 		i = 2;
 #else		    
-		if (!pumpGetAddrArray(&newCfg.dev.servers, PUMP_BOOTP_OPTION_DNS)) {
+		if (!(newCfg.dev.set & PUMP_NETINFO_HAS_DNS)) {
 		    logMessage("pump worked, but didn't return a DNS server");
 		    i = getDnsServers(&newCfg);
 		    i = i ? 0 : 2;
@@ -459,10 +452,10 @@ int readNetConfig(char * device, struct networkDeviceConfig * cfg, int flags) {
 	}
     }
 
-    dns = pumpGetAddrArray(&cfg->dev.servers, PUMP_BOOTP_OPTION_DNS);
-    if (dns == NULL) {
+    if (!(cfg->dev.numDns)) {
 	if (*c.ns && inet_aton(c.ns, &addr)) {
-	    pumpAddAddress(&cfg->dev.servers, PUMP_BOOTP_OPTION_DNS, &addr);
+	    cfg->dev.dnsServers[0] = addr;
+	    cfg->dev.numDns = 1;
 	}
     }
 
@@ -471,7 +464,6 @@ int readNetConfig(char * device, struct networkDeviceConfig * cfg, int flags) {
     if (!FL_TESTING(flags)) {
 	configureNetwork(cfg);
 	findHostAndDomain(cfg, flags);
-        pumpWriteHosts("/etc/hosts", &cfg->dev.servers);
 	writeResolvConf(cfg);
     }
 
@@ -536,11 +528,9 @@ int writeNetInfo(const char * fn, struct networkDeviceConfig * dev,
 int writeResolvConf(struct networkDeviceConfig * net) {
     char * filename = "/etc/resolv.conf";
     FILE * f;
-    pumpIaExtCode *dns;
     int i;
 
-    dns = pumpGetAddrArray(&net->dev.servers, PUMP_BOOTP_OPTION_DNS);
-    if (!(net->dev.set & PUMP_NETINFO_HAS_DOMAIN) && dns == NULL)
+    if (!(net->dev.set & PUMP_NETINFO_HAS_DOMAIN) && !net->dev.numDns)
     	return LOADER_ERROR;
 
     f = fopen(filename, "w");
@@ -552,8 +542,8 @@ int writeResolvConf(struct networkDeviceConfig * net) {
     if (net->dev.set & PUMP_NETINFO_HAS_DOMAIN)
 	fprintf(f, "search %s\n", net->dev.domain);
 
-    for (i = 0; i < dns->n; i++) 
-	fprintf(f, "nameserver %s\n", inet_ntoa(dns->servers[i]));
+    for (i = 0; i < net->dev.numDns; i++) 
+	fprintf(f, "nameserver %s\n", inet_ntoa(net->dev.dnsServers[i]));
 
     fclose(f);
 
@@ -569,7 +559,6 @@ int findHostAndDomain(struct networkDeviceConfig * dev, int flags) {
 #endif
 
     if (!FL_TESTING(flags)) {
-        pumpWriteHosts("/etc/hosts", &dev->dev.servers);
 	writeResolvConf(dev);
     }
 
@@ -739,7 +728,6 @@ int kickstartNetwork(char ** devicePtr, struct networkDeviceConfig * netDev,
     if (!noDns)
 	findHostAndDomain(netDev, flags);
 
-    pumpWriteHosts("/etc/hosts", &netDev->dev.servers);
     writeResolvConf(netDev);
     
     return 0;
@@ -784,15 +772,11 @@ int main(int argc, const char **argv) {
 	    { 0, 0, 0, 0, 0 }
     };
 
-    setlocale(LC_ALL, "");
-    bindtextdomain(PUMP_PACKAGE_NAME, NULL);
-    textdomain(PUMP_PACKAGE_NAME);
 	
     netDev = malloc(sizeof(struct networkDeviceConfig));
     memset(netDev,'\0',sizeof(struct networkDeviceConfig));
     optCon = poptGetContext("netconfig", argc, argv, Options, 0);
     while ((rc = poptGetNextOpt(optCon)) >= 0) {
-        pumpIaExtCode *dns;
 	parseAddress = NULL;
 	netSet = 0;
 
@@ -810,9 +794,8 @@ int main(int argc, const char **argv) {
 	    break;
 		
 	  case 'n':
-	    dns = pumpAddAddress(&netDev->dev.servers,
-	                         PUMP_BOOTP_OPTION_DNS, NULL);
-	    parseAddress = &dns->servers[dns->n - 1];
+	    parseAddress = &netDev->dev.dnsServers[netDev->dev.numDns++];
+	    netSet = PUMP_NETINFO_HAS_DNS;
 	    break;
 
 	  case 'm':
@@ -857,7 +840,7 @@ int main(int argc, const char **argv) {
 	    newtInit();
 	    newtCls();
 	    newtPushHelpLine(_(" <Tab>/<Alt-Tab> between elements   |   <Space> selects  |   <F12> next screen"));
-	    snprintf(roottext,80,_("netconfig %s  (C) 2000 Red Hat, Inc."), VERSION);
+	    snprintf(roottext,80,_("netconfig %s  (C) 1999 Red Hat, Inc."), VERSION);
 	    newtDrawRootText(0, 0, roottext);
 	    x=newtWinChoice(_("Network configuration"),_("Yes"),_("No"),
 			  _("Would you like to set up networking?"));