mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 02:03:35 +08:00
df21c8581a
Wed Aug 14 21:36:16 1996 Ulrich Drepper <drepper@cygnus.com> * stdlib/strtod.c (STRTOD): Correct assertion about size of wint_t and wchar_t. Reported by David Mosberger-Tang. Mon Aug 12 22:40:16 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/dl-lookup.c (_dl_lookup_symbol): Remove fifth parameter RELOC_ADDR and make NOPLT a set of flags. All callers changed. Delete condition that checks for resolving to the location being filled in. Add condition to skip the executable's symbols if requested. * elf/link.h: Change declaration of _dl_lookup_symbol accordingly. (DL_LOOKUP_NOEXEC, DL_LOOKUP_NOPLT): New definitions. * elf/dl-reloc.c (RESOLVE): Remove second parameter and rename NOPLT to FLAGS. * elf/dl-runtime.c (RESOLVE): Likewise. * elf/rtld.c (RESOLVE): Likewise. * sysdeps/m68k/dl-machine.h (elf_machine_rela): Pass DL_LOOKUP_NOEXEC as second argument to the RESOLVE macro if processing a copy reloc, DL_LOOKUP_NOPLT for a jump slot reloc, zero otherwise. * sysdeps/alpha/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise. * sysdeps/mips/dl-machine.h (elf_machine_rel): Likewise. Wed Aug 14 17:57:08 1996 Ulrich Drepper <drepper@cygnus.com> * MakeTAGS: Clean up use of --omit-header and -n for xgettext. * po/header.pot: Add empty line at end. Sun Aug 11 13:45:33 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * MakeTAGS (all-pot): Remove $P/errlist.pot, all error messages are now in $P/stdio-common.pot. (XGETTEXTFLAGS-errlist.pot): Variable removed. Mon Aug 12 19:25:03 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules (do-ar, o-iterator-doit): Compute path to autolock script at run time, not configure time. * config.make.in, configure.in: Undo previous change. Wed Aug 14 13:20:02 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/i386/close.S: Push return value of thread on stack as argument for `_exit'. Reported by Andreas Schwab. Mon Aug 12 19:36:25 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/clone.S: New file. Wed Aug 14 04:22:35 1996 Richard Henderson <rth@tamu.edu> * elf/dl-load.c (_dl_map_object): Save name in malloced memory. (_dl_map_object_from_fd): Free name on error. Wed Aug 14 13:00:09 1996 Ulrich Drepper <drepper@cygnus.com> * string/strdup.c: Use result of memcpy to avoid reloading. Tue Aug 13 00:55:03 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * shadow/sgetspent_r.c (__sgetspent_r): Copy string to buffer, not the other way round. * resolv/Makefile (libresolv-routines): Add base64, inet_net_ntop, inet_net_pton, inet_net. * resolv/arpa/nameser.h (__BIND): Update version number. Mon Aug 12 19:03:22 1996 Thomas Bushnell n/BSG <thomas@psilocin.gnu.ai.mit.edu> * sysdeps/generic/gnu/types.h: Declare __fd_mask as `unsigned long'. * mach/Makefile (mach/mach_host.uh): Depend on $(objpfx)/mach-syscalls.mk. ($(objpfx)mach-shortcuts.h): Depend on $(objpfx)mach/mach_host.h. (This fixes a make loop; thanks to Marcus Daniels <marcus@sysc.pdx.edu> for the patch.)
251 lines
7.3 KiB
C
251 lines
7.3 KiB
C
/*
|
|
* ++Copyright++ 1985, 1993
|
|
* -
|
|
* Copyright (c) 1985, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
* -
|
|
* Portions Copyright (c) 1993 by Digital Equipment Corporation.
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies, and that
|
|
* the name of Digital Equipment Corporation not be used in advertising or
|
|
* publicity pertaining to distribution of the document or software without
|
|
* specific, written prior permission.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
|
|
* WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT
|
|
* CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
|
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
|
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
|
|
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|
* SOFTWARE.
|
|
* -
|
|
* --Copyright--
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static char sccsid[] = "@(#)res_mkquery.c 8.1 (Berkeley) 6/4/93";
|
|
static char rcsid[] = "$Id$";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/param.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/nameser.h>
|
|
|
|
#include <stdio.h>
|
|
#include <netdb.h>
|
|
#include <resolv.h>
|
|
#if defined(BSD) && (BSD >= 199103)
|
|
# include <string.h>
|
|
#else
|
|
# include "../conf/portability.h"
|
|
#endif
|
|
|
|
#if defined(USE_OPTIONS_H)
|
|
# include <../conf/options.h>
|
|
#endif
|
|
|
|
/*
|
|
* Form all types of queries.
|
|
* Returns the size of the result or -1.
|
|
*/
|
|
int
|
|
res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
|
|
int op; /* opcode of query */
|
|
const char *dname; /* domain name */
|
|
int class, type; /* class and type of query */
|
|
const u_char *data; /* resource record data */
|
|
int datalen; /* length of data */
|
|
const u_char *newrr_in; /* new rr for modify or append */
|
|
u_char *buf; /* buffer to put query */
|
|
int buflen; /* size of buffer */
|
|
{
|
|
register HEADER *hp;
|
|
register u_char *cp;
|
|
register int n;
|
|
#ifdef ALLOW_UPDATES
|
|
struct rrec *newrr = (struct rrec *) newrr_in;
|
|
#endif
|
|
u_char *dnptrs[20], **dpp, **lastdnptr;
|
|
|
|
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
|
|
h_errno = NETDB_INTERNAL;
|
|
return (-1);
|
|
}
|
|
#ifdef DEBUG
|
|
if (_res.options & RES_DEBUG)
|
|
printf(";; res_mkquery(%d, %s, %d, %d)\n",
|
|
op, dname, class, type);
|
|
#endif
|
|
/*
|
|
* Initialize header fields.
|
|
*/
|
|
if ((buf == NULL) || (buflen < HFIXEDSZ))
|
|
return (-1);
|
|
bzero(buf, HFIXEDSZ);
|
|
hp = (HEADER *) buf;
|
|
hp->id = htons(++_res.id);
|
|
hp->opcode = op;
|
|
hp->rd = (_res.options & RES_RECURSE) != 0;
|
|
hp->rcode = NOERROR;
|
|
cp = buf + HFIXEDSZ;
|
|
buflen -= HFIXEDSZ;
|
|
dpp = dnptrs;
|
|
*dpp++ = buf;
|
|
*dpp++ = NULL;
|
|
lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
|
|
/*
|
|
* perform opcode specific processing
|
|
*/
|
|
switch (op) {
|
|
case QUERY: /*FALLTHROUGH*/
|
|
case NS_NOTIFY_OP:
|
|
if ((buflen -= QFIXEDSZ) < 0)
|
|
return (-1);
|
|
if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)
|
|
return (-1);
|
|
cp += n;
|
|
buflen -= n;
|
|
__putshort(type, cp);
|
|
cp += INT16SZ;
|
|
__putshort(class, cp);
|
|
cp += INT16SZ;
|
|
hp->qdcount = htons(1);
|
|
if (op == QUERY || data == NULL)
|
|
break;
|
|
/*
|
|
* Make an additional record for completion domain.
|
|
*/
|
|
buflen -= RRFIXEDSZ;
|
|
n = dn_comp((char *)data, cp, buflen, dnptrs, lastdnptr);
|
|
if (n < 0)
|
|
return (-1);
|
|
cp += n;
|
|
buflen -= n;
|
|
__putshort(T_NULL, cp);
|
|
cp += INT16SZ;
|
|
__putshort(class, cp);
|
|
cp += INT16SZ;
|
|
__putlong(0, cp);
|
|
cp += INT32SZ;
|
|
__putshort(0, cp);
|
|
cp += INT16SZ;
|
|
hp->arcount = htons(1);
|
|
break;
|
|
|
|
case IQUERY:
|
|
/*
|
|
* Initialize answer section
|
|
*/
|
|
if (buflen < 1 + RRFIXEDSZ + datalen)
|
|
return (-1);
|
|
*cp++ = '\0'; /* no domain name */
|
|
__putshort(type, cp);
|
|
cp += INT16SZ;
|
|
__putshort(class, cp);
|
|
cp += INT16SZ;
|
|
__putlong(0, cp);
|
|
cp += INT32SZ;
|
|
__putshort(datalen, cp);
|
|
cp += INT16SZ;
|
|
if (datalen) {
|
|
bcopy(data, cp, datalen);
|
|
cp += datalen;
|
|
}
|
|
hp->ancount = htons(1);
|
|
break;
|
|
|
|
#ifdef ALLOW_UPDATES
|
|
/*
|
|
* For UPDATEM/UPDATEMA, do UPDATED/UPDATEDA followed by UPDATEA
|
|
* (Record to be modified is followed by its replacement in msg.)
|
|
*/
|
|
case UPDATEM:
|
|
case UPDATEMA:
|
|
|
|
case UPDATED:
|
|
/*
|
|
* The res code for UPDATED and UPDATEDA is the same; user
|
|
* calls them differently: specifies data for UPDATED; server
|
|
* ignores data if specified for UPDATEDA.
|
|
*/
|
|
case UPDATEDA:
|
|
buflen -= RRFIXEDSZ + datalen;
|
|
if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)
|
|
return (-1);
|
|
cp += n;
|
|
__putshort(type, cp);
|
|
cp += INT16SZ;
|
|
__putshort(class, cp);
|
|
cp += INT16SZ;
|
|
__putlong(0, cp);
|
|
cp += INT32SZ;
|
|
__putshort(datalen, cp);
|
|
cp += INT16SZ;
|
|
if (datalen) {
|
|
bcopy(data, cp, datalen);
|
|
cp += datalen;
|
|
}
|
|
if ( (op == UPDATED) || (op == UPDATEDA) ) {
|
|
hp->ancount = htons(0);
|
|
break;
|
|
}
|
|
/* Else UPDATEM/UPDATEMA, so drop into code for UPDATEA */
|
|
|
|
case UPDATEA: /* Add new resource record */
|
|
buflen -= RRFIXEDSZ + datalen;
|
|
if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)
|
|
return (-1);
|
|
cp += n;
|
|
__putshort(newrr->r_type, cp);
|
|
cp += INT16SZ;
|
|
__putshort(newrr->r_class, cp);
|
|
cp += INT16SZ;
|
|
__putlong(0, cp);
|
|
cp += INT32SZ;
|
|
__putshort(newrr->r_size, cp);
|
|
cp += INT16SZ;
|
|
if (newrr->r_size) {
|
|
bcopy(newrr->r_data, cp, newrr->r_size);
|
|
cp += newrr->r_size;
|
|
}
|
|
hp->ancount = htons(0);
|
|
break;
|
|
#endif /* ALLOW_UPDATES */
|
|
default:
|
|
return (-1);
|
|
}
|
|
return (cp - buf);
|
|
}
|