diff options
| author | ume <ume@FreeBSD.org> | 2006-12-15 20:59:55 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2006-12-15 20:59:55 +0000 |
| commit | 705f242eca7e1a52b43a762cced4eaa8de4c0818 (patch) | |
| tree | 2cc733581f24f5c52484da3c954755891790e893 /lib/libc/resolv/res_init.c | |
| parent | bf42d1f92c9ee728800e7dea18fc78216171bddb (diff) | |
| download | FreeBSD-src-705f242eca7e1a52b43a762cced4eaa8de4c0818.zip FreeBSD-src-705f242eca7e1a52b43a762cced4eaa8de4c0818.tar.gz | |
Merge BIND9 9.3.3 into main chunk.
Obtained from: ISC
MFC after: 1 week
Diffstat (limited to 'lib/libc/resolv/res_init.c')
| -rw-r--r-- | lib/libc/resolv/res_init.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/lib/libc/resolv/res_init.c b/lib/libc/resolv/res_init.c index a42eb80..2d2ae1e 100644 --- a/lib/libc/resolv/res_init.c +++ b/lib/libc/resolv/res_init.c @@ -70,7 +70,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93"; -static const char rcsid[] = "$Id: res_init.c,v 1.9.2.5.4.5 2005/11/03 00:00:52 marka Exp $"; +static const char rcsid[] = "$Id: res_init.c,v 1.9.2.5.4.6 2006/08/30 23:23:01 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); @@ -243,17 +243,10 @@ __res_vinit(res_state statp, int preinit) { if (buf[0] == '+') buf[0] = '.'; cp = strchr(buf, '.'); - if (cp == NULL) { - if (strlcpy(statp->defdname, buf, - sizeof(statp->defdname)) - >= sizeof(statp->defdname)) - goto freedata; - } else { - if (strlcpy(statp->defdname, cp+1, - sizeof(statp->defdname)) - >= sizeof(statp->defdname)) - goto freedata; - } + cp = (cp == NULL) ? buf : (cp + 1); + if (strlen(cp) >= sizeof(statp->defdname)) + goto freedata; + strcpy(statp->defdname, cp); } } #endif /* SOLARIS2 */ |
