diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.in | 4 | ||||
-rw-r--r-- | openbsd-compat/getusershell.c | 138 | ||||
-rw-r--r-- | openbsd-compat/getusershell.h | 16 |
4 files changed, 5 insertions, 158 deletions
@@ -2,7 +2,8 @@ | |||
2 | - (djm) Sync openbsd-compat with -current libc | 2 | - (djm) Sync openbsd-compat with -current libc |
3 | - (djm) Fix from Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> for my | 3 | - (djm) Fix from Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> for my |
4 | broken makefile | 4 | broken makefile |
5 | - (bal) Removed strtok_r and inet_ntop since they are no longer used. | 5 | - (bal) Removed strtok_r() and inet_ntop() since they are no longer used. |
6 | - (bal) Remove getusershell() since it's no longer used. | ||
6 | 7 | ||
7 | 20010627 | 8 | 20010627 |
8 | - (djm) Reintroduce pam_session call for non-pty sessions. | 9 | - (djm) Reintroduce pam_session call for non-pty sessions. |
@@ -5815,4 +5816,4 @@ | |||
5815 | - Wrote replacements for strlcpy and mkdtemp | 5816 | - Wrote replacements for strlcpy and mkdtemp |
5816 | - Released 1.0pre1 | 5817 | - Released 1.0pre1 |
5817 | 5818 | ||
5818 | $Id: ChangeLog,v 1.1337 2001/06/28 23:21:28 mouring Exp $ | 5819 | $Id: ChangeLog,v 1.1338 2001/06/28 23:27:37 mouring Exp $ |
diff --git a/configure.in b/configure.in index c682528d0..d388dfd44 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.in,v 1.296 2001/06/28 23:21:29 mouring Exp $ | 1 | # $Id: configure.in,v 1.297 2001/06/28 23:27:38 mouring Exp $ |
2 | 2 | ||
3 | AC_INIT(ssh.c) | 3 | AC_INIT(ssh.c) |
4 | 4 | ||
@@ -459,7 +459,7 @@ AC_ARG_WITH(tcp-wrappers, | |||
459 | ) | 459 | ) |
460 | 460 | ||
461 | dnl Checks for library functions. | 461 | dnl Checks for library functions. |
462 | AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock dirname 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 readpassphrase realpath rresvport_af setdtablesize setenv setegid seteuid setlogin setproctitle setresgid setreuid setrlimit setsid setvbuf sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop) | 462 | AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock dirname 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 readpassphrase realpath rresvport_af setdtablesize setenv setegid seteuid setlogin setproctitle setresgid setreuid setrlimit setsid setvbuf sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop) |
463 | dnl Checks for time functions | 463 | dnl Checks for time functions |
464 | AC_CHECK_FUNCS(gettimeofday time) | 464 | AC_CHECK_FUNCS(gettimeofday time) |
465 | dnl Checks for libutil functions | 465 | dnl Checks for libutil functions |
diff --git a/openbsd-compat/getusershell.c b/openbsd-compat/getusershell.c deleted file mode 100644 index b334ba2e7..000000000 --- a/openbsd-compat/getusershell.c +++ /dev/null | |||
@@ -1,138 +0,0 @@ | |||
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 deleted file mode 100644 index 5a0f1a19d..000000000 --- a/openbsd-compat/getusershell.h +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
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 */ | ||