dtlogin: use proper path to getty and /usr/local/bin in path on Linux

diff --git a/cde/programs/dtlogin/config/Xconfig.src b/cde/programs/dtlogin/config/Xconfig.src
index 57f0ec9f3fe2c02ed5f443b2708daa5e604812fe..ad6ba472cff2fb4742f9924ff6ea9f6e93618137 100644 (file)
--- a/cde/programs/dtlogin/config/Xconfig.src
+++ b/cde/programs/dtlogin/config/Xconfig.src
@@ -135,9 +135,7 @@ XCOMM  To specify a default user PATH environment variable.
 XCOMM
 XCOMM  Dtlogin*userPath:          <path>
 
-#if defined(linux)
-Dtlogin*userPath:          /bin:/usr/bin:/sbin:/usr/sbin:CDE_INSTALLATION_TOP/bin
-#elif defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED)
 Dtlogin*userPath:          /bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:CDE_INSTALLATION_TOP/bin
 #endif
 

diff --git a/cde/programs/dtlogin/dm.c b/cde/programs/dtlogin/dm.c
index ca5c21c2210cc2e05735707afe060f79841c56c1..59b99cff5251ba1157c899ea06be298482aa6974 100644 (file)
--- a/cde/programs/dtlogin/dm.c
+++ b/cde/programs/dtlogin/dm.c
@@ -1496,6 +1496,8 @@ SetTitle( char *name, char *ptr )
 #define GETTYPATH "/usr/sbin/getty"
 #elif defined(__OpenBSD__)
 #define GETTYPATH "/usr/libexec/getty"
+#elif defined(__linux)
+#define GETTYPATH "/sbin/getty"
 #elif !defined (__apollo)
 #define GETTYPATH "/etc/getty"
 #endif