Leading/trailing colons should not be there based on the variable usage.

Solaris test was incorrect.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7746 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index c90a1c9373f4fdf33e1bc1d743a683e0d1b2cf0c..a8be0ef8809ee81ea1dd170848999fa19a5fc74c 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,9 @@
+Mon Apr  1 10:12:44 1996  Richard Basch  <basch@lehman.com>
+
+       * loginpaths.h: Leading/trailing colons should not be there based
+       on the variable usage in the code.  Also, the tests for Solaris
+       were incorrect.
+
 Sat Mar 23 17:20:00 1996  Sam Hartman  <hartmans@tertius.mit.edu>
 
        * krcp.c (des_write): Use krb5_net_write instead of write, because

diff --git a/src/appl/bsd/loginpaths.h b/src/appl/bsd/loginpaths.h
index ed2c18908289df17708df1e76b33f7124b0d19df..a07b40c2a1dce1cee2be6b36dce2f25263ee2c4d 100644 (file)
--- a/src/appl/bsd/loginpaths.h
+++ b/src/appl/bsd/loginpaths.h
@@ -1,19 +1,19 @@
 /* here are actual path values from each operating system supported. */
 /* LPATH is from rlogin, for login.c; RPATH is from rsh, for rshd.c */
 #ifdef sun
-#ifdef solaris20
-#define RPATH ":/usr/bin"
-#define LPATH "/usr/bin:"
+#ifdef __SVR4
+#define RPATH "/usr/bin"
+#define LPATH "/usr/bin"
 #else
 /* sun3 and sun4 */
-#define LPATH ":/usr/ucb:/bin:/usr/bin"
-#define RPATH ":/usr/ucb:/bin:/usr/bin"
+#define LPATH "/usr/ucb:/bin:/usr/bin"
+#define RPATH "/usr/ucb:/bin:/usr/bin"
 #endif
 #endif
 
 #ifdef __ultrix
-#define LPATH ":/usr/ucb:/bin:/usr/bin"
-#define RPATH ":/usr/ucb:/bin:/usr/bin"
+#define LPATH "/usr/ucb:/bin:/usr/bin"
+#define RPATH "/usr/ucb:/bin:/usr/bin"
 #endif
 
 #ifdef hpux
@@ -23,24 +23,24 @@
 #endif
 
 #ifdef NeXT
-#define LPATH ":/usr/ucb:/bin:/usr/bin:/usr/local/bin"
-#define RPATH "/bin:/usr/ucb:/usr/bin:"
+#define LPATH "/usr/ucb:/bin:/usr/bin:/usr/local/bin"
+#define RPATH "/bin:/usr/ucb:/usr/bin"
 #endif
 
 #ifdef _IBMR2
 /* 3.2.0 */ 
-#define LPATH "/usr/bin:/etc:/usr/sbin:/usr/ucb:/usr/bin/X11:/sbin"
-#define RPATH ":/usr/ucb:/bin:/usr/bin:/usr/bin/X11"
+#define LPATH "/usr/bin:/usr/ucb:/usr/bin/X11"
+#define RPATH "/usr/bin:/usr/ucb:/usr/bin/X11"
 #endif
 
 #ifdef __SCO__
 #define LPATH "/bin:/usr/bin:/usr/dbin:/usr/ldbin"
-#define RPATH "/bin:/usr/bin:/usr/local/bin::"
+#define RPATH "/bin:/usr/bin:/usr/local/bin"
 #endif
 
 #ifdef sgi
-#define LPATH ":/usr/sbin:/usr/bsd:/usr/bin:/bin:/usr/bin/X11"
-#define RPATH ":/usr/sbin:/usr/bsd:/usr/bin:/bin:/usr/bin/X11"
+#define LPATH "/usr/sbin:/usr/bsd:/usr/bin:/bin:/usr/bin/X11"
+#define RPATH "/usr/sbin:/usr/bsd:/usr/bin:/bin:/usr/bin/X11"
 #endif
 
 #ifdef linux
@@ -56,13 +56,13 @@
 #ifdef __alpha
 #ifdef __osf__
 #define LPATH "/usr/bin:."
-#define RPATH "/usr/bin:/bin:"
+#define RPATH "/usr/bin:/bin"
 #endif
 #endif
 
 #ifdef __pyrsoft
 #ifdef MIPSEB
-#define RPATH ":/bin:/usr/bin"
+#define RPATH "/bin:/usr/bin"
 #define LPATH "/usr/bin:/usr/ccs/bin:/usr/ucb:."
 #endif
 #endif
@@ -77,7 +77,7 @@
 #ifndef LPATH
 #ifdef __svr4__
 /* taken from unixware, sirius... */
-#define RPATH ":/bin:/usr/bin:/usr/X/bin"
+#define RPATH "/bin:/usr/bin:/usr/X/bin"
 #define LPATH "/usr/bin:/usr/dbin:/usr/dbin"
 #endif
 #endif