tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-29 16:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [configure.ac openbsd-compat/bsd-closefrom.c] Use F_CLOSEM fcntl

Browse Source 
for closefrom() on AIX.  Pointed out by William Ahern.
This commit is contained in:
Darren Tucker 2006-08-17 19:35:49 +10:00
parent e6b641a9a1
commit 3083bc2b52
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,6 +1,8 @@
20060817 20060817
- (dtucker) [openbsd-compat/fake-rfc2553.c openbsd-compat/setproctitle.c] - (dtucker) [openbsd-compat/fake-rfc2553.c openbsd-compat/setproctitle.c]
Include stdlib.h for malloc and friends. Include stdlib.h for malloc and friends.
- (dtucker) [configure.ac openbsd-compat/bsd-closefrom.c] Use F_CLOSEM fcntl
for closefrom() on AIX. Pointed out by William Ahern.
20060816 20060816
- (djm) [audit-bsm.c] Sprinkle in some headers - (djm) [audit-bsm.c] Sprinkle in some headers
@ -5214,4 +5216,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4480 2006/08/17 08:55:27 dtucker Exp $ $Id: ChangeLog,v 1.4481 2006/08/17 09:35:49 dtucker Exp $

10
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.348 2006/08/04 09:44:23 dtucker Exp $ # $Id: configure.ac,v 1.349 2006/08/17 09:35:49 dtucker Exp $
# #
# Copyright (c) 1999-2004 Damien Miller # Copyright (c) 1999-2004 Damien Miller
# #
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
AC_REVISION($Revision: 1.348 $) AC_REVISION($Revision: 1.349 $)
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
@ -180,6 +180,12 @@ case "$host" in
[#include <usersec.h>] [#include <usersec.h>]
) )
AC_CHECK_FUNCS(setauthdb) AC_CHECK_FUNCS(setauthdb)
AC_CHECK_DECL(F_CLOSEM,
AC_DEFINE(USE_FCNTL_CLOSEM, 1, [Use F_CLOSEM fcntl for closefrom]),
[],
[ #include <limits.h>
#include <fcntl.h> ]
)
check_for_aix_broken_getaddrinfo=1 check_for_aix_broken_getaddrinfo=1
AC_DEFINE(BROKEN_REALPATH, 1, [Define if you have a broken realpath.]) AC_DEFINE(BROKEN_REALPATH, 1, [Define if you have a broken realpath.])
AC_DEFINE(SETEUID_BREAKS_SETUID, 1, AC_DEFINE(SETEUID_BREAKS_SETUID, 1,

7
openbsd-compat/bsd-closefrom.c
View File

@ -22,6 +22,9 @@
#include <sys/param.h> #include <sys/param.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif
#include <limits.h> #include <limits.h>
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h> #include <stddef.h>
@ -76,6 +79,10 @@ closefrom(int lowfd)
} }
(void) closedir(dirp); (void) closedir(dirp);
} else } else
#elif defined(USE_FCNTL_CLOSEM)
if (fcntl(lowfd, F_CLOSEM, 0) != -1) {
return;
} else
#endif #endif
{ {
/* /*