diff options
| author | David Cantrell <dcantrell@redhat.com> | 2006-06-13 21:32:31 +0000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2006-06-13 21:32:31 +0000 |
| commit | 8439bd2bb9152173fd7c3240bfb32e9abb8d492d (patch) | |
| tree | 41e8eee9c087a6cd3b34d892bd06157987454f1c /loader2/net.c | |
| parent | bcbfe79fc6643de113da722a4f331f02ad0b6c3c (diff) | |
| download | anaconda-8439bd2bb9152173fd7c3240bfb32e9abb8d492d.tar.gz anaconda-8439bd2bb9152173fd7c3240bfb32e9abb8d492d.tar.xz anaconda-8439bd2bb9152173fd7c3240bfb32e9abb8d492d.zip | |
* loader2/net.c: Last inet_ntoa() -> inet_ntop() conversions.
* loader2/urls.c: Likewise.
Diffstat (limited to 'loader2/net.c')
| -rw-r--r-- | loader2/net.c | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/loader2/net.c b/loader2/net.c index 71329c5c2..84c532f82 100644 --- a/loader2/net.c +++ b/loader2/net.c @@ -441,26 +441,29 @@ void setupNetworkDeviceConfig(struct networkDeviceConfig * cfg, if (loaderData->dns) { char * buf; + char ret[47]; buf = strdup(loaderData->dns); /* Scan the dns parameter for multiple comma-separated IP addresses */ - c = strtok(buf, ","); - while ((cfg->dev.numDns < MAX_DNS_SERVERS) && (c != NULL)) { - if (inet_pton(AF_INET, c, &addr)) { - cfg->dev.dnsServers[cfg->dev.numDns] = ip_addr_in(&addr); - cfg->dev.numDns++; - logMessage(DEBUGLVL, "adding %s", inet_ntoa(addr)); - c = strtok(NULL, ","); - } else if (inet_pton(AF_INET6, c, &addr6)) { - cfg->dev.dnsServers[cfg->dev.numDns] = ip_addr_in6(&addr6); - cfg->dev.numDns++; - logMessage(DEBUGLVL, "adding %s", inet_ntoa(addr)); - c = strtok(NULL, ","); - } - } - logMessage(INFO, "dnsservers is %s", loaderData->dns); - if (cfg->dev.numDns) - cfg->dev.set |= PUMP_NETINFO_HAS_DNS; + c = strtok(buf, ","); + while ((cfg->dev.numDns < MAX_DNS_SERVERS) && (c != NULL)) { + if (inet_pton(AF_INET, c, &addr)) { + cfg->dev.dnsServers[cfg->dev.numDns] = ip_addr_in(&addr); + cfg->dev.numDns++; + inet_ntop(AF_INET, &addr, ret, INET_ADDRSTRLEN); + logMessage(DEBUGLVL, "adding %s", ret); + c = strtok(NULL, ","); + } else if (inet_pton(AF_INET6, c, &addr6)) { + cfg->dev.dnsServers[cfg->dev.numDns] = ip_addr_in6(&addr6); + cfg->dev.numDns++; + inet_ntop(AF_INET6, &addr6, ret, INET6_ADDRSTRLEN); + logMessage(DEBUGLVL, "adding %s", ret); + c = strtok(NULL, ","); + } + } + logMessage(INFO, "dnsservers is %s", loaderData->dns); + if (cfg->dev.numDns) + cfg->dev.set |= PUMP_NETINFO_HAS_DNS; } if (loaderData->hostname) { |