- (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>

diff --git a/configure.in b/configure.in
index 0a1e41d284f4cba2c3d48bf1bdf309d481ffbf54..064450b49891ea5b3ae147b3cdd664fb7b0473f5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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 3f116bdbb68524fc4df824a1fe4edc8a29c377b8..75415f3a56d2e6dfe7ad2866302387ca30486ebf 100644 (file)
--- 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