glibc/glibc-nsswitch-usr.diff

Index: glibc-2.31/nss/nss_database.c
===================================================================
--- glibc-2.31.orig/nss/nss_database.c
+++ glibc-2.31/nss/nss_database.c
@@ -294,6 +294,8 @@ nss_database_reload (struct nss_database_data *staging,
                      struct file_change_detection *initial)
 {
   FILE *fp = fopen (_PATH_NSSWITCH_CONF, "rce");
+  if (fp == NULL)
+    fp = fopen ("/usr" _PATH_NSSWITCH_CONF, "rce");
   if (fp == NULL)
     switch (errno)
       {
Accepting request 868599 from home:Andreas_Schwab:Factory - Update to glibc 2.33 * The dynamic linker accepts the --list-tunables argument which prints all the supported tunables. * The dynamic linker accepts the --argv0 argument and provides opportunity to change argv[0] string. * The dynamic linker loads optimized implementations of shared objects from subdirectories under the glibc-hwcaps directory on the library search path if the system's capabilities meet the requirements for that subdirectory. * The new --help option of the dynamic linker provides usage and information and library search path diagnostics. * The mallinfo2 function is added to report statistics as per mallinfo, but with larger field widths to accurately report values that are larger than fit in an integer. * Add <sys/platform/x86.h> to provide query macros for x86 CPU features. * A new fortification level _FORTIFY_SOURCE=3 is available. * The mallinfo function is marked deprecated. * When dlopen is used in statically linked programs, alternative library implementations from HWCAP subdirectories are no longer loaded. * The deprecated <sys/vtimes.h> header and the function vtimes have been removed. * On s390(x), the type float_t is now derived from the macro __FLT_EVAL_METHOD__ that is defined by the compiler, instead of being hardcoded to double. * A future version of glibc will stop loading shared objects from the "tls" subdirectories on the library search path, the subdirectory that corresponds to the AT_PLATFORM system name, and also stop employing the legacy AT_HWCAP search mechanism. * CVE-2021-3326: An assertion failure during conversion from the ISO-20220-JP-3 character set using the iconv function has been fixed. OBS-URL: https://build.opensuse.org/request/show/868599 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=577 2021-02-02 12:37:02 +01:00			`Index: glibc-2.31/nss/nss_database.c`
Accepting request 807178 from home:Andreas_Schwab:Factory - glibc-nsswitch-usr.diff: read /usr/etc/nsswitch.conf if /etc/nsswitch.conf does not exist - Install default nsswitch.conf in /usr/etc - Don't install gai.conf in /etc OBS-URL: https://build.opensuse.org/request/show/807178 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=563 2020-05-19 12:03:06 +02:00			`===================================================================`
Accepting request 868599 from home:Andreas_Schwab:Factory - Update to glibc 2.33 * The dynamic linker accepts the --list-tunables argument which prints all the supported tunables. * The dynamic linker accepts the --argv0 argument and provides opportunity to change argv[0] string. * The dynamic linker loads optimized implementations of shared objects from subdirectories under the glibc-hwcaps directory on the library search path if the system's capabilities meet the requirements for that subdirectory. * The new --help option of the dynamic linker provides usage and information and library search path diagnostics. * The mallinfo2 function is added to report statistics as per mallinfo, but with larger field widths to accurately report values that are larger than fit in an integer. * Add <sys/platform/x86.h> to provide query macros for x86 CPU features. * A new fortification level _FORTIFY_SOURCE=3 is available. * The mallinfo function is marked deprecated. * When dlopen is used in statically linked programs, alternative library implementations from HWCAP subdirectories are no longer loaded. * The deprecated <sys/vtimes.h> header and the function vtimes have been removed. * On s390(x), the type float_t is now derived from the macro __FLT_EVAL_METHOD__ that is defined by the compiler, instead of being hardcoded to double. * A future version of glibc will stop loading shared objects from the "tls" subdirectories on the library search path, the subdirectory that corresponds to the AT_PLATFORM system name, and also stop employing the legacy AT_HWCAP search mechanism. * CVE-2021-3326: An assertion failure during conversion from the ISO-20220-JP-3 character set using the iconv function has been fixed. OBS-URL: https://build.opensuse.org/request/show/868599 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=577 2021-02-02 12:37:02 +01:00			`--- glibc-2.31.orig/nss/nss_database.c`
			`+++ glibc-2.31/nss/nss_database.c`
			`@@ -294,6 +294,8 @@ nss_database_reload (struct nss_database_data *staging,`
			`struct file_change_detection *initial)`
			`{`
			`FILE *fp = fopen (_PATH_NSSWITCH_CONF, "rce");`
			`+ if (fp == NULL)`
			`+ fp = fopen ("/usr" _PATH_NSSWITCH_CONF, "rce");`
			`if (fp == NULL)`
			`switch (errno)`
			`{`