Remove compat from DEFAULT_CONFIG lookup strings
Commit Message
On Mon, 2017-08-28 at 22:57 +0000, Joseph Myers wrote:
> On Mon, 28 Aug 2017, Steve Ellcey wrote:
>
> >
> > >
> > > Does the "nis [NOTFOUND=return] files" default in
> > > nsswitch.c:__nss_database_lookup need to change as well?
> > I think this default is still OK. The other changes I made were to
> > remove 'compat' entries from the list of databases to be searched
> > if the compat library is not built. I am not sure why we would
> > want to
> > change this one. Am I missing something?
> Well, libnss_nis isn't built by default either. Is there some reason for
> searching nis by default without the relevant library, but not doing so
> for compat without the relevant library?
No reason, I just didn't realise libnss_nis wasn't built by default.
Here is an updated patch for setting the default lookup methods in nss.
I updated nss/nsswitch.c to not use nis lookups when RPC is not
configured and I updated DEFAULT_CONFIG in grp/initgroups.c to be
"compat [NOTFOUND=return] files" when using NSL instead of just "compat
files". DJ noticed that and I think the missing NOTFOUND is just an
oversight and it conflicted with the documentation in manual/nss.texi.
Fixing the code seemed more reasonable than documenting the existing
setting. I did update the documentation to reflect the behavour of
this patch.
I tested once with "--enable-obsolete-nsl --enable-obsolete-rpc" and
once without and had no regressions from the unmodified glibc on
aarch64.
OK to checkin?
Steve Ellcey
sellcey@cavium.com
2017-08-29 Steve Ellcey <sellcey@cavium.com>
* 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.
Comments
On Tue, 29 Aug 2017, Steve Ellcey wrote:
> No reason, I just didn't realise libnss_nis wasn't built by default.
>
> Here is an updated patch for setting the default lookup methods in nss.
> I updated nss/nsswitch.c to not use nis lookups when RPC is not
> configured and I updated DEFAULT_CONFIG in grp/initgroups.c to be
> "compat [NOTFOUND=return] files" when using NSL instead of just "compat
> files". DJ noticed that and I think the missing NOTFOUND is just an
> oversight and it conflicted with the documentation in manual/nss.texi.
> Fixing the code seemed more reasonable than documenting the existing
> setting. I did update the documentation to reflect the behavour of
> this patch.
>
> I tested once with "--enable-obsolete-nsl --enable-obsolete-rpc" and
> once without and had no regressions from the unmodified glibc on
> aarch64.
>
> OK to checkin?
I have no further comments on this patch.
On Aug 29 2017, Steve Ellcey <sellcey@cavium.com> wrote:
> diff --git a/nss/nsswitch.c b/nss/nsswitch.c
> index 834bef6..3de085e 100644
> --- a/nss/nsswitch.c
> +++ b/nss/nsswitch.c
> @@ -40,6 +40,19 @@
> #include "nsswitch.h"
> #include "../nscd/nscd_proto.h"
> #include <sysdep.h>
> +#include <config.h>
> +
> +#ifdef LINK_OBSOLETE_NSL
> +# define DEFAULT_CONFIG "compat [NOTFOUND=return] files"
> +#else
> +# define DEFAULT_CONFIG "files"
> +#endif
> +
> +#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.
@@ -26,10 +26,16 @@
#include <sys/types.h>
#include <nsswitch.h>
#include <scratch_buffer.h>
+#include <config.h>
#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;
@@ -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
@@ -25,6 +25,7 @@
#include <unistd.h>
#include <sys/mman.h>
#include <scratch_buffer.h>
+#include <config.h>
#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;
@@ -16,7 +16,13 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#include <config.h>
+
#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"
@@ -40,6 +40,19 @@
#include "nsswitch.h"
#include "../nscd/nscd_proto.h"
#include <sysdep.h>
+#include <config.h>
+
+#ifdef LINK_OBSOLETE_NSL
+# define DEFAULT_CONFIG "compat [NOTFOUND=return] files"
+#else
+# define DEFAULT_CONFIG "files"
+#endif
+
+#ifdef LINK_OBSOLETE_RPC
+# define DEFAULT_DEFCONFIG "nis [NOTFOUND=return] files"
+#else
+# define DEFAULT_DEFCONFIG "files"
+#endif
/* Prototypes for the local functions. */
static name_database *nss_parse_file (const char *fname) internal_function;
@@ -153,8 +166,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 +864,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);
@@ -16,7 +16,13 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#include <config.h>
+
#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"
@@ -16,8 +16,14 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#include <config.h>
+
#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"