- (dtucker) [acconfig.h configure.ac defines.h includes.h sshpty.c
openbsd-compat/bsd-misc.c] Add support for Ultrix. No, that's not a typo. Required changes from Bernhard Simon, integrated by me. ok djm@
This commit is contained in:
Darren Tucker
parent
287b459194
commit
2be1cbb7be
|
|
@ -1,6 +1,9 @@
|
|||
20050527
|
||||
- (djm) [defines.h] Use our realpath if we have to define PATH_MAX, spotted by
|
||||
David Leach; ok dtucker@
|
||||
- (dtucker) [acconfig.h configure.ac defines.h includes.h sshpty.c
|
||||
openbsd-compat/bsd-misc.c] Add support for Ultrix. No, that's not a typo.
|
||||
Required changes from Bernhard Simon, integrated by me. ok djm@
|
||||
|
||||
20050525
|
||||
- (djm) [mpaux.c mpaux.h Makefile.in] Remove old mpaux.[ch] code, it has not
|
||||
|
|
@ -2612,4 +2615,4 @@
|
|||
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
|
||||
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
|
||||
|
||||
$Id: ChangeLog,v 1.3791 2005/05/27 09:36:56 djm Exp $
|
||||
$Id: ChangeLog,v 1.3792 2005/05/27 11:13:40 dtucker Exp $
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: acconfig.h,v 1.181 2005/02/25 23:07:38 dtucker Exp $ */
|
||||
/* $Id: acconfig.h,v 1.182 2005/05/27 11:13:41 dtucker Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1999-2003 Damien Miller. All rights reserved.
|
||||
|
|
@ -119,9 +119,6 @@
|
|||
/* Define if you are on NeXT */
|
||||
#undef HAVE_NEXT
|
||||
|
||||
/* Define if you are on NEWS-OS */
|
||||
#undef HAVE_NEWS4
|
||||
|
||||
/* Define if you want to enable PAM support */
|
||||
#undef USE_PAM
|
||||
|
||||
|
|
|
|||
14
configure.ac
14
configure.ac
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: configure.ac,v 1.262 2005/05/26 10:48:25 djm Exp $
|
||||
# $Id: configure.ac,v 1.263 2005/05/27 11:13:41 dtucker Exp $
|
||||
#
|
||||
# Copyright (c) 1999-2004 Damien Miller
|
||||
#
|
||||
|
|
@ -278,7 +278,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
|
|||
esac
|
||||
;;
|
||||
mips-sony-bsd|mips-sony-newsos4)
|
||||
AC_DEFINE(HAVE_NEWS4)
|
||||
AC_DEFINE(NEED_SETPRGP, [], [Need setpgrp to acquire controlling tty])
|
||||
SONY=1
|
||||
;;
|
||||
*-*-netbsd*)
|
||||
|
|
@ -477,6 +477,12 @@ mips-sony-bsd|mips-sony-newsos4)
|
|||
AC_DEFINE(MISSING_HOWMANY)
|
||||
AC_DEFINE(MISSING_FD_MASK)
|
||||
;;
|
||||
|
||||
*-*-ultrix*)
|
||||
AC_DEFINE(BROKEN_GETGROUPS, [], [getgroups(0,NULL) will return -1])
|
||||
AC_DEFINE(BROKEN_MMAP, [], [Ultrix mmap can't map files])
|
||||
AC_DEFINE(NEED_SETPRGP, [], [Need setpgrp to acquire controlling tty])
|
||||
AC_CHECK_HEADERS(sys/syslog.h)
|
||||
esac
|
||||
|
||||
# Allow user to specify flags
|
||||
|
|
@ -929,8 +935,8 @@ AC_CHECK_FUNCS(\
|
|||
mkdtemp mmap ngetaddrinfo nsleep ogetaddrinfo openlog_r openpty \
|
||||
pstat prctl readpassphrase realpath recvmsg rresvport_af sendmsg \
|
||||
setdtablesize setegid setenv seteuid setgroups setlogin setpcred \
|
||||
setproctitle setregid setreuid setrlimit \
|
||||
setsid setvbuf sigaction sigvec snprintf socketpair strerror \
|
||||
setproctitle setregid setreuid setrlimit setsid setvbuf \
|
||||
sigaction sigvec snprintf socketpair strdup strerror \
|
||||
strlcat strlcpy strmode strnvis strtonum strtoul sysconf tcgetpgrp \
|
||||
truncate unsetenv updwtmpx utimes vhangup vsnprintf waitpid \
|
||||
)
|
||||
|
|
|
|||
10
defines.h
10
defines.h
|
|
@ -25,7 +25,7 @@
|
|||
#ifndef _DEFINES_H
|
||||
#define _DEFINES_H
|
||||
|
||||
/* $Id: defines.h,v 1.120 2005/05/27 09:36:56 djm Exp $ */
|
||||
/* $Id: defines.h,v 1.121 2005/05/27 11:13:41 dtucker Exp $ */
|
||||
|
||||
|
||||
/* Constants */
|
||||
|
|
@ -668,4 +668,12 @@ struct winsize {
|
|||
|
||||
/** end of login recorder definitions */
|
||||
|
||||
#ifdef BROKEN_GETGROUPS
|
||||
# define getgroups(a,b) ((a)==0 && (b)==NULL ? NGROUPS_MAX : getgroups((a),(b)))
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_MMAP) && defined(BROKEN_MMAP)
|
||||
# undef HAVE_MMAP
|
||||
#endif
|
||||
|
||||
#endif /* _DEFINES_H */
|
||||
|
|
|
|||
|
|
@ -181,6 +181,10 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
|
|||
# include <kafs.h>
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_SYS_SYSLOG_H)
|
||||
# include <sys/syslog.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
* On HP-UX 11.11, shadow.h and prot.h provide conflicting declarations
|
||||
* of getspnam when _INCLUDE__STDC__ is defined, so we unset it here.
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include "includes.h"
|
||||
#include "xmalloc.h"
|
||||
|
||||
RCSID("$Id: bsd-misc.c,v 1.26 2005/02/25 23:07:38 dtucker Exp $");
|
||||
RCSID("$Id: bsd-misc.c,v 1.27 2005/05/27 11:13:41 dtucker Exp $");
|
||||
|
||||
#ifndef HAVE___PROGNAME
|
||||
char *__progname;
|
||||
|
|
@ -212,3 +212,21 @@ mysignal(int sig, mysig_t act)
|
|||
return (signal(sig, act));
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifndef HAVE_STRDUP
|
||||
char *
|
||||
strdup(const char *str)
|
||||
{
|
||||
size_t len;
|
||||
char *cp;
|
||||
|
||||
len = strlen(str) + 1;
|
||||
cp = malloc(len);
|
||||
if (cp != NULL)
|
||||
if (strlcpy(cp, str, len) != len) {
|
||||
free(cp);
|
||||
return NULL;
|
||||
}
|
||||
return cp;
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
4
sshpty.c
4
sshpty.c
|
|
@ -128,10 +128,10 @@ pty_make_controlling_tty(int *ttyfd, const char *tty)
|
|||
if (ioctl(*ttyfd, TIOCSCTTY, NULL) < 0)
|
||||
error("ioctl(TIOCSCTTY): %.100s", strerror(errno));
|
||||
#endif /* TIOCSCTTY */
|
||||
#ifdef HAVE_NEWS4
|
||||
#ifdef NEED_SETPGRP
|
||||
if (setpgrp(0,0) < 0)
|
||||
error("SETPGRP %s",strerror(errno));
|
||||
#endif /* HAVE_NEWS4 */
|
||||
#endif /* NEED_SETPGRP */
|
||||
#ifdef USE_VHANGUP
|
||||
old = signal(SIGHUP, SIG_IGN);
|
||||
vhangup();
|
||||
|
|
|
|||
Loading…
Reference in New Issue