summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2012-11-05 17:07:43 +1100
committerDarren Tucker <dtucker@zip.com.au>2012-11-05 17:07:43 +1100
commit737f7aff365a47039fb48dcc06367e59863a4cee (patch)
tree34b7c55840f7be7c392c6bc8edace837fbff50e1
parentf96ff18a9240e38e5d3c671f5f8f341099874aaf (diff)
- (dtucker) [auth2-pubkey.c] wrap paths.h in an ifdef for platforms that
don't have it. Spotted by tim@.
-rw-r--r--ChangeLog2
-rw-r--r--auth2-pubkey.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8cc7c8e7b..ae5557001 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
4 openbsd-compat/openbsd-compat.h] Move the fallback code for setting uids 4 openbsd-compat/openbsd-compat.h] Move the fallback code for setting uids
5 and gids from uidswap.c to the compat library, which allows it to work with 5 and gids from uidswap.c to the compat library, which allows it to work with
6 the new setresuid calls in auth2-pubkey. with tim@, ok djm@ 6 the new setresuid calls in auth2-pubkey. with tim@, ok djm@
7 - (dtucker) [auth2-pubkey.c] wrap paths.h in an ifdef for platforms that
8 don't have it. Spotted by tim@.
7 9
820121104 1020121104
9 - (djm) OpenBSD CVS Sync 11 - (djm) OpenBSD CVS Sync
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 6a6217017..f9cc6c2c6 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -31,7 +31,9 @@
31 31
32#include <errno.h> 32#include <errno.h>
33#include <fcntl.h> 33#include <fcntl.h>
34#include <paths.h> 34#ifdef HAVE_PATHS_H
35# include <paths.h>
36#endif
35#include <pwd.h> 37#include <pwd.h>
36#include <signal.h> 38#include <signal.h>
37#include <stdio.h> 39#include <stdio.h>