From patchwork Tue May 31 13:20:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guido Trentalancia X-Patchwork-Id: 12644 Received: (qmail 10747 invoked by alias); 31 May 2016 13:21:10 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 10085 invoked by uid 89); 31 May 2016 13:21:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.1 required=5.0 tests=AWL, BAYES_60, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 spammy=guidotrentalancianet, sk:guidot, nss3, guido@trentalancia.net X-HELO: authsmtp.register.it X-Rid: guido@trentalancia.net@151.76.58.157 Message-ID: <1464700854.24965.21.camel@trentalancia.net> Subject: [PATCH v2] [BZ 17956] Fix build failure due to missing definitions from header file nss/nss.h when Mozilla NSS is used for cryptography From: Guido Trentalancia To: libc-alpha@sourceware.org Date: Tue, 31 May 2016 15:20:54 +0200 In-Reply-To: <1464635653.24965.5.camel@trentalancia.net> References: <1464635653.24965.5.camel@trentalancia.net> Mime-Version: 1.0 A build failure might occur when glibc is configured with the --enable-nss-crypt option in order to use Mozilla NSS library for cryptography. Such failure is due to conflicting "nss.h" header files: one from GNU glibc and the other from the Mozilla NSS library (usually located at /usr/include/nss3/nss.h). For example, a build configuration that leads to the occurrence of this bug includes passing the Mozilla NSS library headers full path to the preprocessor using CPPFLAGS. This patch aims to fix such build failure (BZ 17956) by helping the preprocessor pick the right (local) "nss.h" header file during compilation. This new version includes amendments to both source and test files (in a unique patch instead of two separate patches). Signed-off-by: Guido Trentalancia --- grp/fgetgrent_r.c | 2 +- grp/getgrgid_r.c | 2 +- grp/getgrnam_r.c | 2 +- grp/putgrent.c | 2 +- gshadow/fgetsgent_r.c | 2 +- gshadow/putsgent.c | 2 +- gshadow/sgetsgent_r.c | 2 +- hesiod/nss_hesiod/hesiod-grp.c | 4 ++-- hesiod/nss_hesiod/hesiod-proto.c | 4 ++-- hesiod/nss_hesiod/hesiod-pwd.c | 4 ++-- hesiod/nss_hesiod/hesiod-service.c | 4 ++-- include/nss.h | 2 +- include/nsswitch.h | 2 +- include/pwd.h | 2 +- inet/ether_ntoh.c | 2 +- inet/gethstbynm.c | 2 +- nis/nss_compat/compat-grp.c | 4 ++-- nis/nss_compat/compat-initgroups.c | 4 ++-- nis/nss_compat/compat-pwd.c | 4 ++-- nis/nss_compat/compat-spwd.c | 4 ++-- nis/nss_nis/nis-alias.c | 2 +- nis/nss_nis/nis-ethers.c | 4 ++-- nis/nss_nis/nis-grp.c | 4 ++-- nis/nss_nis/nis-hosts.c | 4 ++-- nis/nss_nis/nis-initgroups.c | 4 ++-- nis/nss_nis/nis-netgrp.c | 2 +- nis/nss_nis/nis-network.c | 4 ++-- nis/nss_nis/nis-proto.c | 4 ++-- nis/nss_nis/nis-publickey.c | 2 +- nis/nss_nis/nis-pwd.c | 4 ++-- nis/nss_nis/nis-rpc.c | 4 ++-- nis/nss_nis/nis-service.c | 4 ++-- nis/nss_nis/nis-spwd.c | 4 ++-- nis/nss_nisplus/nisplus-alias.c | 2 +- nis/nss_nisplus/nisplus-ethers.c | 2 +- nis/nss_nisplus/nisplus-grp.c | 2 +- nis/nss_nisplus/nisplus-hosts.c | 2 +- nis/nss_nisplus/nisplus-initgroups.c | 2 +- nis/nss_nisplus/nisplus-netgrp.c | 2 +- nis/nss_nisplus/nisplus-network.c | 2 +- nis/nss_nisplus/nisplus-proto.c | 2 +- nis/nss_nisplus/nisplus-publickey.c | 2 +- nis/nss_nisplus/nisplus-pwd.c | 2 +- nis/nss_nisplus/nisplus-rpc.c | 2 +- nis/nss_nisplus/nisplus-service.c | 2 +- nis/nss_nisplus/nisplus-spwd.c | 2 +- nscd/aicache.c | 2 +- nscd/getgrgid_r.c | 2 +- nscd/getgrnam_r.c | 2 +- nscd/getpwnam_r.c | 2 +- nscd/getpwuid_r.c | 2 +- nss/nss_db/db-initgroups.c | 1 + nss/nss_db/db-open.c | 1 + nss/nss_db/nss_db.h | 2 +- nss/nss_files/files-initgroups.c | 2 +- nss/nss_test1.c | 2 +- nss/nsswitch.h | 2 +- nss/rewrite_field.c | 2 +- nss/tst-field.c | 2 +- nss/tst-nss-test1.c | 2 +- nss/valid_field.c | 2 +- nss/valid_list_field.c | 2 +- pwd/fgetpwent_r.c | 2 +- pwd/getpwnam_r.c | 2 +- pwd/getpwuid_r.c | 2 +- pwd/putpwent.c | 2 +- shadow/fgetspent_r.c | 2 +- shadow/putspent.c | 2 +- shadow/sgetspent_r.c | 2 +- sysdeps/posix/getaddrinfo.c | 2 +- 70 files changed, 88 insertions(+), 86 deletions(-) diff -pru glibc/grp/fgetgrent_r.c glibc-31052016-0900GMT/grp/fgetgrent_r.c --- glibc/grp/fgetgrent_r.c 2016-05-30 13:25:35.403697020 +0200 +++ glibc-31052016-0900GMT/grp/fgetgrent_r.c 2016-05-31 10:26:09.912895303 +0200 @@ -33,7 +33,7 @@ struct grent_data {}; #define TRAILING_LIST_MEMBER gr_mem #define TRAILING_LIST_SEPARATOR_P(c) ((c) == ',') -#include +#include "../nss/nss_files/files-parse.c" LINE_PARSER (, STRING_FIELD (result->gr_name, ISCOLON, 0); diff -pru glibc/grp/getgrgid_r.c glibc-31052016-0900GMT/grp/getgrgid_r.c --- glibc/grp/getgrgid_r.c 2016-05-30 13:25:35.403697020 +0200 +++ glibc-31052016-0900GMT/grp/getgrgid_r.c 2016-05-31 10:25:34.494630502 +0200 @@ -29,4 +29,4 @@ #define DEEPCOPY_FN __copy_grp #define MERGE_FN __merge_grp -#include +#include "../nss/getXXbyYY_r.c" diff -pru glibc/grp/getgrnam_r.c glibc-31052016-0900GMT/grp/getgrnam_r.c --- glibc/grp/getgrnam_r.c 2016-05-30 13:25:35.404697023 +0200 +++ glibc-31052016-0900GMT/grp/getgrnam_r.c 2016-05-31 10:25:52.658252852 +0200 @@ -29,4 +29,4 @@ #define DEEPCOPY_FN __copy_grp #define MERGE_FN __merge_grp -#include +#include "../nss/getXXbyYY_r.c" diff -pru glibc/grp/putgrent.c glibc-31052016-0900GMT/grp/putgrent.c --- glibc/grp/putgrent.c 2016-05-30 13:25:35.404697023 +0200 +++ glibc-31052016-0900GMT/grp/putgrent.c 2016-05-31 11:32:52.669065354 +0200 @@ -16,7 +16,7 @@ . */ #include -#include +#include "../include/nss.h" #include #include #include diff -pru glibc/gshadow/fgetsgent_r.c glibc-31052016-0900GMT/gshadow/fgetsgent_r.c --- glibc/gshadow/fgetsgent_r.c 2016-05-30 13:25:35.405697027 +0200 +++ glibc-31052016-0900GMT/gshadow/fgetsgent_r.c 2016-05-31 10:24:58.422384367 +0200 @@ -28,7 +28,7 @@ #define EXTERN_PARSER 1 struct sgent_data {}; -#include +#include "../nss/nss_files/files-parse.c" /* Read one shadow entry from the given stream. */ diff -pru glibc/gshadow/putsgent.c glibc-31052016-0900GMT/gshadow/putsgent.c --- glibc/gshadow/putsgent.c 2016-05-30 13:25:35.406697030 +0200 +++ glibc-31052016-0900GMT/gshadow/putsgent.c 2016-05-31 11:32:04.859911596 +0200 @@ -19,7 +19,7 @@ #include #include #include -#include +#include "../include/nss.h" #define _S(x) x ? x : "" diff -pru glibc/gshadow/sgetsgent_r.c glibc-31052016-0900GMT/gshadow/sgetsgent_r.c --- glibc/gshadow/sgetsgent_r.c 2016-05-30 13:25:35.406697030 +0200 +++ glibc-31052016-0900GMT/gshadow/sgetsgent_r.c 2016-05-31 10:24:11.361375682 +0200 @@ -31,7 +31,7 @@ struct sgent_data {}; #define TRAILING_LIST_MEMBER sg_mem #define TRAILING_LIST_SEPARATOR_P(c) ((c) == ',') -#include +#include "../nss/nss_files/files-parse.c" LINE_PARSER (, STRING_FIELD (result->sg_namp, ISCOLON, 0); diff -pru glibc/hesiod/nss_hesiod/hesiod-grp.c glibc-31052016-0900GMT/hesiod/nss_hesiod/hesiod-grp.c --- glibc/hesiod/nss_hesiod/hesiod-grp.c 2016-05-30 13:25:35.407697033 +0200 +++ glibc-31052016-0900GMT/hesiod/nss_hesiod/hesiod-grp.c 2016-05-31 10:30:48.335283621 +0200 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include @@ -30,7 +30,7 @@ #define ENTNAME grent #define STRUCTURE group #define EXTERN_PARSER -#include +#include "../../nss/nss_files/files-parse.c" enum nss_status _nss_hesiod_setgrent (int stayopen) diff -pru glibc/hesiod/nss_hesiod/hesiod-proto.c glibc-31052016-0900GMT/hesiod/nss_hesiod/hesiod-proto.c --- glibc/hesiod/nss_hesiod/hesiod-proto.c 2016-05-30 13:25:35.407697033 +0200 +++ glibc-31052016-0900GMT/hesiod/nss_hesiod/hesiod-proto.c 2016-05-31 10:30:30.381636721 +0200 @@ -20,7 +20,7 @@ #include #include #include -#include +#include "../../include/nss.h" #include #include #include @@ -35,7 +35,7 @@ struct protoent_data {}; #define TRAILING_LIST_MEMBER p_aliases #define TRAILING_LIST_SEPARATOR_P isspace -#include +#include "../../nss/nss_files/files-parse.c" LINE_PARSER ("#", STRING_FIELD (result->p_name, isspace, 1); diff -pru glibc/hesiod/nss_hesiod/hesiod-pwd.c glibc-31052016-0900GMT/hesiod/nss_hesiod/hesiod-pwd.c --- glibc/hesiod/nss_hesiod/hesiod-pwd.c 2016-05-30 13:25:35.407697033 +0200 +++ glibc-31052016-0900GMT/hesiod/nss_hesiod/hesiod-pwd.c 2016-05-31 10:29:58.128274035 +0200 @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include @@ -28,7 +28,7 @@ #define ENTNAME pwent #define STRUCTURE passwd #define EXTERN_PARSER -#include +#include "../../nss/nss_files/files-parse.c" enum nss_status _nss_hesiod_setpwent (int stayopen) diff -pru glibc/hesiod/nss_hesiod/hesiod-service.c glibc-31052016-0900GMT/hesiod/nss_hesiod/hesiod-service.c --- glibc/hesiod/nss_hesiod/hesiod-service.c 2016-05-30 13:25:35.407697033 +0200 +++ glibc-31052016-0900GMT/hesiod/nss_hesiod/hesiod-service.c 2016-05-31 10:31:14.667767864 +0200 @@ -20,7 +20,7 @@ #include #include #include -#include +#include "../../include/nss.h" #include #include #include @@ -34,7 +34,7 @@ struct servent_data {}; #define TRAILING_LIST_MEMBER s_aliases #define TRAILING_LIST_SEPARATOR_P isspace -#include +#include "../../nss/nss_files/files-parse.c" #define ISSC_OR_SPACE(c) ((c) == ';' || isspace (c)) LINE_PARSER ("#", diff -pru glibc/include/nss.h glibc-31052016-0900GMT/include/nss.h --- glibc/include/nss.h 2016-05-30 13:25:35.699697966 +0200 +++ glibc-31052016-0900GMT/include/nss.h 2016-05-31 10:11:23.970762863 +0200 @@ -1,5 +1,5 @@ #ifndef _NSS_H -#include +#include "../nss/nss.h" #define NSS_INVALID_FIELD_CHARACTERS ":\n" extern const char __nss_invalid_field_characters[] attribute_hidden; diff -pru glibc/include/nsswitch.h glibc-31052016-0900GMT/include/nsswitch.h --- glibc/include/nsswitch.h 2016-05-30 13:25:35.699697966 +0200 +++ glibc-31052016-0900GMT/include/nsswitch.h 2016-05-31 10:11:23.968762911 +0200 @@ -1 +1 @@ -#include +#include "../nss/nsswitch.h" diff -pru glibc/include/pwd.h glibc-31052016-0900GMT/include/pwd.h --- glibc/include/pwd.h 2016-05-30 13:25:35.700697969 +0200 +++ glibc-31052016-0900GMT/include/pwd.h 2016-05-31 10:32:21.816464031 +0200 @@ -24,7 +24,7 @@ extern int __fgetpwent_r (FILE * __strea char *__buffer, size_t __buflen, struct passwd **__result); -#include +#include "../include/nss.h" struct parser_data; extern int _nss_files_parse_pwent (char *line, struct passwd *result, diff -pru glibc/inet/ether_ntoh.c glibc-31052016-0900GMT/inet/ether_ntoh.c --- glibc/inet/ether_ntoh.c 2016-05-30 13:25:35.709697998 +0200 +++ glibc-31052016-0900GMT/inet/ether_ntoh.c 2016-05-31 10:28:07.175496023 +0200 @@ -21,7 +21,7 @@ #include #include -#include +#include "../nss/nsswitch.h" /* Type of the lookup function we need here. */ diff -pru glibc/inet/gethstbynm.c glibc-31052016-0900GMT/inet/gethstbynm.c --- glibc/inet/gethstbynm.c 2016-05-30 13:25:35.709697998 +0200 +++ glibc-31052016-0900GMT/inet/gethstbynm.c 2016-05-31 10:27:40.359040040 +0200 @@ -34,4 +34,4 @@ #define HANDLE_DIGITS_DOTS 1 -#include +#include "../nss/getXXbyYY.c" diff -pru glibc/nis/nss_compat/compat-grp.c glibc-31052016-0900GMT/nis/nss_compat/compat-grp.c --- glibc/nis/nss_compat/compat-grp.c 2016-05-30 13:25:36.201699571 +0200 +++ glibc-31052016-0900GMT/nis/nss_compat/compat-grp.c 2016-05-31 10:39:49.413172409 +0200 @@ -20,7 +20,7 @@ #include #include #include -#include +#include "../../include/nss.h" #include #include #include @@ -44,7 +44,7 @@ static enum nss_status (*nss_endgrent) ( #define ENTNAME grent #define STRUCTURE group #define EXTERN_PARSER -#include +#include "../../nss/nss_files/files-parse.c" /* Structure for remembering -group members ... */ #define BLACKLIST_INITIAL_SIZE 512 diff -pru glibc/nis/nss_compat/compat-initgroups.c glibc-31052016-0900GMT/nis/nss_compat/compat-initgroups.c --- glibc/nis/nss_compat/compat-initgroups.c 2016-05-30 13:25:36.202699574 +0200 +++ glibc-31052016-0900GMT/nis/nss_compat/compat-initgroups.c 2016-05-31 10:39:31.480491781 +0200 @@ -20,7 +20,7 @@ #include #include #include -#include +#include "../../include/nss.h" #include #include #include @@ -55,7 +55,7 @@ __libc_lock_define_initialized (static, #define ENTNAME grent #define STRUCTURE group #define EXTERN_PARSER -#include +#include "../../nss/nss_files/files-parse.c" /* Structure for remembering -group members ... */ #define BLACKLIST_INITIAL_SIZE 512 diff -pru glibc/nis/nss_compat/compat-pwd.c glibc-31052016-0900GMT/nis/nss_compat/compat-pwd.c --- glibc/nis/nss_compat/compat-pwd.c 2016-05-30 13:25:36.202699574 +0200 +++ glibc-31052016-0900GMT/nis/nss_compat/compat-pwd.c 2016-05-31 10:40:20.933613540 +0200 @@ -20,7 +20,7 @@ #include #include #include -#include +#include "../../include/nss.h" #include #include #include @@ -48,7 +48,7 @@ static enum nss_status (*nss_endpwent) ( #define ENTNAME pwent #define STRUCTURE passwd #define EXTERN_PARSER -#include +#include "../../nss/nss_files/files-parse.c" /* Structure for remembering -@netgroup and -user members ... */ #define BLACKLIST_INITIAL_SIZE 512 diff -pru glibc/nis/nss_compat/compat-spwd.c glibc-31052016-0900GMT/nis/nss_compat/compat-spwd.c --- glibc/nis/nss_compat/compat-spwd.c 2016-05-30 13:25:36.202699574 +0200 +++ glibc-31052016-0900GMT/nis/nss_compat/compat-spwd.c 2016-05-31 10:40:04.766899786 +0200 @@ -20,7 +20,7 @@ #include #include #include -#include +#include "../../include/nss.h" #include #include #include @@ -45,7 +45,7 @@ static enum nss_status (*nss_endspent) ( #define ENTNAME spent #define STRUCTURE spwd #define EXTERN_PARSER -#include +#include "../../nss/nss_files/files-parse.c" /* Structure for remembering -@netgroup and -user members ... */ #define BLACKLIST_INITIAL_SIZE 512 diff -pru glibc/nis/nss_nis/nis-alias.c glibc-31052016-0900GMT/nis/nss_nis/nis-alias.c --- glibc/nis/nss_nis/nis-alias.c 2016-05-30 13:25:36.202699574 +0200 +++ glibc-31052016-0900GMT/nis/nss_nis/nis-alias.c 2016-05-31 10:17:03.363813921 +0200 @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see . */ -#include +#include "../../include/nss.h" #include #include #include diff -pru glibc/nis/nss_nis/nis-ethers.c glibc-31052016-0900GMT/nis/nss_nis/nis-ethers.c --- glibc/nis/nss_nis/nis-ethers.c 2016-05-30 13:25:36.202699574 +0200 +++ glibc-31052016-0900GMT/nis/nss_nis/nis-ethers.c 2016-05-31 10:38:45.111322402 +0200 @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see . */ -#include +#include "../../include/nss.h" #include #include #include @@ -35,7 +35,7 @@ __libc_lock_define_initialized (static, #define ENTNAME etherent #define STRUCTURE etherent #define EXTERN_PARSER -#include +#include "../../nss/nss_files/files-parse.c" struct response { diff -pru glibc/nis/nss_nis/nis-grp.c glibc-31052016-0900GMT/nis/nss_nis/nis-grp.c --- glibc/nis/nss_nis/nis-grp.c 2016-05-30 13:25:36.203699577 +0200 +++ glibc-31052016-0900GMT/nis/nss_nis/nis-grp.c 2016-05-31 10:37:41.783468130 +0200 @@ -19,7 +19,7 @@ #include #include #include -#include +#include "../../include/nss.h" #include #include #include @@ -32,7 +32,7 @@ #define ENTNAME grent #define STRUCTURE group #define EXTERN_PARSER -#include +#include "../../nss/nss_files/files-parse.c" /* Protect global state against multiple changers */ __libc_lock_define_initialized (static, lock) diff -pru glibc/nis/nss_nis/nis-hosts.c glibc-31052016-0900GMT/nis/nss_nis/nis-hosts.c --- glibc/nis/nss_nis/nis-hosts.c 2016-05-30 13:25:36.203699577 +0200 +++ glibc-31052016-0900GMT/nis/nss_nis/nis-hosts.c 2016-05-31 10:37:59.388148305 +0200 @@ -17,7 +17,7 @@ . */ #include -#include +#include "../../include/nss.h" #include /* The following is an ugly trick to avoid a prototype declaration for _nss_nis_endgrent. */ @@ -53,7 +53,7 @@ struct hostent_data #define TRAILING_LIST_MEMBER h_aliases #define TRAILING_LIST_SEPARATOR_P isspace -#include +#include "../../nss/nss_files/files-parse.c" LINE_PARSER ("#", { diff -pru glibc/nis/nss_nis/nis-initgroups.c glibc-31052016-0900GMT/nis/nss_nis/nis-initgroups.c --- glibc/nis/nss_nis/nis-initgroups.c 2016-05-30 13:25:36.203699577 +0200 +++ glibc-31052016-0900GMT/nis/nss_nis/nis-initgroups.c 2016-05-31 10:38:15.639853964 +0200 @@ -20,7 +20,7 @@ #include #include #include -#include +#include "../../include/nss.h" #include #include #include @@ -35,7 +35,7 @@ #define ENTNAME grent #define STRUCTURE group #define EXTERN_PARSER -#include +#include "../../nss/nss_files/files-parse.c" static enum nss_status diff -pru glibc/nis/nss_nis/nis-netgrp.c glibc-31052016-0900GMT/nis/nss_nis/nis-netgrp.c --- glibc/nis/nss_nis/nis-netgrp.c 2016-05-30 13:25:36.203699577 +0200 +++ glibc-31052016-0900GMT/nis/nss_nis/nis-netgrp.c 2016-05-31 10:18:55.226271404 +0200 @@ -21,7 +21,7 @@ #include #include #include -#include +#include "../../include/nss.h" #include #include #include diff -pru glibc/nis/nss_nis/nis-network.c glibc-31052016-0900GMT/nis/nss_nis/nis-network.c --- glibc/nis/nss_nis/nis-network.c 2016-05-30 13:25:36.203699577 +0200 +++ glibc-31052016-0900GMT/nis/nss_nis/nis-network.c 2016-05-31 10:36:14.322072328 +0200 @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see . */ -#include +#include "../../include/nss.h" /* The following is an ugly trick to avoid a prototype declaration for _nss_nis_endgrent. */ #define _nss_nis_endnetent _nss_nis_endnetent_XXX @@ -37,7 +37,7 @@ /* Get the declaration of the parser function. */ #define ENTNAME netent #define EXTERN_PARSER -#include +#include "../../nss/nss_files/files-parse.c" __libc_lock_define_initialized (static, lock) diff -pru glibc/nis/nss_nis/nis-proto.c glibc-31052016-0900GMT/nis/nss_nis/nis-proto.c --- glibc/nis/nss_nis/nis-proto.c 2016-05-30 13:25:36.203699577 +0200 +++ glibc-31052016-0900GMT/nis/nss_nis/nis-proto.c 2016-05-31 10:37:22.814813883 +0200 @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see . */ -#include +#include "../../include/nss.h" #include #include #include @@ -30,7 +30,7 @@ /* Get the declaration of the parser function. */ #define ENTNAME protoent #define EXTERN_PARSER -#include +#include "../../nss/nss_files/files-parse.c" __libc_lock_define_initialized (static, lock) diff -pru glibc/nis/nss_nis/nis-publickey.c glibc-31052016-0900GMT/nis/nss_nis/nis-publickey.c --- glibc/nis/nss_nis/nis-publickey.c 2016-05-30 13:25:36.203699577 +0200 +++ glibc-31052016-0900GMT/nis/nss_nis/nis-publickey.c 2016-05-31 10:16:41.730312040 +0200 @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see . */ -#include +#include "../../include/nss.h" #include #include #include diff -pru glibc/nis/nss_nis/nis-pwd.c glibc-31052016-0900GMT/nis/nss_nis/nis-pwd.c --- glibc/nis/nss_nis/nis-pwd.c 2016-05-30 13:25:36.203699577 +0200 +++ glibc-31052016-0900GMT/nis/nss_nis/nis-pwd.c 2016-05-31 10:39:03.402993907 +0200 @@ -19,7 +19,7 @@ #include #include #include -#include +#include "../../include/nss.h" #include #include #include @@ -33,7 +33,7 @@ #define ENTNAME pwent #define STRUCTURE passwd #define EXTERN_PARSER -#include +#include "../../nss/nss_files/files-parse.c" /* Protect global state against multiple changers */ __libc_lock_define_initialized (static, lock) diff -pru glibc/nis/nss_nis/nis-rpc.c glibc-31052016-0900GMT/nis/nss_nis/nis-rpc.c --- glibc/nis/nss_nis/nis-rpc.c 2016-05-30 13:25:36.204699580 +0200 +++ glibc-31052016-0900GMT/nis/nss_nis/nis-rpc.c 2016-05-31 10:38:30.397587431 +0200 @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see . */ -#include +#include "../../include/nss.h" #include #include #include @@ -30,7 +30,7 @@ /* Get the declaration of the parser function. */ #define ENTNAME rpcent #define EXTERN_PARSER -#include +#include "../../nss/nss_files/files-parse.c" __libc_lock_define_initialized (static, lock) diff -pru glibc/nis/nss_nis/nis-service.c glibc-31052016-0900GMT/nis/nss_nis/nis-service.c --- glibc/nis/nss_nis/nis-service.c 2016-05-30 13:25:36.204699580 +0200 +++ glibc-31052016-0900GMT/nis/nss_nis/nis-service.c 2016-05-31 10:36:35.581680033 +0200 @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see . */ -#include +#include "../../include/nss.h" #include #include #include @@ -32,7 +32,7 @@ /* Get the declaration of the parser function. */ #define ENTNAME servent #define EXTERN_PARSER -#include +#include "../../nss/nss_files/files-parse.c" __libc_lock_define_initialized (static, lock) diff -pru glibc/nis/nss_nis/nis-spwd.c glibc-31052016-0900GMT/nis/nss_nis/nis-spwd.c --- glibc/nis/nss_nis/nis-spwd.c 2016-05-30 13:25:36.204699580 +0200 +++ glibc-31052016-0900GMT/nis/nss_nis/nis-spwd.c 2016-05-31 10:36:58.006267886 +0200 @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see . */ -#include +#include "../../include/nss.h" #include #include #include @@ -36,7 +36,7 @@ #define ENTNAME spent #define STRUCTURE spwd #define EXTERN_PARSER -#include +#include "../../nss/nss_files/files-parse.c" /* Protect global state against multiple changers */ __libc_lock_define_initialized (static, lock) diff -pru glibc/nis/nss_nisplus/nisplus-alias.c glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-alias.c --- glibc/nis/nss_nisplus/nisplus-alias.c 2016-05-30 13:25:36.204699580 +0200 +++ glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-alias.c 2016-05-31 10:13:53.792197469 +0200 @@ -17,7 +17,7 @@ . */ #include -#include +#include "../../include/nss.h" #include #include #include diff -pru glibc/nis/nss_nisplus/nisplus-ethers.c glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-ethers.c --- glibc/nis/nss_nisplus/nisplus-ethers.c 2016-05-30 13:25:36.204699580 +0200 +++ glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-ethers.c 2016-05-31 10:14:50.326879224 +0200 @@ -21,7 +21,7 @@ #include #include #include -#include +#include "../../include/nss.h" #include #include #include diff -pru glibc/nis/nss_nisplus/nisplus-grp.c glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-grp.c --- glibc/nis/nss_nisplus/nisplus-grp.c 2016-05-30 13:25:36.204699580 +0200 +++ glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-grp.c 2016-05-31 10:14:21.787542856 +0200 @@ -17,7 +17,7 @@ . */ #include -#include +#include "../../include/nss.h" #include #include #include diff -pru glibc/nis/nss_nisplus/nisplus-hosts.c glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-hosts.c --- glibc/nis/nss_nisplus/nisplus-hosts.c 2016-05-30 13:25:36.204699580 +0200 +++ glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-hosts.c 2016-05-31 10:13:17.985040022 +0200 @@ -21,7 +21,7 @@ #include #include #include -#include +#include "../../include/nss.h" #include #include #include diff -pru glibc/nis/nss_nisplus/nisplus-initgroups.c glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-initgroups.c --- glibc/nis/nss_nisplus/nisplus-initgroups.c 2016-05-30 13:25:36.205699583 +0200 +++ glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-initgroups.c 2016-05-31 10:12:56.913538631 +0200 @@ -16,7 +16,7 @@ . */ #include -#include +#include "../../include/nss.h" #include #include #include diff -pru glibc/nis/nss_nisplus/nisplus-netgrp.c glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-netgrp.c --- glibc/nis/nss_nisplus/nisplus-netgrp.c 2016-05-30 13:25:36.205699583 +0200 +++ glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-netgrp.c 2016-05-31 10:12:31.562141270 +0200 @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see . */ -#include +#include "../../include/nss.h" #include #include #include diff -pru glibc/nis/nss_nisplus/nisplus-network.c glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-network.c --- glibc/nis/nss_nisplus/nisplus-network.c 2016-05-30 13:25:36.205699583 +0200 +++ glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-network.c 2016-05-31 10:15:40.374724391 +0200 @@ -20,7 +20,7 @@ #include #include #include -#include +#include "../../include/nss.h" #include #include #include diff -pru glibc/nis/nss_nisplus/nisplus-proto.c glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-proto.c --- glibc/nis/nss_nisplus/nisplus-proto.c 2016-05-30 13:25:36.205699583 +0200 +++ glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-proto.c 2016-05-31 10:14:40.350110793 +0200 @@ -20,7 +20,7 @@ #include #include #include -#include +#include "../../include/nss.h" #include #include #include diff -pru glibc/nis/nss_nisplus/nisplus-publickey.c glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-publickey.c --- glibc/nis/nss_nisplus/nisplus-publickey.c 2016-05-30 13:25:36.205699583 +0200 +++ glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-publickey.c 2016-05-31 10:15:05.246533772 +0200 @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see . */ -#include +#include "../../include/nss.h" #include #include #include diff -pru glibc/nis/nss_nisplus/nisplus-pwd.c glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-pwd.c --- glibc/nis/nss_nisplus/nisplus-pwd.c 2016-05-30 13:25:36.205699583 +0200 +++ glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-pwd.c 2016-05-31 10:15:30.641948083 +0200 @@ -17,7 +17,7 @@ . */ #include -#include +#include "../../include/nss.h" #include #include #include diff -pru glibc/nis/nss_nisplus/nisplus-rpc.c glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-rpc.c --- glibc/nis/nss_nisplus/nisplus-rpc.c 2016-05-30 13:25:36.205699583 +0200 +++ glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-rpc.c 2016-05-31 10:13:36.594601392 +0200 @@ -19,7 +19,7 @@ #include #include #include -#include +#include "../../include/nss.h" #include #include #include diff -pru glibc/nis/nss_nisplus/nisplus-service.c glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-service.c --- glibc/nis/nss_nisplus/nisplus-service.c 2016-05-30 13:25:36.205699583 +0200 +++ glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-service.c 2016-05-31 10:15:14.884311154 +0200 @@ -20,7 +20,7 @@ #include #include #include -#include +#include "../../include/nss.h" #include #include #include diff -pru glibc/nis/nss_nisplus/nisplus-spwd.c glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-spwd.c --- glibc/nis/nss_nisplus/nisplus-spwd.c 2016-05-30 13:25:36.205699583 +0200 +++ glibc-31052016-0900GMT/nis/nss_nisplus/nisplus-spwd.c 2016-05-31 10:15:50.194499130 +0200 @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see . */ -#include +#include "../../include/nss.h" #include #include #include diff -pru glibc/nscd/aicache.c glibc-31052016-0900GMT/nscd/aicache.c --- glibc/nscd/aicache.c 2016-05-30 13:25:36.259699756 +0200 +++ glibc-31052016-0900GMT/nscd/aicache.c 2016-05-31 10:35:01.125434720 +0200 @@ -20,7 +20,7 @@ #include #include #include -#include +#include "../include/nss.h" #include #include #include diff -pru glibc/nscd/getgrgid_r.c glibc-31052016-0900GMT/nscd/getgrgid_r.c --- glibc/nscd/getgrgid_r.c 2016-05-30 13:25:36.260699759 +0200 +++ glibc-31052016-0900GMT/nscd/getgrgid_r.c 2016-05-31 10:34:26.094093248 +0200 @@ -32,4 +32,4 @@ /* We are nscd, so we don't want to be talking to ourselves. */ #undef USE_NSCD -#include +#include "../nss/getXXbyYY_r.c" diff -pru glibc/nscd/getgrnam_r.c glibc-31052016-0900GMT/nscd/getgrnam_r.c --- glibc/nscd/getgrnam_r.c 2016-05-30 13:25:36.260699759 +0200 +++ glibc-31052016-0900GMT/nscd/getgrnam_r.c 2016-05-31 10:35:19.928083005 +0200 @@ -31,4 +31,4 @@ /* We are nscd, so we don't want to be talking to ourselves. */ #undef USE_NSCD -#include +#include "../nss/getXXbyYY_r.c" diff -pru glibc/nscd/getpwnam_r.c glibc-31052016-0900GMT/nscd/getpwnam_r.c --- glibc/nscd/getpwnam_r.c 2016-05-30 13:25:36.261699762 +0200 +++ glibc-31052016-0900GMT/nscd/getpwnam_r.c 2016-05-31 10:35:39.940709986 +0200 @@ -28,4 +28,4 @@ /* We are nscd, so we don't want to be talking to ourselves. */ #undef USE_NSCD -#include +#include "../nss/getXXbyYY_r.c" diff -pru glibc/nscd/getpwuid_r.c glibc-31052016-0900GMT/nscd/getpwuid_r.c --- glibc/nscd/getpwuid_r.c 2016-05-30 13:25:36.261699762 +0200 +++ glibc-31052016-0900GMT/nscd/getpwuid_r.c 2016-05-31 10:34:42.853777666 +0200 @@ -28,4 +28,4 @@ /* We are nscd, so we don't want to be talking to ourselves. */ #undef USE_NSCD -#include +#include "../nss/getXXbyYY_r.c" diff -pru glibc/nss/nss_db/db-initgroups.c glibc-31052016-0900GMT/nss/nss_db/db-initgroups.c --- glibc/nss/nss_db/db-initgroups.c 2016-05-30 13:25:36.268699785 +0200 +++ glibc-31052016-0900GMT/nss/nss_db/db-initgroups.c 2016-05-31 10:11:23.968762911 +0200 @@ -26,6 +26,7 @@ #include #include #include +#include "../../include/nss.h" #include "nss_db.h" diff -pru glibc/nss/nss_db/db-open.c glibc-31052016-0900GMT/nss/nss_db/db-open.c --- glibc/nss/nss_db/db-open.c 2016-05-30 13:25:36.268699785 +0200 +++ glibc-31052016-0900GMT/nss/nss_db/db-open.c 2016-05-31 10:11:23.969762887 +0200 @@ -24,6 +24,7 @@ #include #include #include +#include "../../include/nss.h" #include "nss_db.h" diff -pru glibc/nss/nss_db/nss_db.h glibc-31052016-0900GMT/nss/nss_db/nss_db.h --- glibc/nss/nss_db/nss_db.h 2016-05-30 13:25:36.268699785 +0200 +++ glibc-31052016-0900GMT/nss/nss_db/nss_db.h 2016-05-31 10:22:39.744331240 +0200 @@ -19,7 +19,7 @@ #ifndef _NSS_DB_H #define _NSS_DB_H 1 -#include +#include "../../include/nss.h" #include #include diff -pru glibc/nss/nss_files/files-initgroups.c glibc-31052016-0900GMT/nss/nss_files/files-initgroups.c --- glibc/nss/nss_files/files-initgroups.c 2016-05-30 13:25:36.269699788 +0200 +++ glibc-31052016-0900GMT/nss/nss_files/files-initgroups.c 2016-05-31 10:11:23.969762887 +0200 @@ -19,7 +19,7 @@ #include #include #include -#include +#include "../../include/nss.h" #include #include #include diff -pru glibc/nss/nss_test1.c glibc-31052016-0900GMT/nss/nss_test1.c --- glibc/nss/nss_test1.c 2016-05-30 13:25:36.270699791 +0200 +++ glibc-31052016-0900GMT/nss/nss_test1.c 2016-05-31 10:50:38.085223049 +0200 @@ -1,5 +1,5 @@ #include -#include +#include "../include/nss.h" #include #include diff -pru glibc/nss/nsswitch.h glibc-31052016-0900GMT/nss/nsswitch.h --- glibc/nss/nsswitch.h 2016-05-30 13:25:36.270699791 +0200 +++ glibc-31052016-0900GMT/nss/nsswitch.h 2016-05-31 10:11:23.969762887 +0200 @@ -22,7 +22,7 @@ #include #include -#include +#include "../include/nss.h" #include #include #include diff -pru glibc/nss/rewrite_field.c glibc-31052016-0900GMT/nss/rewrite_field.c --- glibc/nss/rewrite_field.c 2016-05-30 13:25:36.270699791 +0200 +++ glibc-31052016-0900GMT/nss/rewrite_field.c 2016-05-31 10:11:23.969762887 +0200 @@ -15,7 +15,7 @@ License along with the GNU C Library; if not, see . */ -#include +#include "../include/nss.h" #include /* Rewrite VALUE to a valid field value in the NSS database. Invalid diff -pru glibc/nss/tst-field.c glibc-31052016-0900GMT/nss/tst-field.c --- glibc/nss/tst-field.c 2016-05-30 13:25:36.271699794 +0200 +++ glibc-31052016-0900GMT/nss/tst-field.c 2016-05-31 11:19:33.707722652 +0200 @@ -19,7 +19,7 @@ /* This test needs to be statically linked because it access hidden functions. */ -#include +#include "../include/nss.h" #include #include #include diff -pru glibc/nss/tst-nss-test1.c glibc-31052016-0900GMT/nss/tst-nss-test1.c --- glibc/nss/tst-nss-test1.c 2016-05-30 13:25:36.271699794 +0200 +++ glibc-31052016-0900GMT/nss/tst-nss-test1.c 2016-05-31 10:50:38.086223026 +0200 @@ -1,4 +1,4 @@ -#include +#include "../include/nss.h" #include #include #include diff -pru glibc/nss/valid_field.c glibc-31052016-0900GMT/nss/valid_field.c --- glibc/nss/valid_field.c 2016-05-30 13:25:36.271699794 +0200 +++ glibc-31052016-0900GMT/nss/valid_field.c 2016-05-31 10:11:23.969762887 +0200 @@ -15,7 +15,7 @@ License along with the GNU C Library; if not, see . */ -#include +#include "../include/nss.h" #include const char __nss_invalid_field_characters[] = NSS_INVALID_FIELD_CHARACTERS; diff -pru glibc/nss/valid_list_field.c glibc-31052016-0900GMT/nss/valid_list_field.c --- glibc/nss/valid_list_field.c 2016-05-30 13:25:36.271699794 +0200 +++ glibc-31052016-0900GMT/nss/valid_list_field.c 2016-05-31 10:11:23.970762863 +0200 @@ -15,7 +15,7 @@ License along with the GNU C Library; if not, see . */ -#include +#include "../include/nss.h" #include #include diff -pru glibc/pwd/fgetpwent_r.c glibc-31052016-0900GMT/pwd/fgetpwent_r.c --- glibc/pwd/fgetpwent_r.c 2016-05-30 13:25:36.341700018 +0200 +++ glibc-31052016-0900GMT/pwd/fgetpwent_r.c 2016-05-31 10:32:51.189898768 +0200 @@ -30,7 +30,7 @@ #define ENTNAME pwent struct pwent_data {}; -#include +#include "../nss/nss_files/files-parse.c" LINE_PARSER (, STRING_FIELD (result->pw_name, ISCOLON, 0); diff -pru glibc/pwd/getpwnam_r.c glibc-31052016-0900GMT/pwd/getpwnam_r.c --- glibc/pwd/getpwnam_r.c 2016-05-30 13:25:36.341700018 +0200 +++ glibc-31052016-0900GMT/pwd/getpwnam_r.c 2016-05-31 10:34:09.339409709 +0200 @@ -26,4 +26,4 @@ #define ADD_VARIABLES name #define BUFLEN NSS_BUFLEN_PASSWD -#include +#include "../nss/getXXbyYY_r.c" diff -pru glibc/pwd/getpwuid_r.c glibc-31052016-0900GMT/pwd/getpwuid_r.c --- glibc/pwd/getpwuid_r.c 2016-05-30 13:25:36.341700018 +0200 +++ glibc-31052016-0900GMT/pwd/getpwuid_r.c 2016-05-31 10:33:27.492204394 +0200 @@ -26,4 +26,4 @@ #define ADD_VARIABLES uid #define BUFLEN NSS_BUFLEN_PASSWD -#include +#include "../nss/getXXbyYY_r.c" diff -pru glibc/pwd/putpwent.c glibc-31052016-0900GMT/pwd/putpwent.c --- glibc/pwd/putpwent.c 2016-05-30 13:25:36.341700018 +0200 +++ glibc-31052016-0900GMT/pwd/putpwent.c 2016-05-31 11:33:28.008442188 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include "../include/nss.h" #define _S(x) x ?: "" diff -pru glibc/shadow/fgetspent_r.c glibc-31052016-0900GMT/shadow/fgetspent_r.c --- glibc/shadow/fgetspent_r.c 2016-05-30 13:25:36.363700088 +0200 +++ glibc-31052016-0900GMT/shadow/fgetspent_r.c 2016-05-31 10:29:23.784956880 +0200 @@ -31,7 +31,7 @@ #define EXTERN_PARSER 1 struct spent_data {}; -#include +#include "../nss/nss_files/files-parse.c" /* Read one shadow entry from the given stream. */ diff -pru glibc/shadow/putspent.c glibc-31052016-0900GMT/shadow/putspent.c --- glibc/shadow/putspent.c 2016-05-30 13:25:36.364700091 +0200 +++ glibc-31052016-0900GMT/shadow/putspent.c 2016-05-31 11:33:11.095740174 +0200 @@ -16,7 +16,7 @@ . */ #include -#include +#include "../include/nss.h" #include #include diff -pru glibc/shadow/sgetspent_r.c glibc-31052016-0900GMT/shadow/sgetspent_r.c --- glibc/shadow/sgetspent_r.c 2016-05-30 13:25:36.364700091 +0200 +++ glibc-31052016-0900GMT/shadow/sgetspent_r.c 2016-05-31 10:29:07.602280163 +0200 @@ -32,7 +32,7 @@ struct spent_data {}; #define FALSEP(arg) 0 -#include +#include "../nss/nss_files/files-parse.c" LINE_PARSER (, STRING_FIELD (result->sp_namp, ISCOLON, 0); diff -pru glibc/sysdeps/posix/getaddrinfo.c glibc-31052016-0900GMT/sysdeps/posix/getaddrinfo.c --- glibc/sysdeps/posix/getaddrinfo.c 2016-05-30 13:25:36.799701482 +0200 +++ glibc-31052016-0900GMT/sysdeps/posix/getaddrinfo.c 2016-05-31 10:27:06.968721269 +0200 @@ -58,7 +58,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI #include #include #include -#include +#include "../../include/nss.h" #include #include #include