summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2006-09-16 15:12:58 +0000
committerdes <des@FreeBSD.org>2006-09-16 15:12:58 +0000
commit97a1b8f884131b9db05eda41b2867738bf83216c (patch)
treec68458595a739b9225c416c8d915d27d7307816d /crypto
parent0ccb71359db845afbb78147a48b11654a883cd99 (diff)
downloadFreeBSD-src-97a1b8f884131b9db05eda41b2867738bf83216c.zip
FreeBSD-src-97a1b8f884131b9db05eda41b2867738bf83216c.tar.gz
Merge vendor patch for BSM problem in protocol version 1.
MFC after: 1 week
Diffstat (limited to 'crypto')
-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 ac77093..efefd60 100644
--- a/crypto/openssh/monitor.c
+++ b/crypto/openssh/monitor.c
@@ -272,7 +272,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}
};
@@ -639,9 +639,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