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 #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" /* *