From patchwork Thu Aug 31 15:24:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Ellcey X-Patchwork-Id: 22448 Received: (qmail 55643 invoked by alias); 31 Aug 2017 15:25:08 -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 55573 invoked by uid 89); 31 Aug 2017 15:25:07 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: NAM02-CY1-obe.outbound.protection.outlook.com Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Steve.Ellcey@cavium.com; Message-ID: <1504193091.3182.8.camel@cavium.com> Subject: Re: [PATCH] Remove compat from DEFAULT_CONFIG lookup strings From: Steve Ellcey Reply-To: sellcey@cavium.com To: Andreas Schwab Cc: Joseph Myers , DJ Delorie , libc-alpha@sourceware.org Date: Thu, 31 Aug 2017 08:24:51 -0700 In-Reply-To: References: <1503951778.28672.139.camel@cavium.com> <1503957036.28672.144.camel@cavium.com> <1504033460.5204.8.camel@cavium.com> Mime-Version: 1.0 X-ClientProxiedBy: MWHPR03CA0020.namprd03.prod.outlook.com (10.175.133.158) To DM5PR07MB3548.namprd07.prod.outlook.com (10.164.153.146) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7a57b45d-24c1-40b2-e093-08d4f0846eb6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603199)(49563074)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:DM5PR07MB3548; X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3548; 3:2YbiSQe1RygPOfqlXb5uWnHbmaSFm90ut0gtdWI1Q4YAmlYpkG0vojyi7guLvWrwHJVg/xoFskQMtvKNUP/npcF/bKUhVTT/J14M3MzOJJLyw2TDvVWd8I2ASk/YeL6v8qqtt88E2puj3lJ0OZgDk5pOA008MMbgo1wP6r+3P/cglNjbuOR5QPzywHR9v/M52BwP5f60/fqxeTfYbBZ9WQRJYgsSzJ/QgMLC6OGVCCM85q+Y1uyz0/aGlyVtBz8F; 25:KZ7poYd/1zQQJWd62qtPw2Z6Z7cI0wDWJ+9yp7TyutJIBFV442YTTE6NQxxnum68ZptrvKCNucsKTdkdpKHDMOGIVCZ0E6XeAjvWeUOlj6fAdnBkX744HrKogYHxawQMgD358avjR8fJtDKtMxnAxMnwMJwSn3A2NCPGuKsW4UcaP0iHx9dmdTwY405l2lBp5td6Z06i/8AaxOJr58fNAaRax/QDIpZKCDJDyuXPzWqzBXGKja1wP+VY4ObdyI0L4JWNXIxGMz8Ird9kA+rl5bbNB77fUu+RqGxE6LP/M5L0AoasokrZexeIskrGF/nKVCHaI0GJvHIaaoCr1koyew==; 31:19hOGUh1irzZA51/hx2+h5IggwFh+Bf35O+Jrj43RVzHQYRWY6pm0eUdYCKKjxvFal8+O3tI+KFT59wFi5karr3kQt1vfGdVSsGNfTUzgUlbViL3+VxPg5f07wOeAaXNTgIJwQm9WokTO74FPPKu5qCrsLiDs0hzTIHW7YXO7iQG0H6u+Hdvv70DFR8WVGQ6mbxw3QRL0iKEsNSiizrcy6xgsTVE5iZic0jYXbNi3Zw= X-MS-TrafficTypeDiagnostic: DM5PR07MB3548: X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3548; 20:/T09fYE+i1M2aF/4aId9PsNJo9g8T355h9eGbQqXPiRCZ/aczXu0vXTt+AiK5TbJ5C3pyZk7wGk473bhHoSDvPJfNjtYL0XJXa43DuHVIFS5y0DsxnSViYDBxjS23oKkM1R9rUciO0bhD+sqSgFTZshyf32SW2lJuVpoiMpTTW3aIXnI+G03U7yn5frqgIvnOUELy8+aJResRCLw+OmArcw4jQrKqx5cVDDIEVHhA8fCLIExIkO6yDuyFuZBnz+tz9700OBy0nqT4p5moyKR0DX32XlrnmSauJkqe0nw/zZOxcVKo2J5+q42EoZMakodKt7t+As7y2dcAdIz51xbIgpbPMyEdVf13vokF2ZFtWor074u8t3tSH4I6Dpr4RUufaXAB0/YSv6yAjS/zM1RwffdRtQGF8Ndct3vJijbjlAV0KtsdB1BGOdlmS8MaHNnuSCYST+ksEKUWSwfW2IZ5rwrn/5q1JWzCuqoRwTpvY/xJHITxZI3Dq54FemmhLx0; 4:2uw5fGg2Xj0f1AuRnAUu1jqBCz1INld0+ev6rmdHBHS4kaPtpyIQ/GkLxNJKPy1anYEdlRRdDWFMDOf56jUYBJxDhgfL3Ahx7Swu2s+iQlcBpeMXITAvpzgVVq1E6hnAN+HX/D+kO/ucXjtj6+VQZbQvfC1Kxtj4JdBq1W5hqk4Fd7iDwbL+oFdXKuHjs6C8nQafsk0cwWw1k8D1yJ4wsYJ8/sbug6n73ZwQBkc/C0ZxJBqkOPJR69303vDNvpJr X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(102415395)(6040450)(601004)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(10201501046)(3002001)(93006095)(93001095)(6041248)(20161123564025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123562025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR07MB3548; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR07MB3548; X-Forefront-PRVS: 04163EF38A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(199003)(189002)(377424004)(24454002)(93886005)(43066003)(50226002)(50986999)(8936002)(76176999)(6916009)(6486002)(4610100001)(54906002)(6512007)(6506006)(2950100002)(101416001)(478600001)(33646002)(72206003)(81156014)(5890100001)(7736002)(81166006)(8676002)(53416004)(103116003)(305945005)(568964002)(2476003)(229853002)(97736004)(6116002)(3846002)(6666003)(84326002)(5000100001)(5660300001)(4326008)(189998001)(110136004)(6246003)(25786009)(106356001)(66066001)(36756003)(512874002)(3450700001)(2906002)(68736007)(69596002)(105586002)(53936002)(42186005)(99106002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR07MB3548; H:sellcey-dt.caveonetworks.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR07MB3548; 23:D/fdb5sg+JH8KaxeEBnSY0seLiVi48WMZjImNm0g8?= =?us-ascii?Q?kie3NRtvVE5Q+3tt0Ha2es9y0+43Nlk8QohzIpYXVRZsDwDmGaCMxxWZTPQr?= =?us-ascii?Q?4AwLmCAdwbTORsKfU5mQboR9P4gRzwcAqDw1+vfN2sJmrl1DTvJ+GCqRA+ex?= =?us-ascii?Q?+XEu35QwwLLZWi6yiSdhX52zUz6K6Sq5EQYO1I0mTQn3RQVP0V4KKr+h23Fa?= =?us-ascii?Q?1CJ8k3UDQwQfLmDAPITFfrHNSyZPOSgLDrBguvdbprguhG/fbFpYmQpIF3EW?= =?us-ascii?Q?kpxVJZX0QouCQbXMcS98CcTV5QUR6fpHrr17MGYgb0kwXg0UtV67lQrTSFM5?= =?us-ascii?Q?1K98ifwI9+xjO3ve4fOKc4+Pr20iGZ3vXYS/HDe8H+64Nvi0rXTWa/shhqie?= =?us-ascii?Q?5NfmHMqPMjz7MfGsKzuaKEVu1n5xX+6fenjmbwaX9FF/eXpMonKzEOl2qqXH?= =?us-ascii?Q?KX5Zr+qQ97zcQDUNbr8+ZrwnAOvYx3YHzkGvXbeNkzQk9FZmj0Idla8v9g4V?= =?us-ascii?Q?m53lDB/YENCrHIw6Banqqd0d+khSePBH2/x/lYLdUv9vVvEj2+tfFInGzH+9?= =?us-ascii?Q?bF/rhubojSHayiBKrsnP/60QIXH00DyDJTVWWLCRXKB7QmqUpNNvOxOqqYoU?= =?us-ascii?Q?zAC3+Pr5LT4aYSwfmYgMGwku1RbFxp2LZWyZOkeWJMrcKOsCRwH6p6q2/C3g?= =?us-ascii?Q?wp/EYuBxba0qtReKIud0UAVf/NkKY5BK7M3QvQ9yxUnpdsaLC4x6QxwWEXG0?= =?us-ascii?Q?1SehqCXuj9btVUVuPajLYMVhcgbP/UEtKu/Tu4iDUfpeVLKUD1CFqmQ1sWs9?= =?us-ascii?Q?UQ1bIGV02d09QeJLJOfVAfn32Pgr++t5URkjFXNEQE8poRxCLjDBvftDs8Tp?= =?us-ascii?Q?9uIxQKYvn0RNpMFseqroA2dN4JonMeL01UeFzbCd+ftKFC2IAwJ1zy6g2Hz6?= =?us-ascii?Q?ua+3HKZ4EqDbABeUqR+/BhSAQ9phoJ8xj7G2RFv1GxGuEpMPjPq9sLeP8cX8?= =?us-ascii?Q?8w2Kqy+AzOz71LDvEi6cftn5jo10i6FdFZ+64GXCyzX1EuLdgffsxHIPDrXg?= =?us-ascii?Q?Hk/uaXdvqptSr6k8hTKhc5rMgxOkzjaqiCwTejLy5BqE9QyUSw7SOTNxCkGO?= =?us-ascii?Q?vioKmW18To1hQ/BFBWE6tkRzQAqChRpbKuzjTk+o5vpPe/00Pq1UCjcz+6+G?= =?us-ascii?Q?l73F+EM3xHgmJfgzwOhgYJbYtp8Jj3FeCgG0SDRdRfXENVmMgxBR0NdgtwM+?= =?us-ascii?Q?ZnXgTUFhoCJVSzqxTdPH2PhFKrr7FdfO8I3CNeQWy11E6f0dnIxA3RB1aCHk?= =?us-ascii?Q?fzZXPCzlqmu4+vfloVX4faZmrJ4CTOnsJbW2mWcuRkE/BG1MZDl5fhQECHGy?= =?us-ascii?Q?a6YeQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3548; 6:Cd60v7cyUfPhcw06epOaJQpjaanw0rVDdFUeHYdMMM59XuRwe0T1pUCWcOWnOB694dXRgkb5hi8HL5pk72kDPKByTrkI2YthpvsCbwKxkEZSAY8ntU7dxOM4oOs0AfJ96sm/SnFYIIDfwTQtuFHss6eK9ZLYPkD6MTTuAiGiMCTIPrLHePphcOot8mjJUZQeD++wVbbhqx/R0WaOESnhdUIzh551H57835B/HSvhFZL72bRORzzAovERIdz5shFKM0+5mrX8/s9hVtOG+jdAtaNyWVm+qENgrM6CYRkg2zWzpE7X5IZzvqjcO/YPa/cG25dxu8YARvEFE9f6oJuffA==; 5:ycbvbHVhiNNiZWKv7qtXZqM0fFt50XXNcyAjIyzmcHSuG7ohdqiz/kFsRZNGukJzSGH3/ItxOnyoU/PdGEWWSphBYdc351nnD91hO8KskbE4ksS/xb9xiLcALeyFUPy2ZWvn+AiOS/YZrl8qZQtoWQ==; 24:z5E795o5ZaucEomchsPxgjQBx6n261d071fd7nXimD+gJ7oLx6QP6yL55iKgFV/KSPDOQmsUuT4HcRELDCFRiaEVerIIS4C1v5ibhkOBifc=; 7:M0PZfYTZWXUsVgx+Qq1f8ZNEPRRjnTWf6cz4YpvDfM8NRs4mkVnJH/tbQ2ANxdoLjCF6+zMf83mpB8LkHmF1m/B06rNFBbvlWM/5PmYhSUgyd4F3B1robW3NDweEauvO96Pv7A9zIG5rFI9LuM50GbZSFCw36Lw7iaTT3k9eVuFaqscl16wUCGVfbqsgT+CUl+0IpQSOBh2/4k0+wLh0UAF3GAGCNzoBJ1ZEkwyb2jo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2017 15:24:54.5691 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR07MB3548 On Thu, 2017-08-31 at 09:20 +0200, Andreas Schwab wrote: >  > > +#ifdef LINK_OBSOLETE_RPC > > +# define DEFAULT_DEFCONFIG "nis [NOTFOUND=return] files" > > +#else > > +# define DEFAULT_DEFCONFIG "files" > > +#endif > nss_nis is part of obsolete-nsl, not obsolete-rpc. > > Andreas. Yes it is.  Here is an updated patch with that change. Steve Ellcey sellcey@cavium.com 2017-08-31  Steve Ellcey   * grp/initgroups.c: Include config.h. (DEFAULT_CONFIG): New macro. (internal_getgrouplist): Use DEFAULT_CONFIG. * nscd/initgrcache.c (addinitgroupsX): Likewise. * nss/nsswitch.c (__nss_disable_nscd): Likewise. (DEFAULT_DEFCONFIG): New macro. (__nss_database_lookup): Use DEFAULT_DEFCONFIG. * nss/grp-lookup.c: Include config.h (DEFAULT_CONFIG): Set definition based on LINK_OBSOLETE_NSL. * nss/pwd-lookup.c (DEFAULT_CONFIG): Likewise. * nss/spwd-lookup.c (DEFAULT_CONFIG): Likewise. * manual/nss.texi: Update default values section. diff --git a/grp/initgroups.c b/grp/initgroups.c index 3e4a3de..45dd391 100644 --- a/grp/initgroups.c +++ b/grp/initgroups.c @@ -26,10 +26,16 @@ #include #include #include +#include #include "../nscd/nscd-client.h" #include "../nscd/nscd_proto.h" +#ifdef LINK_OBSOLETE_NSL +# define DEFAULT_CONFIG "compat [NOTFOUND=return] files" +#else +# define DEFAULT_CONFIG "files" +#endif /* Type of the lookup function. */ typedef enum nss_status (*initgroups_dyn_function) (const char *, gid_t, @@ -77,7 +83,7 @@ internal_getgrouplist (const char *user, gid_t group, long int *size, &__nss_initgroups_database) < 0) { if (__nss_group_database == NULL) - no_more = __nss_database_lookup ("group", NULL, "compat files", + no_more = __nss_database_lookup ("group", NULL, DEFAULT_CONFIG, &__nss_group_database); __nss_initgroups_database = __nss_group_database; diff --git a/manual/nss.texi b/manual/nss.texi index ee70ad3..d534c26 100644 --- a/manual/nss.texi +++ b/manual/nss.texi @@ -318,13 +318,17 @@ The @code{passwd}, @code{group}, and @code{shadow} databases are traditionally handled in a special way. The appropriate files in the @file{/etc} directory are read but if an entry with a name starting with a @code{+} character is found NIS is used. This kind of lookup -remains possible by using the special lookup service @code{compat} -and the default value for the three databases above is -@code{compat [NOTFOUND=return] files}. - -For all other databases the default value is -@code{nis [NOTFOUND=return] files}. This solution gives the best -chance to be correct since NIS and file based lookups are used. +remains possible if @theglibc{} was configured with the +@code{--enable-obsolete-nsl} option and the special lookup service +@code{compat} is used. If @theglibc{} was configured with the +@code{--enable-obsolete-nsl} option the default value for the three +databases above is @code{compat [NOTFOUND=return] files}. If the +@code{--enable-obsolete-nsl} option was not used the default value +for the services is @code{files}. + +For all other databases the default value is @code{files} unless +@theglibc{} was configured with @code{--enable-obsolete-rpc} option, in +which case it the default value is @code{nis [NOTFOUND=return] files}. @cindex optimizing NSS A second point is that the user should try to optimize the lookup diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c index 4deb483..4114fbe 100644 --- a/nscd/initgrcache.c +++ b/nscd/initgrcache.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "dbg_log.h" #include "nscd.h" @@ -34,6 +35,11 @@ #include "../nss/nsswitch.h" +#ifdef LINK_OBSOLETE_NSL +# define DEFAULT_CONFIG "compat [NOTFOUND=return] files" +#else +# define DEFAULT_CONFIG "files" +#endif /* Type of the lookup function. */ typedef enum nss_status (*initgroups_dyn_function) (const char *, gid_t, @@ -85,8 +91,7 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req, int no_more; if (group_database == NULL) - no_more = __nss_database_lookup ("group", NULL, - "compat [NOTFOUND=return] files", + no_more = __nss_database_lookup ("group", NULL, DEFAULT_CONFIG, &group_database); else no_more = 0; diff --git a/nss/grp-lookup.c b/nss/grp-lookup.c index 8cb00aa..7c019f8 100644 --- a/nss/grp-lookup.c +++ b/nss/grp-lookup.c @@ -16,7 +16,13 @@ License along with the GNU C Library; if not, see . */ +#include + #define DATABASE_NAME group -#define DEFAULT_CONFIG "compat [NOTFOUND=return] files" +#ifdef LINK_OBSOLETE_NSL +# define DEFAULT_CONFIG "compat [NOTFOUND=return] files" +#else +# define DEFAULT_CONFIG "files" +#endif #include "XXX-lookup.c" diff --git a/nss/nsswitch.c b/nss/nsswitch.c index 834bef6..78f6687 100644 --- a/nss/nsswitch.c +++ b/nss/nsswitch.c @@ -40,6 +40,15 @@ #include "nsswitch.h" #include "../nscd/nscd_proto.h" #include +#include + +#ifdef LINK_OBSOLETE_NSL +# define DEFAULT_CONFIG "compat [NOTFOUND=return] files" +# define DEFAULT_DEFCONFIG "nis [NOTFOUND=return] files" +#else +# define DEFAULT_CONFIG "files" +# define DEFAULT_DEFCONFIG "files" +#endif /* Prototypes for the local functions. */ static name_database *nss_parse_file (const char *fname) internal_function; @@ -153,8 +162,7 @@ __nss_database_lookup (const char *database, const char *alternate_name, or null to use the most common default. */ if (*ni == NULL) { - *ni = nss_parse_service_list (defconfig - ?: "nis [NOTFOUND=return] files"); + *ni = nss_parse_service_list (defconfig ?: DEFAULT_DEFCONFIG); if (*ni != NULL) { /* Record the memory we've just allocated in defconfig_entries list, @@ -852,8 +860,8 @@ __nss_disable_nscd (void (*cb) (size_t, struct traced_file *)) is_nscd = true; /* Find all the relevant modules so that the init functions are called. */ - nss_load_all_libraries ("passwd", "compat [NOTFOUND=return] files"); - nss_load_all_libraries ("group", "compat [NOTFOUND=return] files"); + nss_load_all_libraries ("passwd", DEFAULT_CONFIG); + nss_load_all_libraries ("group", DEFAULT_CONFIG); nss_load_all_libraries ("hosts", "dns [!UNAVAIL=return] files"); nss_load_all_libraries ("services", NULL); diff --git a/nss/pwd-lookup.c b/nss/pwd-lookup.c index 00040d4..180ac7c 100644 --- a/nss/pwd-lookup.c +++ b/nss/pwd-lookup.c @@ -16,7 +16,13 @@ License along with the GNU C Library; if not, see . */ +#include + #define DATABASE_NAME passwd -#define DEFAULT_CONFIG "compat [NOTFOUND=return] files" +#ifdef LINK_OBSOLETE_NSL +# define DEFAULT_CONFIG "compat [NOTFOUND=return] files" +#else +# define DEFAULT_CONFIG "files" +#endif #include "XXX-lookup.c" diff --git a/nss/spwd-lookup.c b/nss/spwd-lookup.c index 319a7bb..f12156d 100644 --- a/nss/spwd-lookup.c +++ b/nss/spwd-lookup.c @@ -16,8 +16,14 @@ License along with the GNU C Library; if not, see . */ +#include + #define DATABASE_NAME shadow #define ALTERNATE_NAME passwd -#define DEFAULT_CONFIG "compat [NOTFOUND=return] files" +#ifdef LINK_OBSOLETE_NSL +# define DEFAULT_CONFIG "compat [NOTFOUND=return] files" +#else +# define DEFAULT_CONFIG "files" +#endif #include "XXX-lookup.c"