From: Lionel Sambuc <lionel@minix3.org>
Date: Mon, 2 Dec 2013 16:40:57 +0000 (+0100)
Subject: include/login_cap.h: merged
X-Git-Tag: v3.3.0~480
X-Git-Url: http://zhaoyanbai.com/repos/man.nsec3hash.html?a=commitdiff_plain;h=78a74622be98573d9faaa33cb488fed38a8afcda;p=minix.git

include/login_cap.h: merged

Change-Id: Ic1e5189a89a1dae2a06b182a4af6a65a75c7e2ce
---

diff --git a/include/login_cap.h b/include/login_cap.h
index 007e98e93..d1dc7d054 100644
--- a/include/login_cap.h
+++ b/include/login_cap.h
@@ -43,9 +43,7 @@
 #define	_PATH_LOGIN_CONF	"/etc/login.conf"
 
 #define	LOGIN_OSETGROUP		0x0001	/* Obsolete setgroup */
-#ifndef __minix
 #define	LOGIN_SETLOGIN		0x0002	/* Set login */
-#endif
 #define	LOGIN_SETPATH		0x0004	/* Set path */
 #define	LOGIN_SETPRIORITY	0x0008	/* Set priority */
 #define	LOGIN_SETRESOURCES	0x0010	/* Set resource limits */
diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c
index 915884eaa..4abab080f 100644
--- a/lib/libutil/login_cap.c
+++ b/lib/libutil/login_cap.c
@@ -575,9 +575,6 @@ setusercontext(login_cap_t *lc, struct passwd *pwd, uid_t uid, u_int flags)
 
 	if (!lc)
 		flc = lc = login_getclass(pwd ? pwd->pw_class : NULL);
-#ifdef __minix
-#define LOGIN_SETLOGIN 0
-#endif
 
 	/*
 	 * Without the pwd entry being passed we cannot set either