diff options
author | Damien Miller <djm@mindrot.org> | 2001-03-19 10:09:27 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2001-03-19 10:09:27 +1100 |
commit | 9de61e8c596e1f7e52f780dd87bde2df779b1237 (patch) | |
tree | 99e0f2e4bccb64f63b793197b3b1a31f7a5080f4 | |
parent | a2dc6030f769d7737bf481d2d4c77f82bc4b7965 (diff) |
- (djm) Add getusershell() functions from OpenBSD CVS
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | configure.in | 4 | ||||
-rw-r--r-- | defines.h | 8 | ||||
-rw-r--r-- | openbsd-compat/Makefile.in | 4 | ||||
-rw-r--r-- | openbsd-compat/getusershell.c | 138 | ||||
-rw-r--r-- | openbsd-compat/getusershell.h | 16 | ||||
-rw-r--r-- | openbsd-compat/openbsd-compat.h | 3 |
7 files changed, 169 insertions, 7 deletions
@@ -1,6 +1,7 @@ | |||
1 | 20010319 | 1 | 20010319 |
2 | - (djm) Seed PRNG at startup, rather than waiting for arc4random calls to | 2 | - (djm) Seed PRNG at startup, rather than waiting for arc4random calls to |
3 | do it implicitly. | 3 | do it implicitly. |
4 | - (djm) Add getusershell() functions from OpenBSD CVS | ||
4 | 5 | ||
5 | 20010318 | 6 | 20010318 |
6 | - (bal) Fixed scp type casing issue which causes "scp: protocol error: | 7 | - (bal) Fixed scp type casing issue which causes "scp: protocol error: |
@@ -4600,4 +4601,4 @@ | |||
4600 | - Wrote replacements for strlcpy and mkdtemp | 4601 | - Wrote replacements for strlcpy and mkdtemp |
4601 | - Released 1.0pre1 | 4602 | - Released 1.0pre1 |
4602 | 4603 | ||
4603 | $Id: ChangeLog,v 1.972 2001/03/18 22:38:15 djm Exp $ | 4604 | $Id: ChangeLog,v 1.973 2001/03/18 23:09:27 djm Exp $ |
diff --git a/configure.in b/configure.in index a6ad607c1..61d1e06a4 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.in,v 1.266 2001/03/17 01:15:38 mouring Exp $ | 1 | # $Id: configure.in,v 1.267 2001/03/18 23:09:28 djm Exp $ |
2 | 2 | ||
3 | AC_INIT(ssh.c) | 3 | AC_INIT(ssh.c) |
4 | 4 | ||
@@ -527,7 +527,7 @@ AC_ARG_WITH(tcp-wrappers, | |||
527 | ) | 527 | ) |
528 | 528 | ||
529 | dnl Checks for library functions. | 529 | dnl Checks for library functions. |
530 | AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock fchown fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent glob inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv seteuid setlogin setproctitle setreuid setrlimit setsid sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop) | 530 | AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock fchown fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent getusershell glob inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv seteuid setlogin setproctitle setreuid setrlimit setsid sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop) |
531 | dnl Checks for time functions | 531 | dnl Checks for time functions |
532 | AC_CHECK_FUNCS(gettimeofday time) | 532 | AC_CHECK_FUNCS(gettimeofday time) |
533 | dnl Checks for libutil functions | 533 | dnl Checks for libutil functions |
@@ -1,7 +1,7 @@ | |||
1 | #ifndef _DEFINES_H | 1 | #ifndef _DEFINES_H |
2 | #define _DEFINES_H | 2 | #define _DEFINES_H |
3 | 3 | ||
4 | /* $Id: defines.h,v 1.56 2001/02/24 00:55:05 mouring Exp $ */ | 4 | /* $Id: defines.h,v 1.57 2001/03/18 23:09:28 djm Exp $ */ |
5 | 5 | ||
6 | /* Some platforms need this for the _r() functions */ | 6 | /* Some platforms need this for the _r() functions */ |
7 | #if !defined(_REENTRANT) && !defined(SNI) | 7 | #if !defined(_REENTRANT) && !defined(SNI) |
@@ -274,6 +274,12 @@ struct winsize { | |||
274 | #ifndef _PATH_BSHELL | 274 | #ifndef _PATH_BSHELL |
275 | # define _PATH_BSHELL "/bin/sh" | 275 | # define _PATH_BSHELL "/bin/sh" |
276 | #endif | 276 | #endif |
277 | #ifndef _PATH_CSHELL | ||
278 | # define _PATH_CSHELL "/bin/csh" | ||
279 | #endif | ||
280 | #ifndef _PATH_SHELLS | ||
281 | # define _PATH_SHELLS "/etc/shells" | ||
282 | #endif | ||
277 | 283 | ||
278 | #ifdef USER_PATH | 284 | #ifdef USER_PATH |
279 | # ifdef _PATH_STDPATH | 285 | # ifdef _PATH_STDPATH |
diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in index 17128ad50..45ed3740a 100644 --- a/openbsd-compat/Makefile.in +++ b/openbsd-compat/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.8 2001/03/14 00:39:46 djm Exp $ | 1 | # $Id: Makefile.in,v 1.9 2001/03/18 23:09:28 djm Exp $ |
2 | 2 | ||
3 | sysconfdir=@sysconfdir@ | 3 | sysconfdir=@sysconfdir@ |
4 | piddir=@piddir@ | 4 | piddir=@piddir@ |
@@ -16,7 +16,7 @@ RANLIB=@RANLIB@ | |||
16 | INSTALL=@INSTALL@ | 16 | INSTALL=@INSTALL@ |
17 | LDFLAGS=-L. @LDFLAGS@ | 17 | LDFLAGS=-L. @LDFLAGS@ |
18 | 18 | ||
19 | OPENBSD=base64.o bindresvport.o daemon.o getcwd.o glob.o getgrouplist.o inet_aton.o inet_ntoa.o mktemp.o realpath.o rresvport.o setenv.o setproctitle.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o strtok.o vis.o | 19 | OPENBSD=base64.o bindresvport.o daemon.o getcwd.o getgrouplist.o getusershell.o glob.o inet_aton.o inet_ntoa.o mktemp.o realpath.o rresvport.o setenv.o setproctitle.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o strtok.o vis.o |
20 | 20 | ||
21 | COMPAT=bsd-arc4random.o bsd-cygwin_util.o bsd-misc.o bsd-nextstep.o bsd-snprintf.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o | 21 | COMPAT=bsd-arc4random.o bsd-cygwin_util.o bsd-misc.o bsd-nextstep.o bsd-snprintf.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o |
22 | 22 | ||
diff --git a/openbsd-compat/getusershell.c b/openbsd-compat/getusershell.c new file mode 100644 index 000000000..b334ba2e7 --- /dev/null +++ b/openbsd-compat/getusershell.c | |||
@@ -0,0 +1,138 @@ | |||
1 | /* | ||
2 | * Copyright (c) 1985, 1993 | ||
3 | * The Regents of the University of California. All rights reserved. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions | ||
7 | * are met: | ||
8 | * 1. Redistributions of source code must retain the above copyright | ||
9 | * notice, this list of conditions and the following disclaimer. | ||
10 | * 2. Redistributions in binary form must reproduce the above copyright | ||
11 | * notice, this list of conditions and the following disclaimer in the | ||
12 | * documentation and/or other materials provided with the distribution. | ||
13 | * 3. All advertising materials mentioning features or use of this software | ||
14 | * must display the following acknowledgement: | ||
15 | * This product includes software developed by the University of | ||
16 | * California, Berkeley and its contributors. | ||
17 | * 4. Neither the name of the University nor the names of its contributors | ||
18 | * may be used to endorse or promote products derived from this software | ||
19 | * without specific prior written permission. | ||
20 | * | ||
21 | * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND | ||
22 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
23 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
24 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | ||
25 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
26 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
27 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
28 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
29 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
30 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
31 | * SUCH DAMAGE. | ||
32 | */ | ||
33 | |||
34 | #include "includes.h" | ||
35 | #include "getusershell.h" | ||
36 | |||
37 | #ifndef HAVE_GETUSERSHELL | ||
38 | |||
39 | #if defined(LIBC_SCCS) && !defined(lint) | ||
40 | static char rcsid[] = "$OpenBSD: getusershell.c,v 1.2 1996/08/19 08:24:15 tholo Exp $"; | ||
41 | #endif /* LIBC_SCCS and not lint */ | ||
42 | |||
43 | #include <sys/file.h> | ||
44 | #include <ctype.h> | ||
45 | |||
46 | /* | ||
47 | * Local shells should NOT be added here. They should be added in | ||
48 | * /etc/shells. | ||
49 | */ | ||
50 | |||
51 | static char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL }; | ||
52 | static char **curshell, **shells, *strings; | ||
53 | static char **initshells __P((void)); | ||
54 | |||
55 | /* | ||
56 | * Get a list of shells from _PATH_SHELLS, if it exists. | ||
57 | */ | ||
58 | char * | ||
59 | getusershell() | ||
60 | { | ||
61 | char *ret; | ||
62 | |||
63 | if (curshell == NULL) | ||
64 | curshell = initshells(); | ||
65 | ret = *curshell; | ||
66 | if (ret != NULL) | ||
67 | curshell++; | ||
68 | return (ret); | ||
69 | } | ||
70 | |||
71 | void | ||
72 | endusershell() | ||
73 | { | ||
74 | |||
75 | if (shells != NULL) | ||
76 | free(shells); | ||
77 | shells = NULL; | ||
78 | if (strings != NULL) | ||
79 | free(strings); | ||
80 | strings = NULL; | ||
81 | curshell = NULL; | ||
82 | } | ||
83 | |||
84 | void | ||
85 | setusershell() | ||
86 | { | ||
87 | |||
88 | curshell = initshells(); | ||
89 | } | ||
90 | |||
91 | static char ** | ||
92 | initshells() | ||
93 | { | ||
94 | register char **sp, *cp; | ||
95 | register FILE *fp; | ||
96 | struct stat statb; | ||
97 | |||
98 | if (shells != NULL) | ||
99 | free(shells); | ||
100 | shells = NULL; | ||
101 | if (strings != NULL) | ||
102 | free(strings); | ||
103 | strings = NULL; | ||
104 | if ((fp = fopen(_PATH_SHELLS, "r")) == NULL) | ||
105 | return (okshells); | ||
106 | if (fstat(fileno(fp), &statb) == -1) { | ||
107 | (void)fclose(fp); | ||
108 | return (okshells); | ||
109 | } | ||
110 | if ((strings = malloc((u_int)statb.st_size)) == NULL) { | ||
111 | (void)fclose(fp); | ||
112 | return (okshells); | ||
113 | } | ||
114 | shells = calloc((unsigned)statb.st_size / 3, sizeof (char *)); | ||
115 | if (shells == NULL) { | ||
116 | (void)fclose(fp); | ||
117 | free(strings); | ||
118 | strings = NULL; | ||
119 | return (okshells); | ||
120 | } | ||
121 | sp = shells; | ||
122 | cp = strings; | ||
123 | while (fgets(cp, MAXPATHLEN + 1, fp) != NULL) { | ||
124 | while (*cp != '#' && *cp != '/' && *cp != '\0') | ||
125 | cp++; | ||
126 | if (*cp == '#' || *cp == '\0') | ||
127 | continue; | ||
128 | *sp++ = cp; | ||
129 | while (!isspace(*cp) && *cp != '#' && *cp != '\0') | ||
130 | cp++; | ||
131 | *cp++ = '\0'; | ||
132 | } | ||
133 | *sp = NULL; | ||
134 | (void)fclose(fp); | ||
135 | return (shells); | ||
136 | } | ||
137 | |||
138 | #endif /* HAVE_GETUSERSHELL */ | ||
diff --git a/openbsd-compat/getusershell.h b/openbsd-compat/getusershell.h new file mode 100644 index 000000000..5a0f1a19d --- /dev/null +++ b/openbsd-compat/getusershell.h | |||
@@ -0,0 +1,16 @@ | |||
1 | /* $Id: getusershell.h,v 1.1 2001/03/18 23:09:28 djm Exp $ */ | ||
2 | |||
3 | #ifndef _GETUSERSHELL_H | ||
4 | #define _GETUSERSHELL_H | ||
5 | |||
6 | #include "config.h" | ||
7 | |||
8 | #ifndef HAVE_GETUSERSHELL | ||
9 | |||
10 | char *getusershell(void); | ||
11 | void setusershell(void); | ||
12 | void endusershell(void); | ||
13 | |||
14 | #endif /* HAVE_GETUSERSHELL */ | ||
15 | |||
16 | #endif /* _GETUSERSHELL_H */ | ||
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 972f2678d..5d236731b 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openbsd-compat.h,v 1.4 2001/03/14 00:39:46 djm Exp $ */ | 1 | /* $Id: openbsd-compat.h,v 1.5 2001/03/18 23:09:28 djm Exp $ */ |
2 | 2 | ||
3 | #ifndef _OPENBSD_H | 3 | #ifndef _OPENBSD_H |
4 | #define _OPENBSD_H | 4 | #define _OPENBSD_H |
@@ -25,6 +25,7 @@ | |||
25 | #include "setproctitle.h" | 25 | #include "setproctitle.h" |
26 | #include "getgrouplist.h" | 26 | #include "getgrouplist.h" |
27 | #include "glob.h" | 27 | #include "glob.h" |
28 | #include "getusershell.h" | ||
28 | 29 | ||
29 | /* Home grown routines */ | 30 | /* Home grown routines */ |
30 | #include "bsd-arc4random.h" | 31 | #include "bsd-arc4random.h" |