aboutsummaryrefslogtreecommitdiff
path: root/hesiod/hesiod.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-07-21 04:12:25 +0000
committerUlrich Drepper <drepper@redhat.com>2000-07-21 04:12:25 +0000
commit2f54c82dacba646139a773ab43fc2cdb47ee1f5b (patch)
tree083e05712adaa46da2ff502b6382b9eeaa0420a1 /hesiod/hesiod.c
parent89bc5366ba0418306d70becabe511a3f56a084e3 (diff)
downloadglibc-2f54c82dacba646139a773ab43fc2cdb47ee1f5b.tar
glibc-2f54c82dacba646139a773ab43fc2cdb47ee1f5b.tar.gz
glibc-2f54c82dacba646139a773ab43fc2cdb47ee1f5b.tar.bz2
glibc-2f54c82dacba646139a773ab43fc2cdb47ee1f5b.zip
Update.
* elf/Makefile (tests): Add nodlopen. Add rules to generate nodlopen. * include/dlfcn.h: Define __RTLD_DLOPEN. * elf/dl-load.c (_dl_map_object_from_fd): If DF_1_NOOPEN is set and this is a dlopen() call, do not load the binary. * dlfcn/dlopen.c: Add __RTLD_DLOPEN to mode passed down to _dl_open. * dlfcn/dlopenold.c: Likewise. * configure.in: Add test for -z nodelete option. * config.make.in: Define have-z-nodelete with libc_cv_z_nodelete. 2000-07-20 Mark Kettenis <kettenis@gnu.org> Make Hesiod NSS module thread-safe. * hesiod/README.hesiod: Update. * hesiod/Versions [GLIBC_2.2]: Add _nss_hesiod_getservbyport_r, _nss_hesiod_setprotoent, _nss_hesiod_endprotoent, _nss_hesiod_getprotobyname_r, and _nss_hesiod_getprotobynumber_r. * hesiod/Makefile (libnss_hesiod-routines): Add hesiod-init and hesiod-proto. * hesiod/nss_hesiod/hesiod-init.c: New file. * hesiod/nss_hesiod/hesiod-pwd.c: Rewritten for thread-safeness. * hesiod/nss_hesiod/hesiod-grp.c: Likewise. * hesiod/nss_hesiod/nss_hesiod.h: New file. * hesiod/nss_hesiod/hesiod-service.c (_nss_hesiod_getservbyport_r): New function. Provide support for looking up services by port number. * hesiod/nss_hesiod/hesiod-proto.c: New file. * hesiod/hesiod.c: Update from BIND 8.2.3-T5B. * hesiod/hesiod.h: Likewise. * hesiod/hesiod_p.h: Likewise. 2000-07-20 Mark Kettenis <kettenis@gnu.org> Fix problems with `struct __res_state' getting too big. * resolv/resolv.h (struct __sockaddr_in): New definition. (struct __res_state): Use __sockaddr_in instead of sockaddr_in in the private parts of the structure to save some space. * resolv/res_send.c (res_nsend): Cast &EXT(statp).nsaddrs[ns] to (struct sockaddr_in *) in call to sock_eq. Use memcpy to copy statp->nsaddr_list[ns] to &EXT(statp).nsaddrs[ns]. 2000-07-20 Ulrich Drepper <drepper@redhat.com> * sysdeps/mach/hurd/dl-sysdep.c: Likewise.
Diffstat (limited to 'hesiod/hesiod.c')
-rw-r--r--hesiod/hesiod.c830
1 files changed, 427 insertions, 403 deletions
diff --git a/hesiod/hesiod.c b/hesiod/hesiod.c
index f89a29ac95..3a01fd076b 100644
--- a/hesiod/hesiod.c
+++ b/hesiod/hesiod.c
@@ -1,4 +1,9 @@
-/* Copyright (c) 1996 by Internet Software Consortium.
+#if defined(LIBC_SCCS) && !defined(lint)
+static const char rcsid[] = "$BINDId: hesiod.c,v 1.21 2000/02/28 14:51:08 vixie Exp $";
+#endif
+
+/*
+ * Copyright (c) 1996,1999 by Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -14,469 +19,488 @@
* SOFTWARE.
*/
-/* Copyright 1996 by the Massachusetts Institute of Technology.
- *
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting
- * documentation, and that the name of M.I.T. not be used in
- * advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose. It is provided "as is"
- * without express or implied warranty.
+/*
+ * This file is primarily maintained by <tytso@mit.edu> and <ghudson@mit.edu>.
*/
-/* This file is part of the hesiod library. It implements the core
- * portion of the hesiod resolver.
- *
- * This file is loosely based on an interim version of hesiod.c from
- * the BIND IRS library, which was in turn based on an earlier version
- * of this file. Extensive changes have been made on each step of the
- * path.
+/*
+ * hesiod.c --- the core portion of the hesiod resolver.
*
- * This implementation is not truly thread-safe at the moment because
- * it uses res_send() and accesses _res.
+ * This file is derived from the hesiod library from Project Athena;
+ * It has been extensively rewritten by Theodore Ts'o to have a more
+ * thread-safe interface.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id$";
-#endif
+/* Imports */
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/nameser.h>
+
#include <errno.h>
#include <netdb.h>
#include <resolv.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
+
#include "hesiod.h"
#include "hesiod_p.h"
+#undef DEF_RHS
-/* A few operating systems don't define these. */
-#ifndef C_HS
-# define C_HS 4
-#endif
-#ifndef T_TXT
-# define T_TXT 16
-#endif
+#define _PATH_HESIOD_CONF "/etc/hesiod.conf"
-static int read_config_file (struct hesiod_p *ctx, const char *filename);
-static char **get_txt_records (struct hesiod_p *ctx, int class,
- const char *name);
-#ifdef _LIBC
-# define cistrcmp(s1, s2) strcasecmp (s1, s2)
-#else
-static int cistrcmp (const char *s1, const char *s2);
-#endif
+/* Forward */
+
+int hesiod_init(void **context);
+void hesiod_end(void *context);
+char * hesiod_to_bind(void *context, const char *name,
+ const char *type);
+char ** hesiod_resolve(void *context, const char *name,
+ const char *type);
+void hesiod_free_list(void *context, char **list);
-/* This function is called to initialize a hesiod_p. */
+static int parse_config_file(struct hesiod_p *ctx, const char *filename);
+static char ** get_txt_records(struct hesiod_p *ctx, int class,
+ const char *name);
+static int init(struct hesiod_p *ctx);
+
+/* Public */
+
+/*
+ * This function is called to initialize a hesiod_p.
+ */
int
-hesiod_init (void **context)
-{
- struct hesiod_p *ctx;
- const char *p, *configname;
-
- ctx = malloc (sizeof (struct hesiod_p));
- if (ctx)
- {
- *context = ctx;
- configname = __secure_getenv ("HESIOD_CONFIG");
- if (!configname)
- configname = SYSCONFDIR "/hesiod.conf";
- if (read_config_file (ctx, configname) >= 0)
- {
- /* The default rhs can be overridden by an environment variable. */
- p = __secure_getenv ("HES_DOMAIN");
- if (p)
- {
- if (ctx->rhs)
- free (ctx->rhs);
- ctx->rhs = malloc (strlen (p) + 2);
- if (ctx->rhs)
- {
- *ctx->rhs = '.';
- strcpy (ctx->rhs + 1, (*p == '.') ? p + 1 : p);
- return 0;
+hesiod_init(void **context) {
+ struct hesiod_p *ctx;
+ const char *configname;
+ char *cp;
+
+ ctx = malloc(sizeof(struct hesiod_p));
+ if (ctx == 0) {
+ __set_errno(ENOMEM);
+ return (-1);
+ }
+
+ ctx->LHS = NULL;
+ ctx->RHS = NULL;
+ ctx->res = NULL;
+
+ configname = __secure_getenv("HESIOD_CONFIG");
+ if (!configname)
+ configname = _PATH_HESIOD_CONF;
+ if (parse_config_file(ctx, configname) < 0) {
+#ifdef DEF_RHS
+ /*
+ * Use compiled in defaults.
+ */
+ ctx->LHS = malloc(strlen(DEF_LHS)+1);
+ ctx->RHS = malloc(strlen(DEF_RHS)+1);
+ if (ctx->LHS == 0 || ctx->RHS == 0) {
+ __set_errno(ENOMEM);
+ goto cleanup;
}
- else
- __set_errno (ENOMEM);
- }
- else
- return 0;
+ strcpy(ctx->LHS, DEF_LHS);
+ strcpy(ctx->RHS, DEF_RHS);
+#else
+ goto cleanup;
+#endif
}
- }
- else
- __set_errno (ENOMEM);
-
- if (ctx->lhs)
- free (ctx->lhs);
- if (ctx->rhs)
- free (ctx->rhs);
- if (ctx)
- free (ctx);
- return -1;
+ /*
+ * The default RHS can be overridden by an environment
+ * variable.
+ */
+ if ((cp = __secure_getenv("HES_DOMAIN")) != NULL) {
+ if (ctx->RHS)
+ free(ctx->RHS);
+ ctx->RHS = malloc(strlen(cp)+2);
+ if (!ctx->RHS) {
+ __set_errno(ENOMEM);
+ goto cleanup;
+ }
+ if (cp[0] == '.')
+ strcpy(ctx->RHS, cp);
+ else {
+ strcpy(ctx->RHS, ".");
+ strcat(ctx->RHS, cp);
+ }
+ }
+
+ /*
+ * If there is no default hesiod realm set, we return an
+ * error.
+ */
+ if (!ctx->RHS) {
+ __set_errno(ENOEXEC);
+ goto cleanup;
+ }
+
+#if 0
+ if (res_ninit(ctx->res) < 0)
+ goto cleanup;
+#endif
+
+ *context = ctx;
+ return (0);
+
+ cleanup:
+ hesiod_end(ctx);
+ return (-1);
}
-/* This function deallocates the hesiod_p. */
+/*
+ * This function deallocates the hesiod_p
+ */
void
-hesiod_end (void *context)
-{
- struct hesiod_p *ctx = (struct hesiod_p *) context;
-
- free (ctx->rhs);
- if (ctx->lhs)
- free (ctx->lhs);
- free (ctx);
+hesiod_end(void *context) {
+ struct hesiod_p *ctx = (struct hesiod_p *) context;
+ int save_errno = errno;
+
+ if (ctx->res)
+ res_nclose(ctx->res);
+ if (ctx->RHS)
+ free(ctx->RHS);
+ if (ctx->LHS)
+ free(ctx->LHS);
+ if (ctx->res && ctx->free_res)
+ (*ctx->free_res)(ctx->res);
+ free(ctx);
+ __set_errno(save_errno);
}
-/* This function takes a hesiod (name, type) and returns a DNS
+/*
+ * This function takes a hesiod (name, type) and returns a DNS
* name which is to be resolved.
*/
char *
-hesiod_to_bind (void *context, const char *name, const char *type)
-{
- struct hesiod_p *ctx = (struct hesiod_p *) context;
- char bindname[MAXDNAME], *p, *endp, *ret, **rhs_list = NULL;
- const char *rhs;
- size_t len;
-
- endp = stpcpy (bindname, name);
-
- /* Find the right right hand side to use, possibly truncating bindname. */
- p = strchr (bindname, '@');
- if (p)
- {
- *p++ = 0;
- if (strchr (p, '.'))
- rhs = name + (p - bindname);
- else
- {
- rhs_list = hesiod_resolve (context, p, "rhs-extension");
- if (rhs_list)
- rhs = *rhs_list;
- else
- {
- __set_errno (ENOENT);
- return NULL;
- }
+hesiod_to_bind(void *context, const char *name, const char *type) {
+ struct hesiod_p *ctx = (struct hesiod_p *) context;
+ char *bindname;
+ char **rhs_list = NULL;
+ const char *RHS, *cp;
+
+ /* Decide what our RHS is, and set cp to the end of the actual name. */
+ if ((cp = strchr(name, '@')) != NULL) {
+ if (strchr(cp + 1, '.'))
+ RHS = cp + 1;
+ else if ((rhs_list = hesiod_resolve(context, cp + 1,
+ "rhs-extension")) != NULL)
+ RHS = *rhs_list;
+ else {
+ __set_errno(ENOENT);
+ return (NULL);
+ }
+ } else {
+ RHS = ctx->RHS;
+ cp = name + strlen(name);
+ }
+
+ /*
+ * Allocate the space we need, including up to three periods and
+ * the terminating NUL.
+ */
+ if ((bindname = malloc((cp - name) + strlen(type) + strlen(RHS) +
+ (ctx->LHS ? strlen(ctx->LHS) : 0) + 4)) == NULL) {
+ __set_errno(ENOMEM);
+ if (rhs_list)
+ hesiod_free_list(context, rhs_list);
+ return NULL;
+ }
+
+ /* Now put together the DNS name. */
+ memcpy(bindname, name, cp - name);
+ bindname[cp - name] = '\0';
+ strcat(bindname, ".");
+ strcat(bindname, type);
+ if (ctx->LHS) {
+ if (ctx->LHS[0] != '.')
+ strcat(bindname, ".");
+ strcat(bindname, ctx->LHS);
}
- }
- else
- rhs = ctx->rhs;
-
- /* See if we have enough room. */
- len = (endp - bindname) + 1 + strlen (type);
- if (ctx->lhs)
- len += strlen (ctx->lhs) + ((ctx->lhs[0] != '.') ? 1 : 0);
- len += strlen (rhs) + ((rhs[0] != '.') ? 1 : 0);
- if (len > sizeof (bindname) - 1)
- {
- if (rhs_list)
- hesiod_free_list (context, rhs_list);
- __set_errno (EMSGSIZE);
- return NULL;
- }
-
- /* Put together the rest of the domain. */
- endp = stpcpy (stpcpy (endp, "."), type);
- if (ctx->lhs)
- {
- if (ctx->lhs[0] != '.')
- endp = stpcpy (endp, ".");
- endp = stpcpy (endp, ctx->lhs);
- }
- if (rhs[0] != '.')
- endp = stpcpy (endp, ".");
- endp = stpcpy (endp, rhs);
-
- /* rhs_list is no longer needed, since we're done with rhs. */
- if (rhs_list)
- hesiod_free_list (context, rhs_list);
-
- /* Make a copy of the result and return it to the caller. */
- ret = malloc ((endp - bindname) + 1);
- if (!ret)
- {
- __set_errno (ENOMEM);
- return NULL;
- }
- return strcpy (ret, bindname);
+ if (RHS[0] != '.')
+ strcat(bindname, ".");
+ strcat(bindname, RHS);
+
+ if (rhs_list)
+ hesiod_free_list(context, rhs_list);
+
+ return (bindname);
}
-/* This is the core function. Given a hesiod name and type, it
+/*
+ * This is the core function. Given a hesiod (name, type), it
* returns an array of strings returned by the resolver.
*/
char **
-hesiod_resolve (void *context, const char *name, const char *type)
-{
- struct hesiod_p *ctx = (struct hesiod_p *) context;
- char *bindname, **retvec;
-
- bindname = hesiod_to_bind (context, name, type);
- if (bindname == NULL)
- return NULL;
+hesiod_resolve(void *context, const char *name, const char *type) {
+ struct hesiod_p *ctx = (struct hesiod_p *) context;
+ char *bindname = hesiod_to_bind(context, name, type);
+ char **retvec;
+
+ if (bindname == NULL)
+ return (NULL);
+ if (init(ctx) == -1) {
+ free(bindname);
+ return (NULL);
+ }
- retvec = get_txt_records(ctx, ctx->classes[0], bindname);
- if (retvec == NULL && errno == ENOENT && ctx->classes[1])
- retvec = get_txt_records (ctx, ctx->classes[1], bindname);
+ if ((retvec = get_txt_records(ctx, C_IN, bindname))) {
+ free(bindname);
+ return (retvec);
+ }
+
+ if (errno != ENOENT)
+ return (NULL);
- free (bindname);
- return retvec;
+ retvec = get_txt_records(ctx, C_HS, bindname);
+ free(bindname);
+ return (retvec);
}
void
-hesiod_free_list (void *context, char **list)
-{
- char **p;
+hesiod_free_list(void *context, char **list) {
+ char **p;
- for (p = list; *p; p++)
- free (*p);
- free (list);
+ for (p = list; *p; p++)
+ free(*p);
+ free(list);
}
-/* This function parses the /etc/hesiod.conf file. Returns 0 on success,
- * -1 on failure. On failure, it might leave values in ctx->lhs or
- * ctx->rhs which need to be freed by the caller. */
+/*
+ * This function parses the /etc/hesiod.conf file
+ */
static int
-read_config_file (struct hesiod_p *ctx, const char *filename)
-{
- char *key, *data, *p, **which;
- char buf[MAXDNAME + 7];
- int n;
- FILE *fp;
-
- /* Set default query classes. */
- ctx->classes[0] = C_IN;
- ctx->classes[1] = C_HS;
-
- /* Try to open the configuration file. */
- fp = fopen (filename, "r");
- if (fp == NULL)
- {
- /* Use compiled in default domain names. */
- ctx->lhs = malloc (strlen (DEF_LHS) + 1);
- ctx->rhs = malloc (strlen (DEF_RHS) + 1);
- if (ctx->lhs && ctx->rhs)
- {
- strcpy (ctx->lhs, DEF_LHS);
- strcpy (ctx->rhs, DEF_RHS);
- return 0;
- }
- else
- {
- __set_errno (ENOMEM);
- return -1;
- }
- }
-
- ctx->lhs = NULL;
- ctx->rhs = NULL;
- while (fgets (buf, sizeof (buf), fp) != NULL)
- {
- p = buf;
- if (*p == '#' || *p == '\n' || *p == '\r')
- continue;
- while (*p == ' ' || *p == '\t')
- ++p;
- key = p;
- while(*p != ' ' && *p != '\t' && *p != '=')
- ++p;
- *p++ = 0;
-
- while (isspace (*p) || *p == '=')
- ++p;
- data = p;
- while (!isspace (*p))
- ++p;
- *p = 0;
-
- if (cistrcmp (key, "lhs") == 0 || cistrcmp (key, "rhs") == 0)
- {
- which = (strcmp (key, "lhs") == 0) ? &ctx->lhs : &ctx->rhs;
- *which = strdup (data);
- if (!*which)
- {
- __set_errno (ENOMEM);
- return -1;
- }
- }
- else if (cistrcmp (key, "classes") == 0)
- {
- n = 0;
- while (*data && n < 2)
- {
- p = data;
- while (*p && *p != ',')
- ++p;
- if (*p)
- *p++ = 0;
- if (cistrcmp (data, "IN") == 0)
- ctx->classes[n++] = C_IN;
- else if (cistrcmp (data, "HS") == 0)
- ctx->classes[n++] = C_HS;
- data = p;
- }
- while (n < 2)
- ctx->classes[n++] = 0;
+parse_config_file(struct hesiod_p *ctx, const char *filename) {
+ char *key, *data, *cp, **cpp;
+ char buf[MAXDNAME+7];
+ FILE *fp;
+
+ /*
+ * Clear the existing configuration variable, just in case
+ * they're set.
+ */
+ if (ctx->RHS)
+ free(ctx->RHS);
+ if (ctx->LHS)
+ free(ctx->LHS);
+ ctx->RHS = ctx->LHS = 0;
+
+ /*
+ * Now open and parse the file...
+ */
+ if (!(fp = fopen(filename, "r")))
+ return (-1);
+
+ while (fgets(buf, sizeof(buf), fp) != NULL) {
+ cp = buf;
+ if (*cp == '#' || *cp == '\n' || *cp == '\r')
+ continue;
+ while(*cp == ' ' || *cp == '\t')
+ cp++;
+ key = cp;
+ while(*cp != ' ' && *cp != '\t' && *cp != '=')
+ cp++;
+ *cp++ = '\0';
+
+ while(*cp == ' ' || *cp == '\t' || *cp == '=')
+ cp++;
+ data = cp;
+ while(*cp != ' ' && *cp != '\n' && *cp != '\r')
+ cp++;
+ *cp++ = '\0';
+
+ if (strcmp(key, "lhs") == 0)
+ cpp = &ctx->LHS;
+ else if (strcmp(key, "rhs") == 0)
+ cpp = &ctx->RHS;
+ else
+ continue;
+
+ *cpp = malloc(strlen(data) + 1);
+ if (!*cpp) {
+ __set_errno(ENOMEM);
+ goto cleanup;
+ }
+ strcpy(*cpp, data);
}
- }
- fclose (fp);
-
- if (!ctx->rhs || ctx->classes[0] == 0 || ctx->classes[0] == ctx->classes[1])
- {
- __set_errno (ENOEXEC);
- return -1;
- }
-
- return 0;
+ fclose(fp);
+ return (0);
+
+ cleanup:
+ fclose(fp);
+ if (ctx->RHS)
+ free(ctx->RHS);
+ if (ctx->LHS)
+ free(ctx->LHS);
+ ctx->RHS = ctx->LHS = 0;
+ return (-1);
}
-/* Given a DNS class and a DNS name, do a lookup for TXT records, and
+/*
+ * Given a DNS class and a DNS name, do a lookup for TXT records, and
* return a list of them.
*/
static char **
-get_txt_records (struct hesiod_p *ctx, int qclass, const char *name)
-{
- HEADER *hp;
- unsigned char qbuf[PACKETSZ], abuf[MAX_HESRESP], *p, *eom, *eor;
- char *dst, **list;
- int ancount, qdcount, i, j, n, skip, type, class, len;
-
- /* Make sure the resolver is initialized. */
- if ((_res.options & RES_INIT) == 0 && res_init () == -1)
- return NULL;
-
- /* Construct the query. */
- n = res_mkquery (QUERY, name, qclass, T_TXT, NULL, 0,
- NULL, qbuf, PACKETSZ);
- if (n < 0)
- return NULL;
-
- /* Send the query. */
- n = res_send (qbuf, n, abuf, MAX_HESRESP);
- if (n < 0)
- {
- __set_errno (ECONNREFUSED);
- return NULL;
- }
-
- /* Parse the header of the result. */
- hp = (HEADER *) abuf;
- ancount = ntohs (hp->ancount);
- qdcount = ntohs (hp->qdcount);
- p = abuf + sizeof (HEADER);
- eom = abuf + n;
-
- /* Skip questions, trying to get to the answer section which follows. */
- for (i = 0; i < qdcount; ++i)
- {
- skip = dn_skipname (p, eom);
- if (skip < 0 || p + skip + QFIXEDSZ > eom)
- {
- __set_errno (EMSGSIZE);
- return NULL;
+get_txt_records(struct hesiod_p *ctx, int class, const char *name) {
+ struct {
+ int type; /* RR type */
+ int class; /* RR class */
+ int dlen; /* len of data section */
+ u_char *data; /* pointer to data */
+ } rr;
+ HEADER *hp;
+ u_char qbuf[MAX_HESRESP], abuf[MAX_HESRESP];
+ u_char *cp, *erdata, *eom;
+ char *dst, *edst, **list;
+ int ancount, qdcount;
+ int i, j, n, skip;
+
+ /*
+ * Construct the query and send it.
+ */
+ n = res_nmkquery(ctx->res, QUERY, name, class, T_TXT, NULL, 0,
+ NULL, qbuf, MAX_HESRESP);
+ if (n < 0) {
+ __set_errno(EMSGSIZE);
+ return (NULL);
}
- p += skip + QFIXEDSZ;
- }
-
- /* Allocate space for the text record answers. */
- list = malloc ((ancount + 1) * sizeof(char *));
- if (list == NULL)
- {
- __set_errno (ENOMEM);
- return NULL;
- }
-
- /* Parse the answers. */
- j = 0;
- for (i = 0; i < ancount; i++)
- {
- /* Parse the header of this answer. */
- skip = dn_skipname (p, eom);
- if (skip < 0 || p + skip + 10 > eom)
- break;
- type = p[skip + 0] << 8 | p[skip + 1];
- class = p[skip + 2] << 8 | p[skip + 3];
- len = p[skip + 8] << 8 | p[skip + 9];
- p += skip + 10;
- if (p + len > eom)
- {
- __set_errno (EMSGSIZE);
- break;
+ n = res_nsend(ctx->res, qbuf, n, abuf, MAX_HESRESP);
+ if (n < 0) {
+ __set_errno(ECONNREFUSED);
+ return (NULL);
+ }
+ if (n < HFIXEDSZ) {
+ __set_errno(EMSGSIZE);
+ return (NULL);
}
- /* Skip entries of the wrong class and type. */
- if (class != qclass || type != T_TXT)
- {
- p += len;
- continue;
+ /*
+ * OK, parse the result.
+ */
+ hp = (HEADER *) abuf;
+ ancount = ntohs(hp->ancount);
+ qdcount = ntohs(hp->qdcount);
+ cp = abuf + sizeof(HEADER);
+ eom = abuf + n;
+
+ /* Skip query, trying to get to the answer section which follows. */
+ for (i = 0; i < qdcount; i++) {
+ skip = dn_skipname(cp, eom);
+ if (skip < 0 || cp + skip + QFIXEDSZ > eom) {
+ __set_errno(EMSGSIZE);
+ return (NULL);
+ }
+ cp += skip + QFIXEDSZ;
}
- /* Allocate space for this answer. */
- list[j] = malloc (len);
- if (!list[j])
- {
- __set_errno (ENOMEM);
- break;
+ list = malloc((ancount + 1) * sizeof(char *));
+ if (!list) {
+ __set_errno(ENOMEM);
+ return (NULL);
}
- dst = list[j++];
-
- /* Copy answer data into the allocated area. */
- eor = p + len;
- while (p < eor)
- {
- n = (unsigned char) *p++;
- if (p + n > eor)
- {
- __set_errno (EMSGSIZE);
- break;
- }
- dst = mempcpy (dst, p, n);
- p += n;
+ j = 0;
+ for (i = 0; i < ancount; i++) {
+ skip = dn_skipname(cp, eom);
+ if (skip < 0) {
+ __set_errno(EMSGSIZE);
+ goto cleanup;
+ }
+ cp += skip;
+ if (cp + 3 * INT16SZ + INT32SZ > eom) {
+ __set_errno(EMSGSIZE);
+ goto cleanup;
+ }
+ rr.type = ns_get16(cp);
+ cp += INT16SZ;
+ rr.class = ns_get16(cp);
+ cp += INT16SZ + INT32SZ; /* skip the ttl, too */
+ rr.dlen = ns_get16(cp);
+ cp += INT16SZ;
+ if (cp + rr.dlen > eom) {
+ __set_errno(EMSGSIZE);
+ goto cleanup;
+ }
+ rr.data = cp;
+ cp += rr.dlen;
+ if (rr.class != class || rr.type != T_TXT)
+ continue;
+ if (!(list[j] = malloc(rr.dlen)))
+ goto cleanup;
+ dst = list[j++];
+ edst = dst + rr.dlen;
+ erdata = rr.data + rr.dlen;
+ cp = rr.data;
+ while (cp < erdata) {
+ n = (unsigned char) *cp++;
+ if (cp + n > eom || dst + n > edst) {
+ __set_errno(EMSGSIZE);
+ goto cleanup;
+ }
+ memcpy(dst, cp, n);
+ cp += n;
+ dst += n;
+ }
+ if (cp != erdata) {
+ __set_errno(EMSGSIZE);
+ goto cleanup;
+ }
+ *dst = '\0';
}
- if (p < eor)
- {
- __set_errno (EMSGSIZE);
- break;
+ list[j] = NULL;
+ if (j == 0) {
+ __set_errno(ENOENT);
+ goto cleanup;
}
- *dst = 0;
- }
-
- /* If we didn't terminate the loop normally, something went wrong. */
- if (i < ancount)
- {
- for (i = 0; i < j; i++)
- free (list[i]);
- free (list);
- return NULL;
- }
-
- if (j == 0)
- {
- __set_errno (ENOENT);
- free (list);
- return NULL;
- }
-
- list[j] = NULL;
- return list;
+ return (list);
+
+ cleanup:
+ for (i = 0; i < j; i++)
+ free(list[i]);
+ free(list);
+ return (NULL);
+}
+
+struct __res_state *
+__hesiod_res_get(void *context) {
+ struct hesiod_p *ctx = context;
+
+ if (!ctx->res) {
+ struct __res_state *res;
+ res = (struct __res_state *)malloc(sizeof *res);
+ if (res == NULL) {
+ __set_errno(ENOMEM);
+ return (NULL);
+ }
+ memset(res, 0, sizeof *res);
+ __hesiod_res_set(ctx, res, free);
+ }
+
+ return (ctx->res);
+}
+
+void
+__hesiod_res_set(void *context, struct __res_state *res,
+ void (*free_res)(void *)) {
+ struct hesiod_p *ctx = context;
+
+ if (ctx->res && ctx->free_res) {
+ res_nclose(ctx->res);
+ (*ctx->free_res)(ctx->res);
+ }
+
+ ctx->res = res;
+ ctx->free_res = free_res;
}
-#ifndef _LIBC
static int
-cistrcmp (const char *s1, const char *s2)
-{
- while (*s1 && tolower(*s1) == tolower(*s2))
- {
- s1++;
- s2++;
- }
- return tolower(*s1) - tolower(*s2);
+init(struct hesiod_p *ctx) {
+
+ if (!ctx->res && !__hesiod_res_get(ctx))
+ return (-1);
+
+ if (((ctx->res->options & RES_INIT) == 0) &&
+ (res_ninit(ctx->res) == -1))
+ return (-1);
+
+ return (0);
}
-#endif