Author: igalic
Date: Fri Sep 23 04:51:40 2011
New Revision: 1174515
URL: http://svn.apache.org/viewvc?rev=1174515&view=rev
Log:
TS-953: this should fix the build failure introduced by r1174513
Modified:
trafficserver/traffic/trunk/mgmt/tools/SysAPI.cc
Modified: trafficserver/traffic/trunk/mgmt/tools/SysAPI.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/tools/SysAPI.cc?rev=1174515&r1=1174514&r2=1174515&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/tools/SysAPI.cc (original)
+++ trafficserver/traffic/trunk/mgmt/tools/SysAPI.cc Fri Sep 23 04:51:40 2011
@@ -1401,7 +1401,6 @@ int NetConfig_Action(int index, ...);
int TimeConfig_Action(int index, bool restart, ...);
int Net_GetNIC_Values(char *interface, char *status, char *onboot, char
*static_ip, char *ip, char *netmask,
char *gateway);
-int find_value(const char *pathname, const char *key, char *value, const char
*delim, int no);
static bool recordRegexCheck(const char *pattern, const char *value);
int
@@ -1604,10 +1603,10 @@ Net_GetDomain(char *domain, size_t domai
{
// domain can be defined using search or domain keyword
domain[0] = 0;
- return !find_value("/etc/resolv.conf", "search", domain, " ", 0);
+ return !find_value("/etc/resolv.conf", "search", domain, domain_len " ", 0);
/* if there is bug file against this, we should search for domain keyword
as well
- if (!find_value("/etc/resolv.conf", "search", domain, " ", 0)) {
- return (!find_value("/etc/resolv.conf", "domain", domain, " ", 0));
+ if (!find_value("/etc/resolv.conf", "search", domain, domain_len " ", 0))
{
+ return (!find_value("/etc/resolv.conf", "domain", domain, domain_len " ",
0));
}else
return 0;
*/
@@ -1634,7 +1633,7 @@ Net_GetDNS_Servers(char *dns, size_t dns
char ip[80];
dns[0] = 0;
int i = 0;
- while (find_value("/etc/resolv.conf", "nameserver", ip, " ", i++)) {
+ while (find_value("/etc/resolv.conf", "nameserver", ip, sizeof(ip), " ",
i++)) {
ink_strlcpy(dns, ip, dns_len);
ink_strlcat(dns, " ", dns_len);
}
@@ -1673,13 +1672,6 @@ Net_SetDNS_Servers(char *dns)
}
int
-Net_GetDNS_Server(char *server, int no)
-{
- server[0] = 0;
- return (!find_value("/etc/resolv.conf", "nameserver", server, " ", no));
-}
-
-int
Net_GetNetworkIntCount()
{
const int BUFFLEN = 80;