summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-12-07 11:38:03 +1100
committerDamien Miller <djm@mindrot.org>2013-12-07 11:38:03 +1100
commit4260828a2958ebe8c96f66d8301dac53f4cde556 (patch)
tree7b8749b73ad58170857d9bae696197b1c5ed5d9d
parenta913442bac8a26fd296a3add51293f8f6f9b3b4c (diff)
downloadopenssh-git-4260828a2958ebe8c96f66d8301dac53f4cde556.tar.gz
- [authfile.c] Conditionalise inclusion of util.h
-rw-r--r--ChangeLog1
-rw-r--r--authfile.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3f9fc6af..9ca70ed1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,7 @@
- [blocks.c ed25519.c fe25519.c fe25519.h ge25519.c ge25519.h]
[ge25519_base.data hash.c sc25519.c sc25519.h verify.c] Fix RCS idents
- [Makefile.in] Add ed25519 sources
+ - [authfile.c] Conditionalise inclusion of util.h
20131205
- (djm) OpenBSD CVS Sync
diff --git a/authfile.c b/authfile.c
index b0fc23e6..3bbc7cbb 100644
--- a/authfile.c
+++ b/authfile.c
@@ -60,7 +60,9 @@
#include <string.h>
#include <unistd.h>
+#ifdef HAVE_UTIL_H
#include <util.h>
+#endif
#include "xmalloc.h"
#include "cipher.h"