diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-04-08 15:37:49 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-05-20 09:58:21 +0200 |
| commit | 165dd8ea1256d71d6a4f52c0a66dcc2799ef8f99 (patch) | |
| tree | c42072a99573d4d7cc03b2263e2c0c6d53f9c691 /freebsd/lib/libc/resolv/res_data.c | |
| parent | rtems-bsd-chunk: Include missing header file (diff) | |
| download | rtems-libbsd-165dd8ea1256d71d6a4f52c0a66dcc2799ef8f99.tar.bz2 | |
Update to FreeBSD Stable/9 2015-04-08
Diffstat (limited to 'freebsd/lib/libc/resolv/res_data.c')
| -rw-r--r-- | freebsd/lib/libc/resolv/res_data.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/freebsd/lib/libc/resolv/res_data.c b/freebsd/lib/libc/resolv/res_data.c index 0ce0c143..a5164c44 100644 --- a/freebsd/lib/libc/resolv/res_data.c +++ b/freebsd/lib/libc/resolv/res_data.c @@ -18,7 +18,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: res_data.c,v 1.3.18.2 2007/09/14 05:35:47 marka Exp $"; +static const char rcsid[] = "$Id: res_data.c,v 1.7 2008/12/11 09:59:00 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); @@ -109,13 +109,6 @@ res_init(void) { if (!(_res.options & RES_INIT)) _res.options = RES_DEFAULT; - /* - * This one used to initialize implicitly to zero, so unless the app - * has set it to something in particular, we can randomize it now. - */ - if (!_res.id) - _res.id = res_randomid(); - return (__res_vinit(&_res, 1)); } @@ -266,6 +259,16 @@ res_querydomain(const char *name, answer, anslen)); } +u_int +res_randomid(void) { + if ((_res.options & RES_INIT) == 0U && res_init() == -1) { + RES_SET_H_ERRNO(&_res, NETDB_INTERNAL); + return (-1); + } + + return (res_nrandomid(&_res)); +} + int res_opt(int n0, u_char *buf, int buflen, int anslen) { |