diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2006-09-16 15:12:58 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2006-09-16 15:12:58 +0000 |
| commit | 9d2c6627a1abdf76ebb6c58283ae9fbb323e7f4e (patch) | |
| tree | c68458595a739b9225c416c8d915d27d7307816d /crypto | |
| parent | 18f81b3dfa0fb4430a0d9734c657387ed3caf843 (diff) | |
| download | src-9d2c6627a1abdf76ebb6c58283ae9fbb323e7f4e.tar.gz src-9d2c6627a1abdf76ebb6c58283ae9fbb323e7f4e.zip | |
Merge vendor patch for BSM problem in protocol version 1.
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=162360
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/openssh/monitor.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/crypto/openssh/monitor.c b/crypto/openssh/monitor.c index ac77093730d9..efefd60418c0 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); } |