diff options
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/grp-lookup.c | 6 | ||||
| -rw-r--r-- | nss/nsswitch.c | 14 | ||||
| -rw-r--r-- | nss/nsswitch.conf | 2 | ||||
| -rw-r--r-- | nss/pwd-lookup.c | 6 | ||||
| -rw-r--r-- | nss/spwd-lookup.c | 6 |
5 files changed, 6 insertions, 28 deletions
diff --git a/nss/grp-lookup.c b/nss/grp-lookup.c index d147201b0a..f65da2089b 100644 --- a/nss/grp-lookup.c +++ b/nss/grp-lookup.c @@ -19,10 +19,6 @@ #include <config.h> #define DATABASE_NAME group -#ifdef LINK_OBSOLETE_NSL -# define DEFAULT_CONFIG "compat [NOTFOUND=return] files" -#else -# define DEFAULT_CONFIG "files" -#endif +#define DEFAULT_CONFIG "files" #include "XXX-lookup.c" diff --git a/nss/nsswitch.c b/nss/nsswitch.c index 319e22c3fc..8d7b69d4bc 100644 --- a/nss/nsswitch.c +++ b/nss/nsswitch.c @@ -42,14 +42,6 @@ #include <sysdep.h> #include <config.h> -#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); static name_database_entry *nss_getline (char *line); @@ -161,7 +153,7 @@ __nss_database_lookup2 (const char *database, const char *alternate_name, or null to use the most common default. */ if (*ni == NULL) { - *ni = nss_parse_service_list (defconfig ?: DEFAULT_DEFCONFIG); + *ni = nss_parse_service_list (defconfig ?: "files"); if (*ni != NULL) { /* Record the memory we've just allocated in defconfig_entries list, @@ -845,8 +837,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", DEFAULT_CONFIG); - nss_load_all_libraries ("group", DEFAULT_CONFIG); + 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/nsswitch.conf b/nss/nsswitch.conf index 4a6bcb1f7b..40030d1dd7 100644 --- a/nss/nsswitch.conf +++ b/nss/nsswitch.conf @@ -15,8 +15,6 @@ # dns Use DNS (Domain Name Service) # files Use the local files in /etc # hesiod Use Hesiod (DNS) for user lookups -# nis Use NIS (NIS version 2), also called YP -# nisplus Use NIS+ (NIS version 3) # # See `info libc 'NSS Basics'` for more information. # diff --git a/nss/pwd-lookup.c b/nss/pwd-lookup.c index 401306785d..e15e150019 100644 --- a/nss/pwd-lookup.c +++ b/nss/pwd-lookup.c @@ -19,10 +19,6 @@ #include <config.h> #define DATABASE_NAME passwd -#ifdef LINK_OBSOLETE_NSL -# define DEFAULT_CONFIG "compat [NOTFOUND=return] files" -#else -# define DEFAULT_CONFIG "files" -#endif +#define DEFAULT_CONFIG "files" #include "XXX-lookup.c" diff --git a/nss/spwd-lookup.c b/nss/spwd-lookup.c index c7ca74fa44..21ea0afe75 100644 --- a/nss/spwd-lookup.c +++ b/nss/spwd-lookup.c @@ -20,10 +20,6 @@ #define DATABASE_NAME shadow #define ALTERNATE_NAME passwd -#ifdef LINK_OBSOLETE_NSL -# define DEFAULT_CONFIG "compat [NOTFOUND=return] files" -#else -# define DEFAULT_CONFIG "files" -#endif +#define DEFAULT_CONFIG "files" #include "XXX-lookup.c" |