diff options
author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /glibc/glibc-2.3.2/glibc22-nss-upgrade.patch | |
parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
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, 0 insertions, 26 deletions
diff --git a/glibc/glibc-2.3.2/glibc22-nss-upgrade.patch b/glibc/glibc-2.3.2/glibc22-nss-upgrade.patch deleted file mode 100644 index 569ab96461..0000000000 --- a/glibc/glibc-2.3.2/glibc22-nss-upgrade.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- 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); -+ } - } - } - |