aboutsummaryrefslogtreecommitdiff
path: root/crypto/heimdal/appl/login/login_locl.h
diff options
context:
space:
mode:
authorDoug Rabson <dfr@FreeBSD.org>2008-05-07 13:39:42 +0000
committerDoug Rabson <dfr@FreeBSD.org>2008-05-07 13:39:42 +0000
commit4fe54d7c6acb302aacc6ac18798804b26c882c13 (patch)
tree07a0d6761d1b42410a27e4c7d583b766d6671f80 /crypto/heimdal/appl/login/login_locl.h
parent86067c77149c346cf467f1db4307a68c3632aa23 (diff)
parentc19800e8cd5640693f36f2040db4ab5e8d738146 (diff)
downloadsrc-4fe54d7c6acb302aacc6ac18798804b26c882c13.tar.gz
src-4fe54d7c6acb302aacc6ac18798804b26c882c13.zip
This commit was generated by cvs2svn to compensate for changes in r178825,
which included commits to RCS files with non-trunk default branches.
Notes
Notes: svn path=/head/; revision=178826
Diffstat (limited to 'crypto/heimdal/appl/login/login_locl.h')
-rw-r--r--crypto/heimdal/appl/login/login_locl.h13
1 files changed, 4 insertions, 9 deletions
diff --git a/crypto/heimdal/appl/login/login_locl.h b/crypto/heimdal/appl/login/login_locl.h
index cc1d92021efd..08b960c9c719 100644
--- a/crypto/heimdal/appl/login/login_locl.h
+++ b/crypto/heimdal/appl/login/login_locl.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2005 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*/
-/* $Id: login_locl.h,v 1.24 2002/08/12 15:09:15 joda Exp $ */
+/* $Id: login_locl.h 17302 2006-04-27 09:17:01Z lha $ */
#ifndef __LOGIN_LOCL_H__
#define __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,14 +134,12 @@
#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
+#include "loginpaths.h"
+
struct spwd;
extern char **env;