summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-06-06 22:25:15 +0200
committerDarren Tucker <dtucker@zip.com.au>2008-06-06 22:25:15 +0200
commitce38d8234d6969e4c222a0110e80357c2a61162c (patch)
treea05cb6e2f39743b6d0417184d99778f8efd7ad30
parent - (djm) [openbsd-compat/bsd-arc4random.c] Fix math bug that caused bias (diff)
downloadopenssh-ce38d8234d6969e4c222a0110e80357c2a61162c.tar.xz
openssh-ce38d8234d6969e4c222a0110e80357c2a61162c.zip
- (dtucker) [mux.c] Include paths.h inside ifdef HAVE_PATHS_H.
-rw-r--r--ChangeLog5
-rw-r--r--mux.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 727767210..c3c849c22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20080607
+ - (dtucker) [mux.c] Include paths.h inside ifdef HAVE_PATHS_H.
+
20080604
- (djm) [openbsd-compat/bsd-arc4random.c] Fix math bug that caused bias
in arc4random_uniform with upper_bound in (2^30,2*31). Note that
@@ -4028,4 +4031,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4936 2008/06/04 00:54:00 djm Exp $
+$Id: ChangeLog,v 1.4937 2008/06/06 20:25:15 dtucker Exp $
diff --git a/mux.c b/mux.c
index b4465b017..8b9105b04 100644
--- a/mux.c
+++ b/mux.c
@@ -34,7 +34,9 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
+#ifdef HAVE_PATHS_H
#include <paths.h>
+#endif
#ifdef HAVE_UTIL_H
# include <util.h>