diff options
| author | Rishi Srivatsavai <Rishi.Srivatsavai@Sun.COM> | 2009-05-29 17:32:59 -0400 |
|---|---|---|
| committer | Rishi Srivatsavai <Rishi.Srivatsavai@Sun.COM> | 2009-05-29 17:32:59 -0400 |
| commit | 180be2b71286f24b86109da3865e48b6ed708bcc (patch) | |
| tree | 877a9b9c6bff902aee6107189ce967f0bd7f94a0 /usr | |
| parent | 265f37a1b4806cf40d4e518a73709114cfd047a4 (diff) | |
| download | illumos-joyent-180be2b71286f24b86109da3865e48b6ed708bcc.tar.gz | |
6795445 mdnsd holds onto /etc/resolv.conf, leaks file descriptor
6741196 mdnsd parse DNS server list error on console when resolv.conf doesn't exist
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/cmd/cmd-inet/usr.lib/mdnsd/DNSCommon.c | 2 | ||||
| -rw-r--r-- | usr/src/cmd/cmd-inet/usr.lib/mdnsd/PosixDaemon.c | 2 | ||||
| -rw-r--r-- | usr/src/cmd/cmd-inet/usr.lib/mdnsd/mDNSPosix.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/DNSCommon.c b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/DNSCommon.c index 73801fc781..ce771e3188 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/DNSCommon.c +++ b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/DNSCommon.c @@ -2128,7 +2128,7 @@ mDNSexport void mDNS_Lock(mDNS *const m) if (m->timenow_last - m->timenow > 0) { m->timenow_adjust += m->timenow_last - m->timenow; - LogMsg("mDNSPlatformRawTime went backwards by %ld ticks; setting correction factor to %ld", m->timenow_last - m->timenow, m->timenow_adjust); + LogMsgNoIdent("mDNSPlatformRawTime went backwards by %ld ticks; setting correction factor to %ld", m->timenow_last - m->timenow, m->timenow_adjust); m->timenow = m->timenow_last; } m->timenow_last = m->timenow; diff --git a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/PosixDaemon.c b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/PosixDaemon.c index 3938f8be80..9bf03a9548 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/PosixDaemon.c +++ b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/PosixDaemon.c @@ -155,7 +155,7 @@ static void Reconfigure(mDNS *m) mDNS_SetPrimaryInterfaceInfo(m, NULL, NULL, NULL); mDNS_DeleteDNSServers(m); if (ParseDNSServers(m, uDNS_SERVERS_FILE) < 0) - LogMsg("Unable to parse DNS server list. Unicast DNS-SD unavailable"); + LogMsgNoIdent("Unable to parse DNS server list. Unicast DNS-SD unavailable"); ReadDDNSSettingsFromConfFile(m, CONFIG_FILE, &DynDNSHostname, &DynDNSZone, NULL); FindDefaultRouteIP(&DynDNSIP); if (DynDNSHostname.c[0]) mDNS_AddDynDNSHostName(m, &DynDNSHostname, NULL, NULL); diff --git a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/mDNSPosix.c b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/mDNSPosix.c index 179d84027f..933078dab0 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/mDNSPosix.c +++ b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/mDNSPosix.c @@ -674,6 +674,7 @@ mDNSexport int ParseDNSServers(mDNS *m, const char *filePath) numOfServers++; } } + fclose(fp); return (numOfServers > 0) ? 0 : -1; } |