OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Few last minute patches from main on 960811

This commit is contained in:
Ulrich Drepper 1996-08-12 03:00:59 +00:00
parent a8874eadae
commit 15a83d04bb
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nss/nsswitch.c
View File

@ -83,7 +83,10 @@ __nss_database_lookup (const char *database, const char *defconfig,
/* Reconsider database variable in case some other thread called /* Reconsider database variable in case some other thread called
`__nss_configure_lookup' while we waited for the lock. */ `__nss_configure_lookup' while we waited for the lock. */
if (*ni != NULL) if (*ni != NULL)
return 0; {
__libc_lock_unlock (lock);
return 0;
}
if (nss_initialized == 0 && service_table == NULL) if (nss_initialized == 0 && service_table == NULL)
/* Read config file. */ /* Read config file. */
@ -99,10 +102,7 @@ __nss_database_lookup (const char *database, const char *defconfig,
only requested once and so this might not be critical. */ only requested once and so this might not be critical. */
for (entry = service_table->entry; entry != NULL; entry = entry->next) for (entry = service_table->entry; entry != NULL; entry = entry->next)
if (strcmp (database, entry->name) == 0) if (strcmp (database, entry->name) == 0)
{ *ni = entry->service;
*ni = entry->service;
return 0;
}
} }
/* No configuration data is available, either because nsswitch.conf /* No configuration data is available, either because nsswitch.conf
@ -110,7 +110,9 @@ __nss_database_lookup (const char *database, const char *defconfig,
DEFCONFIG specifies the default service list for this database, DEFCONFIG specifies the default service list for this database,
or null to use the most common default. */ or null to use the most common default. */
*ni = nss_parse_service_list (defconfig ?: "compat [NOTFOUND=return] files"); if (*ni == NULL)
*ni = nss_parse_service_list (defconfig
?: "compat [NOTFOUND=return] files");
__libc_lock_unlock (lock); __libc_lock_unlock (lock);