diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-03-12 11:31:05 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-03-12 11:31:05 +1100 |
commit | aa97d13fa22d410ad155d23b230fd3cce989ce25 (patch) | |
tree | 6b5b35af5bcab94a5e6447f733a96e698069ce48 /configure.ac | |
parent | fe10a28e088751ec3a6ac96e73be21bae8b86d70 (diff) |
- (dtucker) [auth.c configure.ac platform.c platform.h] Accept uid 2 ("bin")
in addition to root as an owner of system directories on AIX and HP-UX.
ok djm@
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 6005d7c2f..a49de84e1 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.513 2013/03/08 01:14:23 djm Exp $ | 1 | # $Id: configure.ac,v 1.514 2013/03/12 00:31:05 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) | 17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) |
18 | AC_REVISION($Revision: 1.513 $) | 18 | AC_REVISION($Revision: 1.514 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | AC_LANG([C]) | 20 | AC_LANG([C]) |
21 | 21 | ||
@@ -480,6 +480,7 @@ case "$host" in | |||
480 | AC_DEFINE([SSHPAM_CHAUTHTOK_NEEDS_RUID], [1], | 480 | AC_DEFINE([SSHPAM_CHAUTHTOK_NEEDS_RUID], [1], |
481 | [AIX 5.2 and 5.3 (and presumably newer) require this]) | 481 | [AIX 5.2 and 5.3 (and presumably newer) require this]) |
482 | AC_DEFINE([PTY_ZEROREAD], [1], [read(1) can return 0 for a non-closed fd]) | 482 | AC_DEFINE([PTY_ZEROREAD], [1], [read(1) can return 0 for a non-closed fd]) |
483 | AC_DEFINE([PLATFORM_SYS_DIR_UID], 2, [System dirs owned by bin (uid 2)]) | ||
483 | ;; | 484 | ;; |
484 | *-*-cygwin*) | 485 | *-*-cygwin*) |
485 | check_for_libcrypt_later=1 | 486 | check_for_libcrypt_later=1 |
@@ -565,6 +566,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) | |||
565 | AC_DEFINE([LOCKED_PASSWD_STRING], ["*"], | 566 | AC_DEFINE([LOCKED_PASSWD_STRING], ["*"], |
566 | [String used in /etc/passwd to denote locked account]) | 567 | [String used in /etc/passwd to denote locked account]) |
567 | AC_DEFINE([SPT_TYPE], [SPT_PSTAT]) | 568 | AC_DEFINE([SPT_TYPE], [SPT_PSTAT]) |
569 | AC_DEFINE([PLATFORM_SYS_DIR_UID], 2, [System dirs owned by bin (uid 2)]) | ||
568 | maildir="/var/mail" | 570 | maildir="/var/mail" |
569 | LIBS="$LIBS -lsec" | 571 | LIBS="$LIBS -lsec" |
570 | AC_CHECK_LIB([xnet], [t_error], , | 572 | AC_CHECK_LIB([xnet], [t_error], , |