diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2005-04-02 17:04:53 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2005-04-02 17:04:53 +0000 |
| commit | 62db84f60b1b0ecf62ce3c24a91eb56a897828f7 (patch) | |
| tree | f12b1a6b2dc0094ca4d14f9cd2a28935e5fcbcd2 | |
| parent | d3201be4f265e4055a4d183ffd6b1da41db87ec1 (diff) | |
Add /bin/ksh to builtin list of OK shells.
| -rw-r--r-- | include/paths.h | 3 | ||||
| -rw-r--r-- | lib/libc/gen/getusershell.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/paths.h b/include/paths.h index 18f8c377df0..eeac17484f5 100644 --- a/include/paths.h +++ b/include/paths.h @@ -1,4 +1,4 @@ -/* $OpenBSD: paths.h,v 1.21 2004/04/13 17:04:49 millert Exp $ */ +/* $OpenBSD: paths.h,v 1.22 2005/04/02 17:04:52 millert Exp $ */ /* $NetBSD: paths.h,v 1.7 1994/10/26 00:56:12 cgd Exp $ */ /* @@ -50,6 +50,7 @@ #define _PATH_FSIRAND "/sbin/fsirand" #define _PATH_KLOG "/dev/klog" #define _PATH_KMEM "/dev/kmem" +#define _PATH_KSHELL "/bin/ksh" #define _PATH_KSYMS "/dev/ksyms" #define _PATH_KVMDB "/var/db/kvm_bsd.db" #define _PATH_LOCALE "/usr/share/locale" diff --git a/lib/libc/gen/getusershell.c b/lib/libc/gen/getusershell.c index 6924c05dba0..108a4cc13dc 100644 --- a/lib/libc/gen/getusershell.c +++ b/lib/libc/gen/getusershell.c @@ -28,7 +28,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: getusershell.c,v 1.6 2005/03/25 15:38:47 otto Exp $"; +static char rcsid[] = "$OpenBSD: getusershell.c,v 1.7 2005/04/02 17:04:52 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -45,7 +45,7 @@ static char rcsid[] = "$OpenBSD: getusershell.c,v 1.6 2005/03/25 15:38:47 otto E * /etc/shells. */ -static char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL }; +static char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, _PATH_KSHELL, NULL }; static char **curshell, **shells, *strings; static char **initshells(void); |