summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--auth.c2
-rw-r--r--configure.in6
-rw-r--r--openbsd-compat/Makefile.in4
-rw-r--r--openbsd-compat/dirname.c81
-rw-r--r--openbsd-compat/dirname.h5
-rw-r--r--openbsd-compat/openbsd-compat.h3
7 files changed, 100 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 44b282462..a340a433e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120010611
2 - (bal) NeXT/MacOS X lack libgen.h and dirname(). Patch by Mark Miller
3 <markm@swoon.net>
4
120010610 520010610
2 - (bal) Missed two files in major resync. auth-bsdauth.c and auth-skey.c 6 - (bal) Missed two files in major resync. auth-bsdauth.c and auth-skey.c
3 7
@@ -5595,4 +5599,4 @@
5595 - Wrote replacements for strlcpy and mkdtemp 5599 - Wrote replacements for strlcpy and mkdtemp
5596 - Released 1.0pre1 5600 - Released 1.0pre1
5597 5601
5598$Id: ChangeLog,v 1.1273 2001/06/10 00:41:18 mouring Exp $ 5602$Id: ChangeLog,v 1.1274 2001/06/10 17:24:51 mouring Exp $
diff --git a/auth.c b/auth.c
index 8e6b32de0..e4f867541 100644
--- a/auth.c
+++ b/auth.c
@@ -32,7 +32,9 @@ RCSID("$OpenBSD: auth.c,v 1.23 2001/05/24 11:12:42 markus Exp $");
32#include <shadow.h> 32#include <shadow.h>
33#endif /* defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) */ 33#endif /* defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) */
34 34
35#ifdef HAVE_LIBGEN_H
35#include <libgen.h> 36#include <libgen.h>
37#endif
36 38
37#include "xmalloc.h" 39#include "xmalloc.h"
38#include "match.h" 40#include "match.h"
diff --git a/configure.in b/configure.in
index abc77445b..104f7e577 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
1# $Id: configure.in,v 1.289 2001/06/09 02:26:59 mouring Exp $ 1# $Id: configure.in,v 1.290 2001/06/10 17:24:52 mouring Exp $
2 2
3AC_INIT(ssh.c) 3AC_INIT(ssh.c)
4 4
@@ -356,7 +356,7 @@ AC_CHECK_FUNC(utimes,
356AC_FUNC_STRFTIME 356AC_FUNC_STRFTIME
357 357
358# Checks for header files. 358# Checks for header files.
359AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h getopt.h glob.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h regex.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/queue.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stddef.h time.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h) 359AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h getopt.h glob.h lastlog.h libgen.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h regex.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/queue.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stddef.h time.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h)
360 360
361# Check for ALTDIRFUNC glob() extension 361# Check for ALTDIRFUNC glob() extension
362AC_MSG_CHECKING(for GLOB_ALTDIRFUNC support) 362AC_MSG_CHECKING(for GLOB_ALTDIRFUNC support)
@@ -460,7 +460,7 @@ AC_ARG_WITH(tcp-wrappers,
460) 460)
461 461
462dnl Checks for library functions. 462dnl Checks for library functions.
463AC_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 inet_ntop innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv setegid seteuid setlogin setproctitle setresgid setreuid setrlimit setsid setvbuf sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop) 463AC_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 inet_ntop innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv setegid seteuid setlogin setproctitle setresgid setreuid setrlimit setsid setvbuf sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop)
464dnl Checks for time functions 464dnl Checks for time functions
465AC_CHECK_FUNCS(gettimeofday time) 465AC_CHECK_FUNCS(gettimeofday time)
466dnl Checks for libutil functions 466dnl Checks for libutil functions
diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in
index 5b0432730..2cf2774f2 100644
--- a/openbsd-compat/Makefile.in
+++ b/openbsd-compat/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.10 2001/04/12 21:35:53 mouring Exp $ 1# $Id: Makefile.in,v 1.11 2001/06/10 17:24:52 mouring Exp $
2 2
3sysconfdir=@sysconfdir@ 3sysconfdir=@sysconfdir@
4piddir=@piddir@ 4piddir=@piddir@
@@ -16,7 +16,7 @@ RANLIB=@RANLIB@
16INSTALL=@INSTALL@ 16INSTALL=@INSTALL@
17LDFLAGS=-L. @LDFLAGS@ 17LDFLAGS=-L. @LDFLAGS@
18 18
19OPENBSD=base64.o bindresvport.o daemon.o getcwd.o getgrouplist.o getusershell.o glob.o inet_aton.o inet_ntoa.o inet_ntop.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 19OPENBSD=base64.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o getusershell.o glob.o inet_aton.o inet_ntoa.o inet_ntop.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
21COMPAT=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 21COMPAT=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/dirname.c b/openbsd-compat/dirname.c
new file mode 100644
index 000000000..c29082673
--- /dev/null
+++ b/openbsd-compat/dirname.c
@@ -0,0 +1,81 @@
1/* $OpenBSD: dirname.c,v 1.4 1999/05/30 17:10:30 espie Exp $ */
2
3/*
4 * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:
10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution.
15 * 3. The name of the author may not be used to endorse or promote products
16 * derived from this software without specific prior written permission.
17 *
18 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
19 * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
20 * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
21 * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
24 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
25 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
26 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
27 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */
29
30#include "includes.h"
31#ifndef HAVE_DIRNAME
32
33#if defined(LIBC_SCCS) && !defined(lint)
34static char rcsid[] = "$OpenBSD: dirname.c,v 1.4 1999/05/30 17:10:30 espie Exp $";
35#endif /* LIBC_SCCS and not lint */
36
37#include <errno.h>
38#include <string.h>
39#include <sys/param.h>
40
41char *
42dirname(path)
43 const char *path;
44{
45 static char bname[MAXPATHLEN];
46 register const char *endp;
47
48 /* Empty or NULL string gets treated as "." */
49 if (path == NULL || *path == '\0') {
50 (void)strcpy(bname, ".");
51 return(bname);
52 }
53
54 /* Strip trailing slashes */
55 endp = path + strlen(path) - 1;
56 while (endp > path && *endp == '/')
57 endp--;
58
59 /* Find the start of the dir */
60 while (endp > path && *endp != '/')
61 endp--;
62
63 /* Either the dir is "/" or there are no slashes */
64 if (endp == path) {
65 (void)strcpy(bname, *endp == '/' ? "/" : ".");
66 return(bname);
67 } else {
68 do {
69 endp--;
70 } while (endp > path && *endp == '/');
71 }
72
73 if (endp - path + 1 > sizeof(bname)) {
74 errno = ENAMETOOLONG;
75 return(NULL);
76 }
77 (void)strncpy(bname, path, endp - path + 1);
78 bname[endp - path + 1] = '\0';
79 return(bname);
80}
81#endif
diff --git a/openbsd-compat/dirname.h b/openbsd-compat/dirname.h
new file mode 100644
index 000000000..c51cff74c
--- /dev/null
+++ b/openbsd-compat/dirname.h
@@ -0,0 +1,5 @@
1#ifndef HAVE_DIRNAME
2
3char *dirname(const char *path);
4
5#endif
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index 876e8f6ac..64d8fc5b7 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -1,4 +1,4 @@
1/* $Id: openbsd-compat.h,v 1.6 2001/04/12 21:35:54 mouring Exp $ */ 1/* $Id: openbsd-compat.h,v 1.7 2001/06/10 17:24:53 mouring Exp $ */
2 2
3#ifndef _OPENBSD_H 3#ifndef _OPENBSD_H
4#define _OPENBSD_H 4#define _OPENBSD_H
@@ -15,6 +15,7 @@
15#include "strmode.h" 15#include "strmode.h"
16#include "mktemp.h" 16#include "mktemp.h"
17#include "daemon.h" 17#include "daemon.h"
18#include "dirname.h"
18#include "base64.h" 19#include "base64.h"
19#include "sigact.h" 20#include "sigact.h"
20#include "inet_aton.h" 21#include "inet_aton.h"