- Fixed --with-pid-dir option

diff --git a/CREDITS b/CREDITS
index 13d612902dd61ac95c687c253b99b1db5304f7a0..f0be1263b06c54672533119960e9a6d6c74183c0 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -3,6 +3,7 @@ Tatu Ylonen <ylo@cs.hut.fi> - Creator of SSH
 Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, 
 Theo de Raadt, and Dug Song - Creators of OpenSSH
 
+Andrew Stribblehill <a.d.stribblehill@durham.ac.uk> - Bugfixes
 Andre Lucas <andre.lucas@dial.pipex.com> - Many portability fixes
 Ben Taylor <bent@clark.net> - Solaris debugging and fixes
 Chip Salzenberg <chip@valinux.com> - Assorted patches

diff --git a/ChangeLog b/ChangeLog
index 77501f4e7d25182d16be56e73d5f434f9913e7cb..0ddb5d5be8f760219b451d28f4ab3c5661922f54 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20000118
+ - Fixed --with-pid-dir option
+
 20000117
  - Clean up bsd-bindresvport.c. Use arc4random() for picking initial
    port, ignore EINVAL errors (Linux) when searching for free port.

diff --git a/acconfig.h b/acconfig.h
index 2e12bd47fb9c424c3632d4d55ca726b45641af14..37f4f12070bf4af4a3dbd12a2c781b7fffbf48c4 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -133,7 +133,7 @@
 #undef USER_PATH
 
 /* Specify location of ssh.pid */
-#undef PID_DIR
+#undef PIDDIR
 
 @BOTTOM@
 

diff --git a/configure.in b/configure.in
index b356beb5921d3a58af890cbaf5607d8c0fa032ac..5fdce1803fef37bee9f63112496e3ab637847eee 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -670,7 +670,7 @@ AC_ARG_WITH(pid-dir,
                fi
        ]
 )
-AC_DEFINE_UNQUOTED(PID_DIR, "$piddir")
+AC_DEFINE_UNQUOTED(PIDDIR, "$piddir")
 AC_SUBST(piddir)
 
 dnl Check for mail directory (last resort if we cannot get it from headers)