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 /sandbox-darwin.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 'sandbox-darwin.c')
| -rw-r--r-- | sandbox-darwin.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sandbox-darwin.c b/sandbox-darwin.c index 35f0c4d1..59b4d286 100644 --- a/sandbox-darwin.c +++ b/sandbox-darwin.c @@ -30,7 +30,8 @@ #include <unistd.h> #include "log.h" -#include "sandbox.h" +#include "ssh-sandbox.h" +#include "monitor.h" #include "xmalloc.h" /* Darwin/OS X sandbox */ |