d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libc: Eliminate some relative relocations in getusershell().

Browse Source
This commit is contained in:
Jilles Tjoelker 2011-12-27 23:35:10 +00:00
parent 571eea83bb
commit 5b7aa0fc6e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/libc/gen/getusershell.c
View File

@ -58,12 +58,6 @@ __FBSDID("$FreeBSD$");
#endif
#include "un-namespace.h"
/*
* Local shells should NOT be added here. They should be added in
* /etc/shells.
*/
static const char *const okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL };
static const char *const *curshell;
static StringList *sl;
@ -261,8 +255,13 @@ initshells()
!= NS_SUCCESS) {
if (sl)
sl_free(sl, 1);
sl = NULL;
return (okshells);
sl = sl_init();
/*
* Local shells should NOT be added here. They should be
* added in /etc/shells.
*/
sl_add(sl, strdup(_PATH_BSHELL));
sl_add(sl, strdup(_PATH_CSHELL));
}
sl_add(sl, NULL);