From patchwork Fri Aug 18 20:49:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Ellcey X-Patchwork-Id: 22236 Received: (qmail 13810 invoked by alias); 18 Aug 2017 20:50: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 13773 invoked by uid 89); 18 Aug 2017 20:50:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.0 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: NAM01-BN3-obe.outbound.protection.outlook.com Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Steve.Ellcey@cavium.com; Message-ID: <1503089397.2986.43.camel@cavium.com> Subject: Re: [PATCH] Remove compat from DEFAULT_CONFIG lookup strings From: Steve Ellcey Reply-To: sellcey@cavium.com To: DJ Delorie Cc: libc-alpha@sourceware.org Date: Fri, 18 Aug 2017 13:49:57 -0700 In-Reply-To: References: Mime-Version: 1.0 X-ClientProxiedBy: MWHPR12CA0034.namprd12.prod.outlook.com (10.172.49.20) To CY4PR07MB3544.namprd07.prod.outlook.com (10.171.252.165) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 765dbe88-3438-4b4c-d139-08d4e67ab141 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY4PR07MB3544; X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3544; 3:3RjHkGy1vgbnTMBwt0WrRJwZ+S3La6UWn6WrxDwS3krWaLARKXfEEZB4z3Uyan3w0UyAaE1ybZC7Rwa7cjoJvewSv3WSY8vRYQQbAw79Tdj5nmobsBKXU47TYsv7Nr+1r519VL7o2tA75/2uvD1IBTFn7F+3KbSXcTJyvbiwpN4HKfr9z/xRo0Frx+RA5+C0FCZc6zpehlMZmHxBDq+e5HkeKoNCSbi3emvCRk8ij4bgN/YpZwgHO28m5jwN77dl; 25:cP8EZVOq7PRzX/BAH3bvW2j6L7UG9qKGxeLMImdiJrMp2X52+MuxrBnJwlWA4hoPKLtMujNSRLSUDxTuWSuFvBTz+OXGQWg/Toa2cZh0zytWqpfaNiNfSJHsLShnUbGnijLcP3B64noPp1i7YVmaG5u4bJBIuhxk3nBeJ8676VHgB21MYZ/mHRc/MjHXlFdmXJEu1KNiRCPiADqAUABqysw0G5TvDWUmGLjME/nZ2Fob1tH12CKTTBB6F56eQV3XKsR45H72Dyupk81/peRl2sSDUwMIFmX62sZDDY0zerFHxcEm03W6fwGfRXi0tURA1Nid9aSz1SpsQzOQ/d3ntw==; 31:VdlTjcqPHfXAsDWYV4gMyRsz0Cdq+NDfYLHofDc9It+SvilmaI8JirLAXInsfdWvs+6KUmL3H3426281tHP/PD3mXBxmebRav/xN8A+xYk6ftgmgKlBuOr/daFNnkkZULcNmmOuwXPFI4eHVL839NqadX2j+S1TP/+vmcSxKcCnUwlJqEk1bh4u34wdvQeyFaq9NuvKtsEgdpdWjFKCTKsHaFWNhYrRrXd5q7zk8b+8= X-MS-TrafficTypeDiagnostic: CY4PR07MB3544: X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3544; 20:yzvOhodlmeAgKi4yYae5QUqfzIopRb44whg+OdH9Qzgsh7z1v1fwBFdCB2nuR/hjB9S7vp/q9Cna3VQEgPvfnBoo1UZu+SY+JM/2N+tWUJ9Q0tyVO+x7D3HL5Vb4B/H4mhGCaoFZKQ9CkXMqpWLJJevKvaQDvpACJePuEpTv6t2F3IJ9pSXqawSMFKoFbVGUH2zjs1Y5wbuQyRnsN28SLL9fDLhcoBzVslR8XVIY27lsijvAx4poa4+x7OPN/x9jF/E0PvHrzOFpIV7sFoVxPGp0xA8BLZJaGzoB+Zule2EIYUdKIg4C1dKaJPpnonp0fgVR1efJL0BZ+N6FUJpcy9BmfZ7H9rxwBfTpBktmKVtNuoDxf1Uc4wZX4/ByN9qymSbYJ6G2SOcKXfEyhziXHeWFQe4EYG0KZqkyhCS51+11TkS8Xs1b1eWIKUXjP2iNcpEKVK2fKLvc1M52w/tpvMigY7WFfupqzKD0HrlSQqjhI4kV20xHTSd/AFZ9vIKP; 4:iSpssYp+voI+Ajn4r5XWG2Y7TBOV50DjHj5buLUege+YT+dbnH/u21KsSsBzT8lda3PyFqaS9fiUgYQoCLe0+QrCZpVq+8BMiBajpVBzmdC1gLg2npVjI5+ByJE7LuwZOet4ZbCegHbGQdug5bJnqyJrH7oK0aYmQt4w+S4wp8/wREQA3pvJy/1Usae6xP1OEqENEUl836jWpOTlD0Kw7r/AeAczEoIKntGfY5pIUuaDmvRbXw+Mcu2ip1QN3KjD7EgKmDkVYDBzJzTX62HdqEpkBUT1l9Z9WCPwEU+n8K9Zk7EPXBChB9ILCmgjMDiZ5tGGUIDO6YZ1g0b+PsogCA== X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(6041248)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123564025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR07MB3544; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR07MB3544; X-Forefront-PRVS: 040359335D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(7370300001)(4630300001)(6009001)(24454002)(377424004)(199003)(189002)(7736002)(229853002)(68736007)(3846002)(6916009)(2950100002)(6306002)(551544002)(6512007)(8676002)(47776003)(5820100001)(25786009)(97736004)(6506006)(6116002)(305945005)(81156014)(81166006)(66066001)(110136004)(53936002)(6486002)(33646002)(6246003)(4326008)(50466002)(23676002)(69596002)(76176999)(50986999)(106356001)(43066003)(189998001)(50226002)(101416001)(42186005)(72206003)(2906002)(2870700001)(53416004)(105586002)(478600001)(103116003)(7350300001)(36756003)(3450700001)(5660300001)(99106002)(21314002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR07MB3544; 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: =?utf-8?B?MTtDWTRQUjA3TUIzNTQ0OzIzOnhWYjU4cGF1SXM0YTljRmtKdzNYdFAvQVRl?= =?utf-8?B?d0lqVXVQZzVuVG1jUmlrMUMyMGVKY2tJdGtLcGRQNjlsRGp2MlRJUGF5WVpx?= =?utf-8?B?amR2aHRTaE1GRHVjLzZ0WTJEbmlZNGlZaDlzNWxhQ2FoK3ZnOGVNbWdsenhj?= =?utf-8?B?ZEIyUzRTSzU2ZWJwNEtINGkxTysxRUkrOFI4NmErS291U3ZBdlltaC81ay93?= =?utf-8?B?SEVKa0lHZ2NRcEJIR1h6cFNsTktBTzVmUUNCMi93aDBUYXErcmJEc0p3alhD?= =?utf-8?B?Q0lYWXdxOVBvanlpL1FxRnVQeUZKcmVONUZFMlMvM0ErOURoMkVGeUlGSVNw?= =?utf-8?B?WlZ4SFczS3E5dmtBUnlNcTlYOXVQMmZQbDkycVpIcWlMcUJ2UEQ2dEU3QmVG?= =?utf-8?B?YjR3dkYyWEpYb0NoL00xS1Y5d05hRjdqaGVoL1Y0TXFWNWsrNnpqVWVvRmJO?= =?utf-8?B?eGxrOVNJUng2NDhkR1VBUnVyMnp0ZlhSNS9zQWozTDZIckJERHZ4VXgrTmNy?= =?utf-8?B?V1RSRFRBU2tWUm5RVm5UOVo4eTU3OWNjLy9yTjVoZlFWeUxiK2dlTC9xTU1R?= =?utf-8?B?dXBqNVo5YUNmMG9xdmROS2RyaVVFYlhhZFJUL21TZ0d5c2JWazdYUGpXRW95?= =?utf-8?B?SURhcnMvb096US9lT1Q4YlhPbm1iN01TUWVLR0FYSnQraHB1Tm9MdkQrclUy?= =?utf-8?B?Y09hL1RxY0svYytISjhhWDZMa0hQalJEK1cxRThBZHAyYUk3SG5SQ1BoNFF4?= =?utf-8?B?RFVkM2Z1UHAwMHFBL3hGTCtTZFhVNHdVWVBvQXgxMVYxRm1OZ1lYa2YxMlUz?= =?utf-8?B?OWswOHAxd3J5THE0alcwWGlqM0MvOVdvS3FIYmlObk9XQVNrK0J3U05yWjJQ?= =?utf-8?B?ZGpGM2VxTVlFdm41a2JQYjRvUlFNZHBWMzVmQ0RuN3U3bDNwUWtTNE1kZTE4?= =?utf-8?B?YSt4OCs4MzZMeHdVR3hta1hweWU3Y2xudElRSkxucXlJSHlJVVlueVh1ZG5X?= =?utf-8?B?SnRXR3lKTUdLYkFzYStzdHg5M0lXb1AwY2FjYlh3cHRpMXU5Slc4WVpUaURJ?= =?utf-8?B?VGtlZkc5M1hMZVIvem42SUJLSFh6TTkxdXNKOWk2Z2tacTErcFU5Q0dmQkNs?= =?utf-8?B?dGd3VEEwTmRpMUlnK0tiYXB4Qnd6Q3BackI1TW9tUkRpSFVSQ3Blc3ZDWFhY?= =?utf-8?B?V00vdHlXc0dvSG9MdTdVd2RpQzlJa0VlY0ZjUjUrZ0VQYUN4TzJCWHpGcU5C?= =?utf-8?B?WGlBL3dNeUVFSU43VFZiaGVRZkJlTm1Ld2haY3NHRTR2YTNMcjZkSytiQmY5?= =?utf-8?B?MFk3TkpPc3dWdU5OOUxaMVpyMHRETTFDMDdzL2RHNEdLUDdCOEZSLzJITDc0?= =?utf-8?B?T1hoU3NSYk4ybmg4aUcxRnl3WUM4VjBDUHg4ZlJueEhtZ1NvWEFrT2puMlVx?= =?utf-8?B?MHNUVGZiVUFaK0xUOEtRTk8ycTBvWVNHU0d4T3BRQ0VBRmo2eE8vNEFiQy9T?= =?utf-8?B?RzRDdnVocHZYQjVMR3M2bURHbzdhYWNnZk5acHRER3Rkc29GRFVqRmdaNkt6?= =?utf-8?B?aHJuMlUyMU9YelI1V1J3OEJBalFqMlY3aXlTT2k3QzhFVmlGZUsxSWxDc1hH?= =?utf-8?B?NGhWbGovU0FqclVWalBkVy9kT0plL2RpT1UyRVdEOHFvV1BxSFVvSlQ3VEFB?= =?utf-8?B?VzV6VUsvYW1xL0FKdGpseWNFaWJTMlNhc1JuS2dHM21GcUJsU2ZERVhhM1JT?= =?utf-8?B?UEs2eU9xT3l0T0VHUE9DT3dXV1l6cGxDNGxLN21BclpGcHBVYmpaZ3lIaEFL?= =?utf-8?B?YW8ydFRjS2l3d0ExaGRKSXJES2drbGw0NFZSTi84M3lDZnc9PQ==?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3544; 6:ujgpi0a5KDvi/XR3AU8iTtKLmjs3oBxiHCSAHBkb8nDDw/8sIJtHudkPXyqLyp3pvFd69K4/iqL4qa52EyaxVdHdUeL4ZVfvx94p9WfQ0KQEfsNY3k9KDnZYKTZJwTWmaDXSRAT1AaToRu9wSefq9ey5TPHTDrWtNbv+bqDml72151hP13hF//rTVQ8s+oe27GO3PZw3TSDvX/UDEIRkrDpLDGm6s0ZpmxQ1kVEBJWzYD4YXNgkfMqZI40ov4eZV4ujsSUwQ1L8jA9EFaee3e97aZfdL9Y2/nOBc6B/vGVOXIkHDwwCjTPLs2S4AhGdxYfGvaToYv8u1nF2tmn2fHQ==; 5:jn7dLFryy0uRCbnYtaXyddrIfJm30v+zE5S8SjDQsz6GnIv1bubZJHC3DPDmp12GEoqro4yRifEGTb6UcvNeAs4QhN5K1tzkVuOaY8Gg92sUknQroA7xcuRj3vLAN9ZBMpZz3BSoMx5FuTtcGJOunA==; 24:KZeEMc77yeaVDfqRnlBwbw+RGKKc879nSIsUdg2jkZU2phVnxNkA5UTgoUkspZDw8WzMqdWIpnVW9shpqcBuWU1UVDlO61yGRlSjmtkCbP4=; 7:aLeDTIWc1yziaJUzYUJ5Yf03Y6+Q8lNdILGXMe5Xt6Tu/zl/JRXk9pu347cSCOxe6Z+N2f5Vsm6DCDxY8vgPyoKCKwhfUsWzSHwCzRLDLkwFr/ouFXjsgfY72uVAzsTj73OP37voK79Xe6d70YgQXmQ49gClrly3MoL1jZjNNKoKZpU/Xi999m2EE5UFJ83mnlqBP/Kf7invdyD5AQ8nsaBqabcrRa5/vl90AR3wTGk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2017 20:49:59.7705 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR07MB3544 On Thu, 2017-08-17 at 20:18 -0400, DJ Delorie wrote: > Also found (crude search) in: > > ./nss/nsswitch.c:        nss_load_all_libraries ("passwd", "compat > [NOTFOUND=return] files");  > ./nss/nsswitch.c:        nss_load_all_libraries ("group", "compat > [NOTFOUND=return] files");  > ./grp/initgroups.c:      no_more = __nss_database_lookup ("group", > NULL, "compat files",  > ./nscd/initgrcache.c:    "compat [NOTFOUND=return] files",  > > Do these need to be tweaked also? I would think so.  I did a search and didn't find any more "compat" lookups beyond what you found.  Not doing these changes didn't cause any testsuite failures but it does seem like they should be changed.  I updated them and reran the testsuite and got no regressions.  Here is an updated patch. Steve Ellcey sellcey@cavium.com 2017-08-18  Steve Ellcey   * nss/grp-lookup.c (DEFAULT_CONFIG): Remove compat method. * nss/pwd-lookup.c (DEFAULT_CONFIG): Likewise. * nss/spwd-lookup.c (DEFAULT_CONFIG): Likewise. * grp/initgroups.c (internal_getgrouplist): Update lookup methods in __nss_database_lookup call. * nscd/initgrcache.c (addinitgroupsX): Likewise. * nss/nsswitch.c (__nss_disable_nscd): Likewise. diff --git a/grp/initgroups.c b/grp/initgroups.c index 0d5b841..9aef82c 100644 --- a/grp/initgroups.c +++ b/grp/initgroups.c @@ -79,7 +79,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, "files",        &__nss_group_database);       __nss_initgroups_database = __nss_group_database; diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c index 4deb483..71a5f6c 100644 --- a/nscd/initgrcache.c +++ b/nscd/initgrcache.c @@ -85,9 +85,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", -      &group_database); +    no_more = __nss_database_lookup ("group", NULL, "files", &group_database);    else      no_more = 0;    nip = group_database; diff --git a/nss/grp-lookup.c b/nss/grp-lookup.c index 8cb00aa..256d2af 100644 --- a/nss/grp-lookup.c +++ b/nss/grp-lookup.c @@ -17,6 +17,6 @@     .  */    #define DATABASE_NAME group -#define DEFAULT_CONFIG "compat [NOTFOUND=return] files" +#define DEFAULT_CONFIG "files"    #include "XXX-lookup.c" diff --git a/nss/nsswitch.c b/nss/nsswitch.c index 8f31658..349cd1c 100644 --- a/nss/nsswitch.c +++ b/nss/nsswitch.c @@ -848,8 +848,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", "files"); +  nss_load_all_libraries ("group", "files");    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..8612c39 100644 --- a/nss/pwd-lookup.c +++ b/nss/pwd-lookup.c @@ -17,6 +17,6 @@     .  */    #define DATABASE_NAME passwd -#define DEFAULT_CONFIG "compat [NOTFOUND=return] files" +#define DEFAULT_CONFIG "files"    #include "XXX-lookup.c" diff --git a/nss/spwd-lookup.c b/nss/spwd-lookup.c index 319a7bb..2c866d1 100644 --- a/nss/spwd-lookup.c +++ b/nss/spwd-lookup.c @@ -18,6 +18,6 @@    #define DATABASE_NAME shadow  #define ALTERNATE_NAME passwd -#define DEFAULT_CONFIG "compat [NOTFOUND=return] files" +#define DEFAULT_CONFIG "files"    #include "XXX-lookup.c"