This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.23-264-ge01eef6
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 28 Apr 2016 12:05:26 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.23-264-ge01eef6
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via e01eef67baf2caa155b1d7ff5e0c191fd0fd4828 (commit)
via ecfda0fc252232b127c41eab29c47bba8ca9e5e3 (commit)
via c40226cb4c7f44d9ef58a5eb4c625a3a51a770bb (commit)
via e5a0ec981cc967ac65e9ce288a0412e30b7ae63b (commit)
via 687c1c0ce27de3a6852c1c02d321f65100d96c5d (commit)
via 18b36f5dcfcb75096f804d2cf6b74bc6f27f9ad1 (commit)
via 74a69831556c91ef9c410a38f1e2bd37c305322f (commit)
via 561905e1374443ee2a2a2848fd31bc062e4bbcbf (commit)
via 283952c4a82b5a9d20932dff1f21148672d33bf4 (commit)
via c99c925b8b7ce7d023943878a41ad964c5ab7a04 (commit)
via 1f32be054b640fa7bcbc46441e24e185ab5184e3 (commit)
from 6b255f411ba26200f9078f6f80b8dc5fe0ef6f2b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e01eef67baf2caa155b1d7ff5e0c191fd0fd4828
commit e01eef67baf2caa155b1d7ff5e0c191fd0fd4828
Author: Florian Weimer <fweimer@redhat.com>
Date: Thu Apr 28 13:58:18 2016 +0200
resolv: Assorted preprocessor cleanups
diff --git a/ChangeLog b/ChangeLog
index 30b285c..8c1de33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2016-04-28 Florian Weimer <fweimer@redhat.com>
+ * resolv/res_init.c (isascii): Do not define. Use definition in
+ <ctype.h>.
+ * resolv/gethnamaddr.c: Remove USE_OPTIONS_H conditional.
+ (LOG_AUTH): Remove.
+ (SPRINTF): Remove, adjust caller.
+ (MULTI_PTRS_ARE_ALIASES): Remove, always defined.
+
+2016-04-28 Florian Weimer <fweimer@redhat.com>
+
* resolv/nss_dns/dns-host.c (_nss_dns_gethostbyaddr2_r): Remove
SUNSECURITY conditional.
* resolv/gethnamaddr.c (gethostbyaddr): Likewise.
diff --git a/resolv/gethnamaddr.c b/resolv/gethnamaddr.c
index 97e2dc3..9ad2c30 100644
--- a/resolv/gethnamaddr.c
+++ b/resolv/gethnamaddr.c
@@ -69,22 +69,6 @@
#include <stdlib.h>
#include <string.h>
-#ifndef LOG_AUTH
-# define LOG_AUTH 0
-#endif
-
-#define MULTI_PTRS_ARE_ALIASES 1 /* XXX - experimental */
-
-#if defined(USE_OPTIONS_H)
-# include <../conf/options.h>
-#endif
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
#define MAXALIASES 35
#define MAXADDRS 35
@@ -332,7 +316,6 @@ getanswer (const querybuf *answer, int anslen, const char *qname, int qtype)
had_error++;
break;
}
-#if MULTI_PTRS_ARE_ALIASES
cp += n;
if (cp != erdata) {
__set_h_errno (NO_RECOVERY);
@@ -354,21 +337,6 @@ getanswer (const querybuf *answer, int anslen, const char *qname, int qtype)
buflen -= n;
}
break;
-#else
- host.h_name = bp;
- if (_res.options & RES_USE_INET6) {
- n = strlen(bp) + 1; /* for the \0 */
- if (n >= MAXHOSTNAMELEN) {
- had_error++;
- break;
- }
- bp += n;
- buflen -= n;
- map_v4v6_hostent(&host, &bp, &buflen);
- }
- __set_h_errno (NETDB_SUCCESS);
- return (&host);
-#endif
case T_A:
case T_AAAA:
if (strcasecmp(host.h_name, bp) != 0) {
@@ -660,9 +628,9 @@ gethostbyaddr (const void *addr, socklen_t len, int af)
case AF_INET6:
qp = qbuf;
for (n = IN6ADDRSZ - 1; n >= 0; n--) {
- qp += SPRINTF((qp, "%x.%x.",
- uaddr[n] & 0xf,
- (uaddr[n] >> 4) & 0xf));
+ qp += sprintf(qp, "%x.%x.",
+ uaddr[n] & 0xf,
+ (uaddr[n] >> 4) & 0xf);
}
strcpy(qp, "ip6.arpa");
break;
diff --git a/resolv/res_init.c b/resolv/res_init.c
index 407e609..915a70a 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -94,10 +94,6 @@ static const char sort_mask_chars[] = "/&";
#define ISSORTMASK(ch) (strchr(sort_mask_chars, ch) != NULL)
static u_int32_t net_mask (struct in_addr) __THROW;
-#if !defined(isascii) /* XXX - could be a function */
-# define isascii(c) (!(c & 0200))
-#endif
-
unsigned long long int __res_initstamp attribute_hidden;
/*
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ecfda0fc252232b127c41eab29c47bba8ca9e5e3
commit ecfda0fc252232b127c41eab29c47bba8ca9e5e3
Author: Florian Weimer <fweimer@redhat.com>
Date: Thu Apr 28 13:20:11 2016 +0200
resolv: Remove SUNSECURITY preprocessor conditionals
The macro is never defined.
diff --git a/ChangeLog b/ChangeLog
index f61df61..30b285c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2016-04-28 Florian Weimer <fweimer@redhat.com>
+ * resolv/nss_dns/dns-host.c (_nss_dns_gethostbyaddr2_r): Remove
+ SUNSECURITY conditional.
+ * resolv/gethnamaddr.c (gethostbyaddr): Likewise.
+
+2016-04-28 Florian Weimer <fweimer@redhat.com>
+
* resolv/arpa/nameser.h: Include <sys/types.h> unconditionally.
* resolv/gethnamaddr.c: Use include files from conf/portability.h.
Remove BSD-related preprocessor conditionals.
diff --git a/resolv/gethnamaddr.c b/resolv/gethnamaddr.c
index 1b55ba1..97e2dc3 100644
--- a/resolv/gethnamaddr.c
+++ b/resolv/gethnamaddr.c
@@ -618,12 +618,6 @@ gethostbyaddr (const void *addr, socklen_t len, int af)
querybuf *orig_buf;
struct hostent *hp;
char qbuf[MAXDNAME+1], *qp = NULL;
-#ifdef SUNSECURITY
- struct hostent *rhp;
- char **haddr;
- u_long old_options;
- char hname2[MAXDNAME+1];
-#endif /*SUNSECURITY*/
if (__res_maybe_init (&_res, 0) == -1) {
__set_h_errno (NETDB_INTERNAL);
@@ -699,32 +693,6 @@ gethostbyaddr (const void *addr, socklen_t len, int af)
free (buf.buf);
if (!hp)
return (NULL); /* h_errno was set by getanswer() */
-#ifdef SUNSECURITY
- if (af == AF_INET) {
- /*
- * turn off search as the name should be absolute,
- * 'localhost' should be matched by defnames
- */
- strncpy(hname2, hp->h_name, MAXDNAME);
- hname2[MAXDNAME] = '\0';
- old_options = _res.options;
- _res.options &= ~RES_DNSRCH;
- _res.options |= RES_DEFNAMES;
- if (!(rhp = gethostbyname(hname2))) {
- _res.options = old_options;
- __set_h_errno (HOST_NOT_FOUND);
- return (NULL);
- }
- _res.options = old_options;
- for (haddr = rhp->h_addr_list; *haddr; haddr++)
- if (!memcmp(*haddr, addr, INADDRSZ))
- break;
- if (!*haddr) {
- __set_h_errno (HOST_NOT_FOUND);
- return (NULL);
- }
- }
-#endif /*SUNSECURITY*/
hp->h_addrtype = af;
hp->h_length = len;
memmove(host_addr, addr, len);
diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
index 93fee10..5f9e357 100644
--- a/resolv/nss_dns/dns-host.c
+++ b/resolv/nss_dns/dns-host.c
@@ -520,11 +520,6 @@ _nss_dns_gethostbyaddr2_r (const void *addr, socklen_t len, int af,
if (status != NSS_STATUS_SUCCESS)
return status;
-#ifdef SUNSECURITY
- This is not implemented because it is not possible to use the current
- source from bind in a multi-threaded program.
-#endif
-
result->h_addrtype = af;
result->h_length = len;
memcpy (host_data->host_addr, addr, len);
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c40226cb4c7f44d9ef58a5eb4c625a3a51a770bb
commit c40226cb4c7f44d9ef58a5eb4c625a3a51a770bb
Author: Florian Weimer <fweimer@redhat.com>
Date: Thu Apr 28 13:08:53 2016 +0200
resolv: Remove BSD compatibility conditionals and header
diff --git a/ChangeLog b/ChangeLog
index 61c16b3..f61df61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2016-04-28 Florian Weimer <fweimer@redhat.com>
+ * resolv/arpa/nameser.h: Include <sys/types.h> unconditionally.
+ * resolv/gethnamaddr.c: Use include files from conf/portability.h.
+ Remove BSD-related preprocessor conditionals.
+ * conf/portability.h: Remove.
+
+2016-04-28 Florian Weimer <fweimer@redhat.com>
+
* resolv/resolv.h: Remove __BIND_NOSTATIC conditional.
* resolv/res_data.c: Likewise.
diff --git a/conf/portability.h b/conf/portability.h
deleted file mode 100644
index 54a25d8..0000000
--- a/conf/portability.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* This file is used by some of the resolver code in inet/ that
- comes from BIND 4.9. I have written this file instead of modifying
- those things not to use it so that I can later drop in replacement
- files from future BIND distributions without change. */
-
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-
-/* Some BIND code decides it can omit the definitions of some functions
- if BSD is defined to some value. That might make sense when the BIND
- code is augmenting or replacing an existing system library, but we can
- never omit a function here, since we are defining the system library. */
-
-#undef BSD
-
-/* Some code does stupid compatibility kludges for SunOS braindeath
- #ifdef sun. */
-
-#undef sun
-
-/* The source code copied from BIND for inet_addr/inet_aton
- doesn't actually define the functions without these macros. */
-
-#define NEED_INETADDR 1
-#define NEED_INETATON 1
diff --git a/resolv/arpa/nameser.h b/resolv/arpa/nameser.h
index fb8513b..04f8844 100644
--- a/resolv/arpa/nameser.h
+++ b/resolv/arpa/nameser.h
@@ -57,11 +57,7 @@
#define BIND_4_COMPAT
#include <sys/param.h>
-#if (!defined(BSD)) || (BSD < 199306)
-# include <sys/bitypes.h>
-#else
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
#include <sys/cdefs.h>
/*%
diff --git a/resolv/gethnamaddr.c b/resolv/gethnamaddr.c
index 2c71313..1b55ba1 100644
--- a/resolv/gethnamaddr.c
+++ b/resolv/gethnamaddr.c
@@ -66,6 +66,8 @@
#include <resolv.h>
#include <ctype.h>
#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
#ifndef LOG_AUTH
# define LOG_AUTH 0
@@ -73,13 +75,6 @@
#define MULTI_PTRS_ARE_ALIASES 1 /* XXX - experimental */
-#if defined(BSD) && (BSD >= 199103) && defined(AF_INET6)
-# include <stdlib.h>
-# include <string.h>
-#else
-# include "../conf/portability.h"
-#endif
-
#if defined(USE_OPTIONS_H)
# include <../conf/options.h>
#endif
@@ -963,49 +958,3 @@ addrsort (char **ap, int num)
needsort++;
}
}
-
-#if defined(BSD43_BSD43_NFS) || defined(sun)
-/* some libc's out there are bound internally to these names (UMIPS) */
-void
-ht_sethostent (int stayopen)
-{
- _sethtent(stayopen);
-}
-
-void
-ht_endhostent (void)
-{
- _endhtent();
-}
-
-struct hostent *
-ht_gethostbyname (char *name)
-{
- return (_gethtbyname(name));
-}
-
-struct hostent *
-ht_gethostbyaddr (const char *addr, size_t len, int af)
-{
- return (_gethtbyaddr(addr, len, af));
-}
-
-struct hostent *
-gethostent (void)
-{
- return (_gethtent());
-}
-
-void
-dns_service (void)
-{
- return;
-}
-
-#undef dn_skipname
-dn_skipname(comp_dn, eom)
- const u_char *comp_dn, *eom;
-{
- return (__dn_skipname(comp_dn, eom));
-}
-#endif /*old-style libc with yp junk in it*/
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e5a0ec981cc967ac65e9ce288a0412e30b7ae63b
commit e5a0ec981cc967ac65e9ce288a0412e30b7ae63b
Author: Florian Weimer <fweimer@redhat.com>
Date: Thu Apr 28 11:53:00 2016 +0200
resolv: Remove __BIND_NOSTATIC conditionals
The macro is never defined.
diff --git a/ChangeLog b/ChangeLog
index e5cf1d0..61c16b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2016-04-28 Florian Weimer <fweimer@redhat.com>
+ * resolv/resolv.h: Remove __BIND_NOSTATIC conditional.
+ * resolv/res_data.c: Likewise.
+
+2016-04-28 Florian Weimer <fweimer@redhat.com>
+
* resolv/res_comp.c: Remove code conditional on __ultrix__.
* resolv/res_data.c: Remove code conditional on ultrix.
diff --git a/resolv/res_data.c b/resolv/res_data.c
index 7e848e0..f44c517 100644
--- a/resolv/res_data.c
+++ b/resolv/res_data.c
@@ -52,7 +52,6 @@ const char *_res_opcodes[] = {
};
libresolv_hidden_data_def (_res_opcodes)
-#ifndef __BIND_NOSTATIC
void
p_query(const u_char *msg) {
fp_query(msg, stdout);
@@ -186,7 +185,6 @@ hostalias(const char *name) {
}
libresolv_hidden_def (hostalias)
-#endif
#include <shlib-compat.h>
diff --git a/resolv/resolv.h b/resolv/resolv.h
index 53c3bba..f55e7ce 100644
--- a/resolv/resolv.h
+++ b/resolv/resolv.h
@@ -250,7 +250,6 @@ extern struct __res_state *__res_state(void) __attribute__ ((__const__));
__END_DECLS
#define _res (*__res_state())
-#ifndef __BIND_NOSTATIC
#define fp_nquery __fp_nquery
#define fp_query __fp_query
#define hostalias __hostalias
@@ -280,7 +279,6 @@ int res_querydomain (const char *, const char *, int, int,
int res_search (const char *, int, int, u_char *, int) __THROW;
int res_send (const u_char *, int, u_char *, int) __THROW;
__END_DECLS
-#endif
#define b64_ntop __b64_ntop
#define b64_pton __b64_pton
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=687c1c0ce27de3a6852c1c02d321f65100d96c5d
commit 687c1c0ce27de3a6852c1c02d321f65100d96c5d
Author: Florian Weimer <fweimer@redhat.com>
Date: Thu Apr 28 11:51:02 2016 +0200
resolv: Remove traces of ULTRIX support
diff --git a/ChangeLog b/ChangeLog
index 26147f5..e5cf1d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2016-04-28 Florian Weimer <fweimer@redhat.com>
+ * resolv/res_comp.c: Remove code conditional on __ultrix__.
+ * resolv/res_data.c: Remove code conditional on ultrix.
+
+2016-04-28 Florian Weimer <fweimer@redhat.com>
+
* resolv/res_init.c (RFC1535): Do not define. Remove
RFC1535 preprocessor conditionals.
* resolv/README: Update. Do not claim strict RFC 1535 compliance
diff --git a/resolv/res_comp.c b/resolv/res_comp.c
index 3c50774..d2be5e4 100644
--- a/resolv/res_comp.c
+++ b/resolv/res_comp.c
@@ -241,10 +241,8 @@ void __putlong(u_int32_t src, u_char *dst) { ns_put32(src, dst); }
libresolv_hidden_def (__putlong)
void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); }
libresolv_hidden_def (__putshort)
-#ifndef __ultrix__
u_int32_t _getlong(const u_char *src) { return (ns_get32(src)); }
u_int16_t _getshort(const u_char *src) { return (ns_get16(src)); }
-#endif /*__ultrix__*/
#endif /*BIND_4_COMPAT*/
diff --git a/resolv/res_data.c b/resolv/res_data.c
index 3c196de..7e848e0 100644
--- a/resolv/res_data.c
+++ b/resolv/res_data.c
@@ -186,23 +186,6 @@ hostalias(const char *name) {
}
libresolv_hidden_def (hostalias)
-#ifdef ultrix
-int
-local_hostname_length(const char *hostname) {
- int len_host, len_domain;
-
- if (!*_res.defdname)
- res_init();
- len_host = strlen(hostname);
- len_domain = strlen(_res.defdname);
- if (len_host > len_domain &&
- !strcasecmp(hostname + len_host - len_domain, _res.defdname) &&
- hostname[len_host - len_domain - 1] == '.')
- return (len_host - len_domain - 1);
- return (0);
-}
-#endif /*ultrix*/
-
#endif
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=18b36f5dcfcb75096f804d2cf6b74bc6f27f9ad1
commit 18b36f5dcfcb75096f804d2cf6b74bc6f27f9ad1
Author: Florian Weimer <fweimer@redhat.com>
Date: Thu Apr 28 11:43:41 2016 +0200
resolv: Remove RFC1535 conditionals
diff --git a/ChangeLog b/ChangeLog
index 47ef7a0..26147f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2016-04-28 Florian Weimer <fweimer@redhat.com>
+ * resolv/res_init.c (RFC1535): Do not define. Remove
+ RFC1535 preprocessor conditionals.
+ * resolv/README: Update. Do not claim strict RFC 1535 compliance
+ because there configuration options which make the resolver
+ behavior different.
+
+2016-04-28 Florian Weimer <fweimer@redhat.com>
+
* resolv/gethnamaddr.c (RESOLVSORT): Do not define. Remove
RESOLVSORT preprocessor conditionals.
* resolv/nss_dns/dns-host.c: Likewise.
diff --git a/resolv/README b/resolv/README
index 1296e1c..17aa631 100644
--- a/resolv/README
+++ b/resolv/README
@@ -18,10 +18,6 @@ Differences
The resolver in the GNU C Library still differs from what's in BIND
8.2.3-T5B:
-* The resolver in glibc strictly adheres to the recommendations in RFC
- 1535. BIND 8.2.3-T5B seems to relax those rules a bit (see the code
- that's wrapped in `#ifndef RFC1535').
-
* The RES_DEBUG option (`options debug' in /etc/resolv.conf) has been
disabled.
diff --git a/resolv/res_init.c b/resolv/res_init.c
index da1f79e..407e609 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -85,7 +85,6 @@
#include <not-cancel.h>
/* Options. Should all be left alone. */
-#define RFC1535
/* #undef DEBUG */
static void res_setoptions (res_state, const char *, const char *)
@@ -133,9 +132,6 @@ __res_vinit(res_state statp, int preinit) {
int havesearch = 0;
int nsort = 0;
char *net;
-#ifndef RFC1535
- int dots;
-#endif
statp->_u._ext.initstamp = __res_initstamp;
if (!preinit) {
@@ -394,29 +390,6 @@ __res_vinit(res_state statp, int preinit) {
*pp++ = statp->defdname;
*pp = NULL;
-#ifndef RFC1535
- dots = 0;
- for (cp = statp->defdname; *cp; cp++)
- dots += (*cp == '.');
-
- cp = statp->defdname;
- while (pp < statp->dnsrch + MAXDFLSRCH) {
- if (dots < LOCALDOMAINPARTS)
- break;
- cp = __rawmemchr(cp, '.') + 1; /* we know there is one */
- *pp++ = cp;
- dots--;
- }
- *pp = NULL;
-#ifdef DEBUG
- if (statp->options & RES_DEBUG) {
- printf(";; res_init()... default dnsrch list:\n");
- for (pp = statp->dnsrch; *pp; pp++)
- printf(";;\t%s\n", *pp);
- printf(";;\t..END..\n");
- }
-#endif
-#endif /* !RFC1535 */
}
if ((cp = getenv("RES_OPTIONS")) != NULL)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=74a69831556c91ef9c410a38f1e2bd37c305322f
commit 74a69831556c91ef9c410a38f1e2bd37c305322f
Author: Florian Weimer <fweimer@redhat.com>
Date: Thu Apr 28 11:27:49 2016 +0200
resolv: Remove RESOLVSORT preprocess conditionals
diff --git a/ChangeLog b/ChangeLog
index 55ed914..47ef7a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2016-04-28 Florian Weimer <fweimer@redhat.com>
+ * resolv/gethnamaddr.c (RESOLVSORT): Do not define. Remove
+ RESOLVSORT preprocessor conditionals.
+ * resolv/nss_dns/dns-host.c: Likewise.
+ * resolv/res_init.c: Likewise.
+
+2016-04-28 Florian Weimer <fweimer@redhat.com>
+
* resolv/res_data.c: Remove code conditional on BIND_UPDATE. It
is never defined.
diff --git a/resolv/gethnamaddr.c b/resolv/gethnamaddr.c
index 2e92df8..2c71313 100644
--- a/resolv/gethnamaddr.c
+++ b/resolv/gethnamaddr.c
@@ -67,8 +67,6 @@
#include <ctype.h>
#include <errno.h>
-#define RESOLVSORT
-
#ifndef LOG_AUTH
# define LOG_AUTH 0
#endif
@@ -107,9 +105,7 @@ static int stayopen = 0;
static void map_v4v6_address (const char *src, char *dst) __THROW;
static void map_v4v6_hostent (struct hostent *hp, char **bp, int *len) __THROW;
-#ifdef RESOLVSORT
extern void addrsort (char **, int) __THROW;
-#endif
#if PACKETSZ > 65536
#define MAXPACKET PACKETSZ
@@ -434,7 +430,6 @@ getanswer (const querybuf *answer, int anslen, const char *qname, int qtype)
if (haveanswer) {
*ap = NULL;
*hap = NULL;
-# if defined(RESOLVSORT)
/*
* Note: we sort even if host can take only one address
* in its return structures - should give it the "best"
@@ -442,7 +437,6 @@ getanswer (const querybuf *answer, int anslen, const char *qname, int qtype)
*/
if (_res.nsort && haveanswer > 1 && qtype == T_A)
addrsort(h_addr_ptrs, haveanswer);
-# endif /*RESOLVSORT*/
if (!host.h_name) {
n = strlen(qname) + 1; /* for the \0 */
if (n > buflen || n >= MAXHOSTNAMELEN)
@@ -929,7 +923,6 @@ map_v4v6_hostent (struct hostent *hp, char **bpp, int *lenp)
}
}
-#ifdef RESOLVSORT
extern void
addrsort (char **ap, int num)
{
@@ -970,7 +963,6 @@ addrsort (char **ap, int num)
needsort++;
}
}
-#endif
#if defined(BSD43_BSD43_NFS) || defined(sun)
/* some libc's out there are bound internally to these names (UMIPS) */
diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
index 403a005..93fee10 100644
--- a/resolv/nss_dns/dns-host.c
+++ b/resolv/nss_dns/dns-host.c
@@ -556,7 +556,6 @@ _nss_dns_gethostbyaddr_r (const void *addr, socklen_t len, int af,
errnop, h_errnop, NULL);
}
-#ifdef RESOLVSORT
static void addrsort (char **ap, int num);
static void
@@ -600,7 +599,6 @@ addrsort (char **ap, int num)
else
break;
}
-#endif
static enum nss_status
getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
@@ -955,7 +953,6 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
{
*ap = NULL;
*hap = NULL;
-#if defined RESOLVSORT
/*
* Note: we sort even if host can take only one address
* in its return structures - should give it the "best"
@@ -963,7 +960,6 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
*/
if (_res.nsort && haveanswer > 1 && qtype == T_A)
addrsort (host_data->h_addr_ptrs, haveanswer);
-#endif /*RESOLVSORT*/
if (result->h_name == NULL)
{
diff --git a/resolv/res_init.c b/resolv/res_init.c
index de96d84..da1f79e 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -85,18 +85,15 @@
#include <not-cancel.h>
/* Options. Should all be left alone. */
-#define RESOLVSORT
#define RFC1535
/* #undef DEBUG */
static void res_setoptions (res_state, const char *, const char *)
internal_function;
-#ifdef RESOLVSORT
static const char sort_mask_chars[] = "/&";
#define ISSORTMASK(ch) (strchr(sort_mask_chars, ch) != NULL)
static u_int32_t net_mask (struct in_addr) __THROW;
-#endif
#if !defined(isascii) /* XXX - could be a function */
# define isascii(c) (!(c & 0200))
@@ -134,10 +131,8 @@ __res_vinit(res_state statp, int preinit) {
int have_serv6 = 0;
int haveenv = 0;
int havesearch = 0;
-#ifdef RESOLVSORT
int nsort = 0;
char *net;
-#endif
#ifndef RFC1535
int dots;
#endif
@@ -328,7 +323,6 @@ __res_vinit(res_state statp, int preinit) {
}
continue;
}
-#ifdef RESOLVSORT
if (MATCH(buf, "sortlist")) {
struct in_addr a;
@@ -370,7 +364,6 @@ __res_vinit(res_state statp, int preinit) {
}
continue;
}
-#endif
if (MATCH(buf, "options")) {
res_setoptions(statp, buf + sizeof("options") - 1, "conf");
continue;
@@ -381,9 +374,7 @@ __res_vinit(res_state statp, int preinit) {
/* We try IPv6 servers again. */
statp->ipv6_unavail = false;
}
-#ifdef RESOLVSORT
statp->nsort = nsort;
-#endif
(void) fclose(fp);
}
if (__builtin_expect(statp->nscount == 0, 0)) {
@@ -524,7 +515,6 @@ res_setoptions(res_state statp, const char *options, const char *source) {
}
}
-#ifdef RESOLVSORT
/* XXX - should really support CIDR which means explicit masks always. */
/* XXX - should really use system's version of this */
static u_int32_t
@@ -538,7 +528,6 @@ net_mask (struct in_addr in)
return (htonl(IN_CLASSB_NET));
return (htonl(IN_CLASSC_NET));
}
-#endif
u_int
res_randomid(void) {
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=561905e1374443ee2a2a2848fd31bc062e4bbcbf
commit 561905e1374443ee2a2a2848fd31bc062e4bbcbf
Author: Florian Weimer <fweimer@redhat.com>
Date: Thu Apr 28 11:23:52 2016 +0200
resolv: Remove BIND_UPDATE preprocessor conditionals
diff --git a/ChangeLog b/ChangeLog
index 4a3a528..55ed914 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2016-04-28 Florian Weimer <fweimer@redhat.com>
+ * resolv/res_data.c: Remove code conditional on BIND_UPDATE. It
+ is never defined.
+
+2016-04-28 Florian Weimer <fweimer@redhat.com>
+
* inet/inet_lnaof.c: Remove SCSS keyword.
* inet/inet_mkadr.c: Likewise.
* inet/inet_net.c: Likewise.
diff --git a/resolv/res_data.c b/resolv/res_data.c
index 986fc37..3c196de 100644
--- a/resolv/res_data.c
+++ b/resolv/res_data.c
@@ -27,9 +27,6 @@
#include <ctype.h>
#include <netdb.h>
#include <resolv.h>
-#ifdef BIND_UPDATE
-#include <res_update.h>
-#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -55,15 +52,6 @@ const char *_res_opcodes[] = {
};
libresolv_hidden_data_def (_res_opcodes)
-#ifdef BIND_UPDATE
-const char *_res_sectioncodes[] attribute_hidden = {
- "ZONE",
- "PREREQUISITES",
- "UPDATE",
- "ADDITIONAL",
-};
-#endif
-
#ifndef __BIND_NOSTATIC
void
p_query(const u_char *msg) {
@@ -104,18 +92,6 @@ res_mkquery(int op, /* opcode of query */
newrr_in, buf, buflen));
}
-#ifdef BIND_UPDATE
-int
-res_mkupdate(ns_updrec *rrecp_in, u_char *buf, int buflen) {
- if (__res_maybe_init (&_res, 1) == -1) {
- RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
- return (-1);
- }
-
- return (res_nmkupdate(&_res, rrecp_in, buf, buflen));
-}
-#endif
-
int
res_query(const char *name, /* domain name */
int class, int type, /* class and type of query */
@@ -171,18 +147,6 @@ res_close(void) {
__res_iclose(&_res, false);
}
-#ifdef BIND_UPDATE
-int
-res_update(ns_updrec *rrecp_in) {
- if (__res_maybe_init (&_res, 1) == -1) {
- RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
- return (-1);
- }
-
- return (res_nupdate(&_res, rrecp_in, NULL));
-}
-#endif
-
int
res_search(const char *name, /* domain name */
int class, int type, /* class and type of query */
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=283952c4a82b5a9d20932dff1f21148672d33bf4
commit 283952c4a82b5a9d20932dff1f21148672d33bf4
Author: Florian Weimer <fweimer@redhat.com>
Date: Thu Apr 28 11:14:10 2016 +0200
inet: Remove SCCS keywords
diff --git a/ChangeLog b/ChangeLog
index c4aec94..4a3a528 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2016-04-28 Florian Weimer <fweimer@redhat.com>
+ * inet/inet_lnaof.c: Remove SCSS keyword.
+ * inet/inet_mkadr.c: Likewise.
+ * inet/inet_net.c: Likewise.
+ * inet/inet_netof.c: Likewise.
+ * inet/rcmd.c: Likewise.
+ * inet/rexec.c: Likewise.
+ * inet/ruserpass.c: Likewise.
+
+2016-04-28 Florian Weimer <fweimer@redhat.com>
+
* resolv/inet_addr.c: Remove _LIBC conditionals.
* resolv/res_data.c: Likewise.
* resolv/res_init.c: Likewise.
diff --git a/inet/inet_lnaof.c b/inet/inet_lnaof.c
index 8fd759c..fc8196b 100644
--- a/inet/inet_lnaof.c
+++ b/inet/inet_lnaof.c
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_lnaof.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/inet/inet_mkadr.c b/inet/inet_mkadr.c
index 75d8daa..88faef7 100644
--- a/inet/inet_mkadr.c
+++ b/inet/inet_mkadr.c
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_makeaddr.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/inet/inet_net.c b/inet/inet_net.c
index 2e8752d..1de83b6 100644
--- a/inet/inet_net.c
+++ b/inet/inet_net.c
@@ -44,11 +44,6 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_network.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/inet/inet_netof.c b/inet/inet_netof.c
index 0f048e6..ef6281d 100644
--- a/inet/inet_netof.c
+++ b/inet/inet_netof.c
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_netof.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/inet/rcmd.c b/inet/rcmd.c
index ace6b14..8613d96 100644
--- a/inet/rcmd.c
+++ b/inet/rcmd.c
@@ -55,10 +55,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/poll.h>
#include <sys/socket.h>
diff --git a/inet/rexec.c b/inet/rexec.c
index 4e6d48d..24ac4b1 100644
--- a/inet/rexec.c
+++ b/inet/rexec.c
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rexec.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/inet/ruserpass.c b/inet/ruserpass.c
index ff379db..dafc330 100644
--- a/inet/ruserpass.c
+++ b/inet/ruserpass.c
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ruserpass.c 8.3 (Berkeley) 4/2/94";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c99c925b8b7ce7d023943878a41ad964c5ab7a04
commit c99c925b8b7ce7d023943878a41ad964c5ab7a04
Author: Florian Weimer <fweimer@redhat.com>
Date: Thu Apr 28 11:01:01 2016 +0200
resolv: Remove _LIBC conditionals
diff --git a/ChangeLog b/ChangeLog
index ccb2780..c4aec94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2016-04-28 Florian Weimer <fweimer@redhat.com>
+ * resolv/inet_addr.c: Remove _LIBC conditionals.
+ * resolv/res_data.c: Likewise.
+ * resolv/res_init.c: Likewise.
+ * resolv/res_mkquery.c: Likewise.
+ * resolv/res_libc.c: Update comment.
+ * resolv/README: Update.
+
+2016-04-28 Florian Weimer <fweimer@redhat.com>
+
* resolv/gethnamaddr.c: Remove SCSS keyword.
* resolv/herror.c: Likewise.
* resolv/inet_addr.c: Likewise.
diff --git a/resolv/README b/resolv/README
index dbb1510..1296e1c 100644
--- a/resolv/README
+++ b/resolv/README
@@ -149,8 +149,7 @@ src/lib/isc/
base64.c
Some of these files have been optimised a bit, and adaptations have
-been made to make them fit in with the rest of glibc. The more
-non-obvious changes are wrapped in something like `#ifdef _LIBC'.
+been made to make them fit in with the rest of glibc.
res_libc.c is home-brewn, although parts of it are taken from res_data.c.
diff --git a/resolv/inet_addr.c b/resolv/inet_addr.c
index a16b513..10d9a1e 100644
--- a/resolv/inet_addr.c
+++ b/resolv/inet_addr.c
@@ -72,13 +72,11 @@
#include <ctype.h>
-#ifdef _LIBC
# include <endian.h>
# include <stdint.h>
# include <stdlib.h>
# include <limits.h>
# include <errno.h>
-#endif
/*
* Ascii internet address interpretation routine.
@@ -106,9 +104,6 @@ __inet_aton(const char *cp, struct in_addr *addr)
{
static const in_addr_t max[4] = { 0xffffffff, 0xffffff, 0xffff, 0xff };
in_addr_t val;
-#ifndef _LIBC
- int base;
-#endif
char c;
union iaddr {
uint8_t bytes[4];
@@ -117,10 +112,8 @@ __inet_aton(const char *cp, struct in_addr *addr)
uint8_t *pp = res.bytes;
int digit;
-#ifdef _LIBC
int saved_errno = errno;
__set_errno (0);
-#endif
res.word = 0;
@@ -133,7 +126,6 @@ __inet_aton(const char *cp, struct in_addr *addr)
*/
if (!isdigit(c))
goto ret_0;
-#ifdef _LIBC
{
char *endp;
unsigned long ul = strtoul (cp, (char **) &endp, 0);
@@ -146,33 +138,6 @@ __inet_aton(const char *cp, struct in_addr *addr)
cp = endp;
}
c = *cp;
-#else
- val = 0; base = 10; digit = 0;
- if (c == '0') {
- c = *++cp;
- if (c == 'x' || c == 'X')
- base = 16, c = *++cp;
- else {
- base = 8;
- digit = 1 ;
- }
- }
- for (;;) {
- if (isascii(c) && isdigit(c)) {
- if (base == 8 && (c == '8' || c == '9'))
- return (0);
- val = (val * base) + (c - '0');
- c = *++cp;
- digit = 1;
- } else if (base == 16 && isascii(c) && isxdigit(c)) {
- val = (val << 4) |
- (c + 10 - (islower(c) ? 'a' : 'A'));
- c = *++cp;
- digit = 1;
- } else
- break;
- }
-#endif
if (c == '.') {
/*
* Internet format:
@@ -206,15 +171,11 @@ __inet_aton(const char *cp, struct in_addr *addr)
if (addr != NULL)
addr->s_addr = res.word | htonl (val);
-#ifdef _LIBC
__set_errno (saved_errno);
-#endif
return (1);
ret_0:
-#ifdef _LIBC
__set_errno (saved_errno);
-#endif
return (0);
}
weak_alias (__inet_aton, inet_aton)
diff --git a/resolv/res_data.c b/resolv/res_data.c
index f7ec21e..986fc37 100644
--- a/resolv/res_data.c
+++ b/resolv/res_data.c
@@ -65,67 +65,6 @@ const char *_res_sectioncodes[] attribute_hidden = {
#endif
#ifndef __BIND_NOSTATIC
-#ifdef _LIBC
-/* The definition has been moved to res_libc.c. */
-#else
-#undef _res
-struct __res_state _res
-# if defined(__BIND_RES_TEXT)
- = { RES_TIMEOUT, } /* Motorola, et al. */
-# endif
- ;
-#endif
-
-/* Proto. */
-#ifndef _LIBC
-int res_ourserver_p(const res_state, const struct sockaddr_in *);
-void res_pquery(const res_state, const u_char *, int, FILE *);
-#endif
-
-#ifndef _LIBC
-/* Moved to res_libc.c since res_init() should go into libc.so but the
- rest of this file not. */
-int
-res_init(void) {
- extern int __res_vinit(res_state, int);
-
- /*
- * These three fields used to be statically initialized. This made
- * it hard to use this code in a shared library. It is necessary,
- * now that we're doing dynamic initialization here, that we preserve
- * the old semantics: if an application modifies one of these three
- * fields of _res before res_init() is called, res_init() will not
- * alter them. Of course, if an application is setting them to
- * _zero_ before calling res_init(), hoping to override what used
- * to be the static default, we can't detect it and unexpected results
- * will follow. Zero for any of these fields would make no sense,
- * so one can safely assume that the applications were already getting
- * unexpected results.
- *
- * _res.options is tricky since some apps were known to diddle the bits
- * before res_init() was first called. We can't replicate that semantic
- * with dynamic initialization (they may have turned bits off that are
- * set in RES_DEFAULT). Our solution is to declare such applications
- * "broken". They could fool us by setting RES_INIT but none do (yet).
- */
- if (!_res.retrans)
- _res.retrans = RES_TIMEOUT;
- if (!_res.retry)
- _res.retry = 4;
- 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));
-}
-#endif
-
void
p_query(const u_char *msg) {
fp_query(msg, stdout);
@@ -215,23 +154,9 @@ res_send(const u_char *buf, int buflen, u_char *ans, int anssiz) {
return (res_nsend(&_res, buf, buflen, ans, anssiz));
}
-#ifndef _LIBC
-int
-res_sendsigned(const u_char *buf, int buflen, ns_tsig_key *key,
- u_char *ans, int anssiz)
-{
- if (__res_maybe_init (&_res, 1) == -1) {
- /* errno should have been set by res_init() in this case. */
- return (-1);
- }
-
- return (res_nsendsigned(&_res, buf, buflen, key, ans, anssiz));
-}
-#endif
void
res_close(void) {
-#ifdef _LIBC
/*
* Some stupid programs out there call res_close() before res_init().
* Since _res._vcsock isn't explicitly initialized, these means that
@@ -241,7 +166,6 @@ res_close(void) {
* early. */
if ((_res.options & RES_INIT) == 0)
return;
-#endif
/* We don't free the name server addresses because we never
did it and it would be done implicitly on shutdown. */
__res_iclose(&_res, false);
diff --git a/resolv/res_init.c b/resolv/res_init.c
index 4fb7f1e..de96d84 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -102,9 +102,7 @@ static u_int32_t net_mask (struct in_addr) __THROW;
# define isascii(c) (!(c & 0200))
#endif
-#ifdef _LIBC
unsigned long long int __res_initstamp attribute_hidden;
-#endif
/*
* Resolver state default settings.
@@ -123,9 +121,7 @@ res_ninit(res_state statp) {
return (__res_vinit(statp, 0));
}
-#ifdef _LIBC
libc_hidden_def (__res_ninit)
-#endif
/* This function has to be reachable by res_data.c but not publically. */
int
@@ -145,9 +141,7 @@ __res_vinit(res_state statp, int preinit) {
#ifndef RFC1535
int dots;
#endif
-#ifdef _LIBC
statp->_u._ext.initstamp = __res_initstamp;
-#endif
if (!preinit) {
statp->retrans = RES_TIMEOUT;
@@ -283,7 +277,6 @@ __res_vinit(res_state statp, int preinit) {
statp->nsaddr_list[nserv].sin_port =
htons(NAMESERVER_PORT);
nserv++;
-#ifdef _LIBC
} else {
struct in6_addr a6;
char *el;
@@ -332,7 +325,6 @@ __res_vinit(res_state statp, int preinit) {
nserv++;
}
}
-#endif
}
continue;
}
@@ -385,12 +377,10 @@ __res_vinit(res_state statp, int preinit) {
}
}
statp->nscount = nserv;
-#ifdef _LIBC
if (have_serv6) {
/* We try IPv6 servers again. */
statp->ipv6_unavail = false;
}
-#endif
#ifdef RESOLVSORT
statp->nsort = nsort;
#endif
@@ -554,9 +544,7 @@ u_int
res_randomid(void) {
return 0xffff & __getpid();
}
-#ifdef _LIBC
libc_hidden_def (__res_randomid)
-#endif
/*
@@ -594,11 +582,8 @@ res_nclose(res_state statp)
{
__res_iclose (statp, true);
}
-#ifdef _LIBC
libc_hidden_def (__res_nclose)
-#endif
-#ifdef _LIBC
# ifdef _LIBC_REENTRANT
/* This is called when a thread is exiting to free resources held in _res. */
static void __attribute__ ((section ("__libc_thread_freeres_fn")))
@@ -616,4 +601,3 @@ res_thread_freeres (void)
text_set_element (__libc_thread_subfreeres, res_thread_freeres);
text_set_element (__libc_subfreeres, res_thread_freeres);
# endif
-#endif
diff --git a/resolv/res_libc.c b/resolv/res_libc.c
index a8394e0..a4b376f 100644
--- a/resolv/res_libc.c
+++ b/resolv/res_libc.c
@@ -15,6 +15,9 @@
* SOFTWARE.
*/
+/* This file contains the definitions related to res_init which are
+ linked into libc instead of libresolv. */
+
#include <atomic.h>
#include <limits.h>
#include <sys/types.h>
@@ -23,11 +26,6 @@
#include <resolv.h>
#include <libc-lock.h>
-
-/* The following bit is copied from res_data.c (where it is #ifdef'ed
- out) since res_init() should go into libc.so but the rest of that
- file should not. */
-
extern unsigned long long int __res_initstamp attribute_hidden;
/* We have atomic increment operations on 64-bit platforms. */
#if __WORDSIZE == 64
diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c
index 200b59f..9a11d16 100644
--- a/resolv/res_mkquery.c
+++ b/resolv/res_mkquery.c
@@ -77,13 +77,11 @@
/* Options. Leave them on. */
/* #define DEBUG */
-#ifdef _LIBC
# include <hp-timing.h>
# include <stdint.h>
# if HP_TIMING_AVAIL
# define RANDOM_BITS(Var) { uint64_t v64; HP_TIMING_NOW (v64); Var = v64; }
# endif
-#endif
/*
* Form all types of queries.
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1f32be054b640fa7bcbc46441e24e185ab5184e3
commit 1f32be054b640fa7bcbc46441e24e185ab5184e3
Author: Florian Weimer <fweimer@redhat.com>
Date: Thu Apr 28 10:55:16 2016 +0200
resolv: Remove SCCS and RCS keywords
diff --git a/ChangeLog b/ChangeLog
index 61e38d1..ccb2780 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2016-04-28 Florian Weimer <fweimer@redhat.com>
+
+ * resolv/gethnamaddr.c: Remove SCSS keyword.
+ * resolv/herror.c: Likewise.
+ * resolv/inet_addr.c: Likewise.
+ * resolv/inet_net_ntop.c: Likewise.
+ * resolv/inet_net_pton.c: Likewise.
+ * resolv/inet_neta.c: Likewise.
+ * resolv/inet_ntop.c: Likewise.
+ * resolv/inet_pton.c: Likewise.
+ * resolv/ns_date.c: Remove RCS keyword.
+ * resolv/ns_name.c: Likewise.
+ * resolv/ns_netint.c: Likewise.
+ * resolv/ns_parse.c: Likewise.
+ * resolv/ns_print.c: Likewise.
+ * resolv/ns_samedomain.c: Likewise.
+ * resolv/ns_ttl.c: Likewise.
+ * resolv/nsap_addr.c: Likewise.
+ * resolv/res_comp.c: Remove SCSS and RCS keyword.
+ * resolv/res_data.c: Remove RCS keyword.
+ * resolv/res_debug.c: Remove SCSS and RCS keyword.
+ * resolv/res_init.c: Likewise.
+ * resolv/res_mkquery.c: Likewise.
+ * resolv/res_query.c: Likewise.
+ * resolv/res_send.c: Likewise.
+
2016-04-27 Joseph Myers <joseph@codesourcery.com>
* conform/data/stdio.h-data (fdopen): Expect also for
diff --git a/resolv/gethnamaddr.c b/resolv/gethnamaddr.c
index 4720fc8..2e92df8 100644
--- a/resolv/gethnamaddr.c
+++ b/resolv/gethnamaddr.c
@@ -54,10 +54,6 @@
it exports symbols in the libresolv ABI. The file is not maintained any
more, nor are these functions. */
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/resolv/herror.c b/resolv/herror.c
index 0aaf29f..e285224 100644
--- a/resolv/herror.c
+++ b/resolv/herror.c
@@ -44,11 +44,6 @@
* SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)herror.c 8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$BINDId: herror.c,v 8.11 1999/10/13 16:39:39 vixie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/uio.h>
diff --git a/resolv/inet_addr.c b/resolv/inet_addr.c
index ee42093..a16b513 100644
--- a/resolv/inet_addr.c
+++ b/resolv/inet_addr.c
@@ -64,11 +64,6 @@
* SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93";
-static const char rcsid[] = "$BINDId: inet_addr.c,v 8.11 1999/10/13 16:39:25 vixie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/param.h>
diff --git a/resolv/inet_net_ntop.c b/resolv/inet_net_ntop.c
index 2d57ae3..aaa78f6 100644
--- a/resolv/inet_net_ntop.c
+++ b/resolv/inet_net_ntop.c
@@ -15,10 +15,6 @@
* SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$BINDId: inet_net_ntop.c,v 1.6 1999/01/08 19:23:42 vixie Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/resolv/inet_net_pton.c b/resolv/inet_net_pton.c
index 75a8515..aab9b7b 100644
--- a/resolv/inet_net_pton.c
+++ b/resolv/inet_net_pton.c
@@ -15,10 +15,6 @@
* SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$BINDId: inet_net_pton.c,v 1.11 1999/01/08 19:23:44 vixie Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/resolv/inet_neta.c b/resolv/inet_neta.c
index b9f256b..348ff47 100644
--- a/resolv/inet_neta.c
+++ b/resolv/inet_neta.c
@@ -15,10 +15,6 @@
* SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$BINDId: inet_neta.c,v 1.6 1999/01/08 19:23:45 vixie Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/resolv/inet_ntop.c b/resolv/inet_ntop.c
index 32338c5..01c45ce 100644
--- a/resolv/inet_ntop.c
+++ b/resolv/inet_ntop.c
@@ -15,10 +15,6 @@
* SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$BINDId: inet_ntop.c,v 1.8 1999/10/13 16:39:28 vixie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/resolv/inet_pton.c b/resolv/inet_pton.c
index 0d18e9a..c0a7d54 100644
--- a/resolv/inet_pton.c
+++ b/resolv/inet_pton.c
@@ -15,10 +15,6 @@
* SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$BINDId: inet_pton.c,v 1.7 1999/10/13 16:39:28 vixie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/resolv/ns_date.c b/resolv/ns_date.c
index 9801ac4..31cef74 100644
--- a/resolv/ns_date.c
+++ b/resolv/ns_date.c
@@ -15,10 +15,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(_LIBC) && !defined(lint)
-static const char rcsid[] = "$Id$";
-#endif
-
/* Import. */
#include <arpa/nameser.h>
diff --git a/resolv/ns_name.c b/resolv/ns_name.c
index f355cf3..65e7fc8 100644
--- a/resolv/ns_name.c
+++ b/resolv/ns_name.c
@@ -15,10 +15,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(_LIBC) && !defined(lint)
-static const char rcsid[] = "$BINDId: ns_name.c,v 8.15 2000/03/30 22:53:46 vixie Exp $";
-#endif
-
#include <sys/types.h>
#include <netinet/in.h>
diff --git a/resolv/ns_netint.c b/resolv/ns_netint.c
index 4318f18..6a365a3 100644
--- a/resolv/ns_netint.c
+++ b/resolv/ns_netint.c
@@ -15,10 +15,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(_LIBC) && !defined(lint)
-static const char rcsid[] = "$BINDId: ns_netint.c,v 8.4 1999/10/13 16:39:35 vixie Exp $";
-#endif
-
/* Import. */
#include <arpa/nameser.h>
diff --git a/resolv/ns_parse.c b/resolv/ns_parse.c
index 712469b..863b20a 100644
--- a/resolv/ns_parse.c
+++ b/resolv/ns_parse.c
@@ -15,10 +15,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(_LIBC) && !defined(lint)
-static const char rcsid[] = "$BINDId: ns_parse.c,v 8.13 1999/10/13 16:39:35 vixie Exp $";
-#endif
-
/* Import. */
#include <sys/types.h>
diff --git a/resolv/ns_print.c b/resolv/ns_print.c
index 800680d..7a0e7d5 100644
--- a/resolv/ns_print.c
+++ b/resolv/ns_print.c
@@ -16,10 +16,6 @@
* SOFTWARE.
*/
-#if !defined(_LIBC) && !defined(lint)
-static const char rcsid[] = "$BINDId: ns_print.c,v 8.18 2000/02/29 05:48:12 vixie Exp $";
-#endif
-
/* Import. */
#include <sys/types.h>
diff --git a/resolv/ns_samedomain.c b/resolv/ns_samedomain.c
index df6a4a2..5d1bf39 100644
--- a/resolv/ns_samedomain.c
+++ b/resolv/ns_samedomain.c
@@ -16,10 +16,6 @@
* SOFTWARE.
*/
-#if !defined(_LIBC) && !defined(lint)
-static const char rcsid[] = "$BINDId: ns_samedomain.c,v 8.9 1999/10/15 21:06:51 vixie Exp $";
-#endif
-
#include <sys/types.h>
#include <arpa/nameser.h>
#include <errno.h>
diff --git a/resolv/ns_ttl.c b/resolv/ns_ttl.c
index d4c98bc..0799487 100644
--- a/resolv/ns_ttl.c
+++ b/resolv/ns_ttl.c
@@ -16,10 +16,6 @@
* SOFTWARE.
*/
-#if !defined(_LIBC) && !defined(lint)
-static const char rcsid[] = "$BINDId: ns_ttl.c,v 8.8 1999/10/13 16:39:36 vixie Exp $";
-#endif
-
/* Import. */
#include <arpa/nameser.h>
diff --git a/resolv/nsap_addr.c b/resolv/nsap_addr.c
index 7041e52..9a1d3f7 100644
--- a/resolv/nsap_addr.c
+++ b/resolv/nsap_addr.c
@@ -15,10 +15,6 @@
* SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$BINDId: nsap_addr.c,v 8.10 1999/10/13 16:39:28 vixie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/resolv/res_comp.c b/resolv/res_comp.c
index 2ff7ddb..3c50774 100644
--- a/resolv/res_comp.c
+++ b/resolv/res_comp.c
@@ -64,11 +64,6 @@
* SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_comp.c 8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$BINDId: res_comp.c,v 8.15 1999/10/13 16:39:39 vixie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <netinet/in.h>
diff --git a/resolv/res_data.c b/resolv/res_data.c
index 81c9ae5..f7ec21e 100644
--- a/resolv/res_data.c
+++ b/resolv/res_data.c
@@ -15,10 +15,6 @@
* SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$BINDId: res_data.c,v 8.17 1999/10/13 17:11:31 vixie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/resolv/res_debug.c b/resolv/res_debug.c
index 68a407a..d1e12db 100644
--- a/resolv/res_debug.c
+++ b/resolv/res_debug.c
@@ -89,11 +89,6 @@
* SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$BINDId: res_debug.c,v 8.34 2000/02/29 05:30:55 vixie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/resolv/res_init.c b/resolv/res_init.c
index 02590fb..4fb7f1e 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -64,11 +64,6 @@
* SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93";
-static const char rcsid[] = "$BINDId: res_init.c,v 8.16 2000/05/09 07:10:12 vixie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <ctype.h>
#include <netdb.h>
#include <resolv.h>
diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c
index 1635e6a..200b59f 100644
--- a/resolv/res_mkquery.c
+++ b/resolv/res_mkquery.c
@@ -64,11 +64,6 @@
* SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_mkquery.c 8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$BINDId: res_mkquery.c,v 8.12 1999/10/13 16:39:40 vixie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <netinet/in.h>
diff --git a/resolv/res_query.c b/resolv/res_query.c
index 95470a9..944d1a9 100644
--- a/resolv/res_query.c
+++ b/resolv/res_query.c
@@ -64,11 +64,6 @@
* SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_query.c 8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$BINDId: res_query.c,v 8.20 2000/02/29 05:39:12 vixie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <assert.h>
#include <sys/types.h>
#include <sys/param.h>
diff --git a/resolv/res_send.c b/resolv/res_send.c
index 2c0bae1..869294f 100644
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -81,11 +81,6 @@
* SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$BINDId: res_send.c,v 8.38 2000/03/30 20:16:51 vixie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* Send query to name server and wait for reply.
*/
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 97 ++++++++++++++++++++++++++++++++
conf/portability.h | 26 ---------
inet/inet_lnaof.c | 4 -
inet/inet_mkadr.c | 4 -
inet/inet_net.c | 5 --
inet/inet_netof.c | 4 -
inet/rcmd.c | 4 -
inet/rexec.c | 4 -
inet/ruserpass.c | 4 -
resolv/README | 7 +--
resolv/arpa/nameser.h | 6 +--
resolv/gethnamaddr.c | 137 ++-------------------------------------------
resolv/herror.c | 5 --
resolv/inet_addr.c | 44 --------------
resolv/inet_net_ntop.c | 4 -
resolv/inet_net_pton.c | 4 -
resolv/inet_neta.c | 4 -
resolv/inet_ntop.c | 4 -
resolv/inet_pton.c | 4 -
resolv/ns_date.c | 4 -
resolv/ns_name.c | 4 -
resolv/ns_netint.c | 4 -
resolv/ns_parse.c | 4 -
resolv/ns_print.c | 4 -
resolv/ns_samedomain.c | 4 -
resolv/ns_ttl.c | 4 -
resolv/nsap_addr.c | 4 -
resolv/nss_dns/dns-host.c | 9 ---
resolv/res_comp.c | 7 --
resolv/res_data.c | 135 --------------------------------------------
resolv/res_debug.c | 5 --
resolv/res_init.c | 63 ---------------------
resolv/res_libc.c | 8 +--
resolv/res_mkquery.c | 7 --
resolv/res_query.c | 5 --
resolv/res_send.c | 5 --
resolv/resolv.h | 2 -
37 files changed, 107 insertions(+), 542 deletions(-)
delete mode 100644 conf/portability.h
hooks/post-receive
--
GNU C Library master sources