diff options
author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /glibc/glibc-2.3.2/glibc22-nss-upgrade.patch | |
parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
download | openembedded-f96441b9faf769c9ecdd4d338b605ea3d0cc4010.tar.gz |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'glibc/glibc-2.3.2/glibc22-nss-upgrade.patch')
-rw-r--r-- | glibc/glibc-2.3.2/glibc22-nss-upgrade.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/glibc/glibc-2.3.2/glibc22-nss-upgrade.patch b/glibc/glibc-2.3.2/glibc22-nss-upgrade.patch index e69de29bb2..569ab96461 100644 --- a/glibc/glibc-2.3.2/glibc22-nss-upgrade.patch +++ b/glibc/glibc-2.3.2/glibc22-nss-upgrade.patch @@ -0,0 +1,26 @@ +--- glibc22/nss/nsswitch.c~ Fri Mar 31 15:38:32 2000 ++++ glibc22/nss/nsswitch.c Thu Nov 9 17:28:45 2000 +@@ -333,9 +333,20 @@ + ni->library->lib_handle = __libc_dlopen (shlib_name); + if (ni->library->lib_handle == NULL) + { +- /* Failed to load the library. */ +- ni->library->lib_handle = (void *) -1l; +- __set_errno (saved_errno); ++ /* Failed to load the library. Try a fallback. */ ++ int n = __snprintf(shlib_name, shlen, "libnss_%s.so.%d.%d", ++ ni->library->name, __GLIBC__, __GLIBC_MINOR__); ++ if (n >= shlen) ++ ni->library->lib_handle = NULL; ++ else ++ ni->library->lib_handle = __libc_dlopen (shlib_name); ++ ++ if (ni->library->lib_handle == NULL) ++ { ++ /* Ok, really fail now. */ ++ ni->library->lib_handle = (void *) -1l; ++ __set_errno (saved_errno); ++ } + } + } + |