diff options
| author | Alistair Delva <adelva@google.com> | 2020-08-21 00:00:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-08-21 00:00:13 +0000 |
| commit | ed358b3546c776c1c677fd88eb8f716cf6187510 (patch) | |
| tree | 3c6134bcb2cda4b9dccc57b4a8b997a945aab62d /audit.c | |
| parent | 22246b08952d746a7cc5a292570636cf4277598f (diff) | |
| parent | 44a1065de8a58c51a021243a28bfa01e87822e4f (diff) | |
Merge changes I934c73d4,I28cdc9a0,I9e734da9,I3c079d86
* changes:
UPSTREAM: depend
UPSTREAM: upstream: avoid possible NULL deref; from Pedro Martelletto
Revert "upstream: fix compilation with DEBUG_KEXDH; bz#3160 ok dtucker@"
Merge upstream-master into master
Diffstat (limited to 'audit.c')
| -rw-r--r-- | audit.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -1,5 +1,3 @@ -/* $Id: audit.c,v 1.6 2011/01/17 10:15:30 dtucker Exp $ */ - /* * Copyright (c) 2004, 2005 Darren Tucker. All rights reserved. * @@ -28,12 +26,12 @@ #include <stdarg.h> #include <string.h> +#include <unistd.h> #ifdef SSH_AUDIT_EVENTS #include "audit.h" #include "log.h" -#include "key.h" #include "hostfile.h" #include "auth.h" @@ -133,7 +131,7 @@ audit_connection_from(const char *host, int port) * events and what they mean). */ void -audit_event(ssh_audit_event_t event) +audit_event(struct ssh *ssh, ssh_audit_event_t event) { debug("audit event euid %d user %s event %d (%s)", geteuid(), audit_username(), event, audit_event_lookup(event)); |