public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Steve Ellcey <sellcey@cavium.com>
To: DJ Delorie <dj@redhat.com>
Cc: libc-alpha@sourceware.org
Subject: Re: [PATCH] Remove compat from DEFAULT_CONFIG lookup strings
Date: Fri, 18 Aug 2017 20:50:00 -0000	[thread overview]
Message-ID: <1503089397.2986.43.camel@cavium.com> (raw)
In-Reply-To: <xn378pbuf6.fsf@greed.delorie.com>

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  <sellcey@cavium.com>

	* 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 @@
    <http://www.gnu.org/licenses/>.  */
 
 #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 @@
    <http://www.gnu.org/licenses/>.  */
 
 #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"

  reply	other threads:[~2017-08-18 20:50 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-17 21:31 Steve Ellcey
2017-08-18  0:18 ` DJ Delorie
2017-08-18 20:50   ` Steve Ellcey [this message]
2017-08-18 21:12     ` Joseph Myers
2017-08-18 21:35       ` Steve Ellcey
2017-08-18 22:12         ` Joseph Myers
2017-08-18 22:17           ` Steve Ellcey
2017-08-22 16:33           ` Steve Ellcey
2017-08-22 21:07             ` DJ Delorie
2017-08-28 20:23               ` Steve Ellcey
2017-08-28 20:48                 ` Joseph Myers
2017-08-28 21:50                   ` Steve Ellcey
2017-08-28 22:58                     ` Joseph Myers
2017-08-29 19:04                       ` Steve Ellcey
2017-08-29 20:23                         ` Joseph Myers
2017-08-29 20:57                         ` DJ Delorie
2017-08-31  7:21                         ` Andreas Schwab
2017-08-31 15:25                           ` Steve Ellcey
2017-09-11 20:01                             ` Steve Ellcey
2017-09-11 20:39                             ` DJ Delorie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1503089397.2986.43.camel@cavium.com \
    --to=sellcey@cavium.com \
    --cc=dj@redhat.com \
    --cc=libc-alpha@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).