summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker <dtucker>2014-01-17 13:03:57 +0000
committerdtucker <dtucker>2014-01-17 13:03:57 +0000
commit259705ddec362633eb56606747d00eb3ff5e6619 (patch)
tree2b28bf27276eaa04818cd6a5cf9f86662511a03b
parentb764c30d4ceee15808071bbdcd2d2c9a2fef9787 (diff)
downloadopenssh-259705ddec362633eb56606747d00eb3ff5e6619.tar.gz
- (dtucker) [readconf.c] Wrap paths.h inside an ifdef. Allows building on
Solaris.
-rw-r--r--ChangeLog2
-rw-r--r--readconf.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fa793d78..0af27d08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,8 @@
- (dtucker) [configure.ac] Also look in inttypes.h for uintXX_t types.
- (dtucker) [configure.ac] Have --without-hardening not turn off
stack-protector since that has a separate flag that's been around a while.
+ - (dtucker) [readconf.c] Wrap paths.h inside an ifdef. Allows building on
+ Solaris.
20140118
- (djm) OpenBSD CVS Sync
diff --git a/readconf.c b/readconf.c
index 08e16852..9c7e73d7 100644
--- a/readconf.c
+++ b/readconf.c
@@ -27,7 +27,9 @@
#include <errno.h>
#include <fcntl.h>
#include <netdb.h>
-#include <paths.h>
+#ifdef HAVE_PATHS_H
+# include <paths.h>
+#endif
#include <pwd.h>
#include <signal.h>
#include <stdarg.h>