From b927ccbbf1a1f3c0da899e60837b061c287e6209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Thu, 27 Apr 2006 09:17:01 +0000
Subject: [PATCH] Include "loginpaths.h"

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17302 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/login/login_locl.h | 12 +-----------
 appl/rsh/rsh_locl.h     |  8 +-------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/appl/login/login_locl.h b/appl/login/login_locl.h
index da6ae97ba..4d7f2943b 100644
--- a/appl/login/login_locl.h
+++ b/appl/login/login_locl.h
@@ -111,9 +111,6 @@
 #ifndef _PATH_DEV
 #define _PATH_DEV "/dev/"
 #endif
-#ifndef _PATH_NOLOGIN
-#define _PATH_NOLOGIN "/etc/nologin"
-#endif
 #ifndef _PATH_WTMP
 #ifdef WTMP_FILE
 #define _PATH_WTMP WTMP_FILE
@@ -137,18 +134,11 @@
 #define _PATH_LOGIN_CONF SYSCONFDIR "/login.conf"
 #endif /* _PATH_LOGIN_CONF */
 
-#ifndef _PATH_ETC_ENVIRONMENT
-#define _PATH_ETC_ENVIRONMENT SYSCONFDIR "/environment"
-#endif
-
 #ifndef _PATH_DEFPATH
 #define _PATH_DEFPATH "/usr/bin:/bin"
 #endif
 
-#ifndef _PATH_LIMITS_CONF
-#define _PATH_LIMITS_CONF "/etc/security/limits.conf"
-#endif
-
+#include "loginpaths.h"
 
 struct spwd;
 
diff --git a/appl/rsh/rsh_locl.h b/appl/rsh/rsh_locl.h
index 261d585bc..7c87af9f1 100644
--- a/appl/rsh/rsh_locl.h
+++ b/appl/rsh/rsh_locl.h
@@ -114,10 +114,6 @@ struct krb5_dh_moduli;
 #include <kafs.h>
 #endif
 
-#ifndef _PATH_NOLOGIN
-#define _PATH_NOLOGIN   "/etc/nologin"
-#endif
-
 #ifndef _PATH_BSHELL
 #define _PATH_BSHELL	"/bin/sh"
 #endif
@@ -126,9 +122,7 @@ struct krb5_dh_moduli;
 #define _PATH_DEFPATH	"/usr/bin:/bin"
 #endif
 
-#ifndef _PATH_ETC_ENVIRONMENT
-#define _PATH_ETC_ENVIRONMENT SYSCONFDIR "/environment"
-#endif
+#include "loginpaths.h"
 
 /*
  *