mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 11:43:34 +08:00
14bab8de31
Thu Aug 29 00:28:08 1996 Ulrich Drepper <drepper@cygnus.com> * stdio-common/printf_fp.c (__printf_fp): Use default value `.` if `decimal' char is 0. * C-numeric.c (not_available): New constant. (_nl_C_LC_NUMERIC): Use `not_available' for grouping value. * nss/nsswitch.conf: Example configuration file. * nss/db-Makefile: Example Makefile for generation of databases for nss_db. * nss/Makefile (distribute): Add nsswitch.conf and db-Makefile. 1996-08-28 Paul Eggert <eggert@twinsun.com> * C-messages.c (_nl_C_LC_MESSAGES): Set yesexpr to "^[yY]" and noexpr to "^[nN]"; this conforms to POSIX.2. * C-time.c (_nl_C_LC_TIME): Change %d to %e in d_t_format, to conform to POSIX.2. 1996-08-28 Paul Eggert <eggert@twinsun.com> * C-monetary.c (not_available): New constant. (_nl_C_LC_MONETARY): Set mon_decimal_point to "", and set mon_grouping, int_frac_digits, frac_digits, p_cs_precedes, p_sep_by_space, n_cs_precedes, n_sep_by_space, p_sign_posn, and n_sign_posn to CHAR_MAX, as required by the POSIX Standard. Wed Aug 28 23:12:28 1996 Ulrich Drepper <drepper@cygnus.com> * nss/nss_db/db-XXX.c: Correct function names. They must be `_nss_db_*' instead of `_nss_files_*'. (lookup): `parse_line' returns 1 if succesful. * nss/nss_files/files-service.c (servbyname): Key for database must also contain protocol names. (servbypt): Likewise. Test must also check for protocol. Add `proto' argument. Tue Aug 27 09:56:13 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * MakeTAGS ($P/subdirs.pot): Prefix all file names, not only the first one. Fri Aug 16 16:11:25 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * nss/nss_dns/dns-host.c (_nss_dns_gethostbyname2_r): Treat EPFNOSUPPORT and EAFNOSUPPORT as implying NSS_STATUS_UNAVAIL just like ECONNREFUSED already does. (_nss_dns_gethostbyaddr_r): Likewise. * nss/nss_dns/dns-network.c (_nss_dns_getnetbyname_r): Likewise. (_nss_dns_getnetbyaddr_r): Likewise. * sysdeps/mach/hurd/socket.c (socket): For message transmission and RPC errors that indicate that the socket server is not really present and able to do its job, turn the error into EPFNOSUPPORT. * sysdeps/generic/sbrk.c (__sbrk): Get kernel brk address always only if in static libc or if statically linked program uses libc.so.
191 lines
5.8 KiB
C
191 lines
5.8 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;
|
|
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;
|
|
|
|
default:
|
|
return (-1);
|
|
}
|
|
return (cp - buf);
|
|
}
|