From e6affc6a13304e8f0cb81b467f70d414733e8457 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Thu, 28 Jun 2001 23:27:37 +0000 Subject: - (bal) Remove getusershell() since it's no longer use --- ChangeLog | 5 +- configure.in | 4 +- openbsd-compat/getusershell.c | 138 ------------------------------------------ openbsd-compat/getusershell.h | 16 ----- 4 files changed, 5 insertions(+), 158 deletions(-) delete mode 100644 openbsd-compat/getusershell.c delete mode 100644 openbsd-compat/getusershell.h diff --git a/ChangeLog b/ChangeLog index ef6833e9f..b1ec5e941 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,8 @@ - (djm) Sync openbsd-compat with -current libc - (djm) Fix from Lutz Jaenicke for my broken makefile - - (bal) Removed strtok_r and inet_ntop since they are no longer used. + - (bal) Removed strtok_r() and inet_ntop() since they are no longer used. + - (bal) Remove getusershell() since it's no longer used. 20010627 - (djm) Reintroduce pam_session call for non-pty sessions. @@ -5815,4 +5816,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1337 2001/06/28 23:21:28 mouring Exp $ +$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 @@ -# $Id: configure.in,v 1.296 2001/06/28 23:21:29 mouring Exp $ +# $Id: configure.in,v 1.297 2001/06/28 23:27:38 mouring Exp $ AC_INIT(ssh.c) @@ -459,7 +459,7 @@ AC_ARG_WITH(tcp-wrappers, ) dnl Checks for library functions. -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) +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) dnl Checks for time functions AC_CHECK_FUNCS(gettimeofday time) 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 @@ -/* - * Copyright (c) 1985, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include "includes.h" -#include "getusershell.h" - -#ifndef HAVE_GETUSERSHELL - -#if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: getusershell.c,v 1.2 1996/08/19 08:24:15 tholo Exp $"; -#endif /* LIBC_SCCS and not lint */ - -#include -#include - -/* - * Local shells should NOT be added here. They should be added in - * /etc/shells. - */ - -static char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL }; -static char **curshell, **shells, *strings; -static char **initshells __P((void)); - -/* - * Get a list of shells from _PATH_SHELLS, if it exists. - */ -char * -getusershell() -{ - char *ret; - - if (curshell == NULL) - curshell = initshells(); - ret = *curshell; - if (ret != NULL) - curshell++; - return (ret); -} - -void -endusershell() -{ - - if (shells != NULL) - free(shells); - shells = NULL; - if (strings != NULL) - free(strings); - strings = NULL; - curshell = NULL; -} - -void -setusershell() -{ - - curshell = initshells(); -} - -static char ** -initshells() -{ - register char **sp, *cp; - register FILE *fp; - struct stat statb; - - if (shells != NULL) - free(shells); - shells = NULL; - if (strings != NULL) - free(strings); - strings = NULL; - if ((fp = fopen(_PATH_SHELLS, "r")) == NULL) - return (okshells); - if (fstat(fileno(fp), &statb) == -1) { - (void)fclose(fp); - return (okshells); - } - if ((strings = malloc((u_int)statb.st_size)) == NULL) { - (void)fclose(fp); - return (okshells); - } - shells = calloc((unsigned)statb.st_size / 3, sizeof (char *)); - if (shells == NULL) { - (void)fclose(fp); - free(strings); - strings = NULL; - return (okshells); - } - sp = shells; - cp = strings; - while (fgets(cp, MAXPATHLEN + 1, fp) != NULL) { - while (*cp != '#' && *cp != '/' && *cp != '\0') - cp++; - if (*cp == '#' || *cp == '\0') - continue; - *sp++ = cp; - while (!isspace(*cp) && *cp != '#' && *cp != '\0') - cp++; - *cp++ = '\0'; - } - *sp = NULL; - (void)fclose(fp); - return (shells); -} - -#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 @@ -/* $Id: getusershell.h,v 1.1 2001/03/18 23:09:28 djm Exp $ */ - -#ifndef _GETUSERSHELL_H -#define _GETUSERSHELL_H - -#include "config.h" - -#ifndef HAVE_GETUSERSHELL - -char *getusershell(void); -void setusershell(void); -void endusershell(void); - -#endif /* HAVE_GETUSERSHELL */ - -#endif /* _GETUSERSHELL_H */ -- cgit v1.2.3