summaryrefslogtreecommitdiffstats
path: root/crypto/openssh
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2006-09-16 15:10:13 +0000
committerdes <des@FreeBSD.org>2006-09-16 15:10:13 +0000
commit03ef9d989bf2619956d8c703362439e9be9257ca (patch)
treebca7f61b2206a16ef14afb1e71e6449b5558b8ae /crypto/openssh
parent448503722a8c8934d8520302b7551e95de730b06 (diff)
downloadFreeBSD-src-03ef9d989bf2619956d8c703362439e9be9257ca.zip
FreeBSD-src-03ef9d989bf2619956d8c703362439e9be9257ca.tar.gz
Vendor patch for a problem that prevented using protocol version 1 when
BSM was enabled.
Diffstat (limited to 'crypto/openssh')
-rw-r--r--crypto/openssh/monitor.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/crypto/openssh/monitor.c b/crypto/openssh/monitor.c
index e6f648b..dc26d7d 100644
--- a/crypto/openssh/monitor.c
+++ b/crypto/openssh/monitor.c
@@ -263,7 +263,7 @@ struct mon_table mon_dispatch_postauth15[] = {
{MONITOR_REQ_TERM, 0, mm_answer_term},
#ifdef SSH_AUDIT_EVENTS
{MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event},
- {MONITOR_REQ_AUDIT_COMMAND, MON_ONCE, mm_answer_audit_command},
+ {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT|MON_ONCE, mm_answer_audit_command},
#endif
{0, 0, NULL}
};
@@ -630,9 +630,6 @@ mm_answer_pwnamallow(int sock, Buffer *m)
if (options.use_pam)
monitor_permit(mon_dispatch, MONITOR_REQ_PAM_START, 1);
#endif
-#ifdef SSH_AUDIT_EVENTS
- monitor_permit(mon_dispatch, MONITOR_REQ_AUDIT_COMMAND, 1);
-#endif
return (0);
}
OpenPOWER on IntegriCloud