- (djm) Open Server 5 doesn't need BROKEN_SAVED_UIDS. Patch from Tim Rice

   <tim@multitalents.net>
 - (djm) Avoid multiple definition of _PATH_LS. Patch from Tim Rice
   <tim@multitalents.net>

2 files changed, 3 insertions, 2 deletions

diff --git a/configure.in b/configure.in
index c79ae381e..9d6b0a737 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.255 2001/02/26 21:39:07 djm Exp $
+# $Id: configure.in,v 1.256 2001/02/27 03:42:48 djm Exp $
 
 AC_INIT(ssh.c)
 
@@ -257,7 +257,6 @@ mips-sony-bsd|mips-sony-newsos4)
         AC_DEFINE(HAVE_SCO_PROTECTED_PW)
         AC_DEFINE(DISABLE_SHADOW)
         AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
-        AC_DEFINE(BROKEN_SAVED_UIDS)
         AC_CHECK_FUNCS(getluid setluid)
         ;;
 *-dec-osf*)
diff --git a/pathnames.h b/pathnames.h
index 3f116bdbb..75415f3a5 100644
--- a/pathnames.h
+++ b/pathnames.h
@@ -120,7 +120,9 @@
 #ifndef _PATH_SFTP_SERVER
 #define _PATH_SFTP_SERVER               "/usr/libexec/sftp-server"
 #endif
+#ifndef _PATH_LS
 #define _PATH_LS                        "ls"
+#endif
 
 /* path to login program */
 #ifndef LOGIN_PROGRAM