diff options
| author | ume <ume@FreeBSD.org> | 2006-12-15 20:49:44 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2006-12-15 20:49:44 +0000 |
| commit | 89a3ca4811ee4b83778a8ddb7d54874dff19b707 (patch) | |
| tree | 98ad4d99a031d8761bab0970ed88904bab483af2 /lib/libc/resolv/res_init.c | |
| parent | abf24ba802c1b13998b4553a96c4f76e95ddae07 (diff) | |
| download | FreeBSD-src-89a3ca4811ee4b83778a8ddb7d54874dff19b707.zip FreeBSD-src-89a3ca4811ee4b83778a8ddb7d54874dff19b707.tar.gz | |
Vendor import of BIND 9.3.3
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 28a3ebd..fd82e872 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 "port_before.h" @@ -237,17 +237,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 */ |
