summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-08-21 17:56:29 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-08-21 17:56:29 +1000
commite3cc3c04e3bd7353af265abf7f6d725d8f0f3111 (patch)
treee117dfbf0337dd5e4d8cadef6bd86423921fda9d
parent25fbd6283705f897adff28232673baae657d8b31 (diff)
- (dtucker) [acconfig.h configure.ac monitor_fdpass.c] Bug #544: ignore
invalid cmsg_type on Linux 1.x and 2.0 kernels, privsep should now work. Missed acconfig.h, whoops.
-rw-r--r--ChangeLog6
-rw-r--r--acconfig.h5
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 223848e8..d2b1b2a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,8 +12,8 @@
- (dtucker) [defines.h] Bug #336: Add CMSG_DATA and CMSG_FIRSTHDR macros if
not already defined (eg Linux with some versions of libc5), based on those
from OpenBSD.
- - (dtucker) [configure.ac monitor_fdpass.c] Bug #544: ignore invalid cmsg_type
- on Linux 1.x and 2.0 kernels, privsep should now work.
+ - (dtucker) [acconfig.h configure.ac monitor_fdpass.c] Bug #544: ignore
+ invalid cmsg_type on Linux 1.x and 2.0 kernels, privsep should now work.
- (dtucker) [acconfig.h configure.ac sshd.c] STREAMS_PUSH_ACQUIRES_CTTY ->
SSHD_ACQUIRES_CTTY.
@@ -1321,4 +1321,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2648.2.8 2003/08/21 07:42:33 dtucker Exp $
+$Id: ChangeLog,v 1.2648.2.9 2003/08/21 07:56:29 dtucker Exp $
diff --git a/acconfig.h b/acconfig.h
index f3ca728a..2f97c2be 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.149.4.1 2003/08/21 07:42:34 dtucker Exp $ */
+/* $Id: acconfig.h,v 1.149.4.2 2003/08/21 07:56:29 dtucker Exp $ */
#ifndef _CONFIG_H
#define _CONFIG_H
@@ -377,6 +377,9 @@
/* Define if sshd somehow reacquires a controlling TTY after setsid() */
#undef SSHD_ACQUIRES_CTTY
+/* Define if cmsg_type is not passed correctly */
+#undef BROKEN_CMSG_TYPE
+
@BOTTOM@
/* ******************* Shouldn't need to edit below this line ************** */