svn commit: r223434 - head/libexec/ftpd
Edward Tomasz Napierala
trasz at FreeBSD.org
Wed Jun 22 19:14:50 UTC 2011
Author: trasz
Date: Wed Jun 22 19:14:49 2011
New Revision: 223434
URL: http://svn.freebsd.org/changeset/base/223434
Log:
Add LOGIN_SETCPUMASK and LOGIN_SETLOGINCLASS to the setusercontext(3)
calls in ftpd(8).
Modified:
head/libexec/ftpd/ftpd.c
Modified: head/libexec/ftpd/ftpd.c
==============================================================================
--- head/libexec/ftpd/ftpd.c Wed Jun 22 18:48:07 2011 (r223433)
+++ head/libexec/ftpd/ftpd.c Wed Jun 22 19:14:49 2011 (r223434)
@@ -1191,9 +1191,9 @@ end_login(void)
ftpd_logwtmp(wtmpid, NULL, NULL);
pw = NULL;
#ifdef LOGIN_CAP
- setusercontext(NULL, getpwuid(0), 0,
- LOGIN_SETPRIORITY|LOGIN_SETRESOURCES|LOGIN_SETUMASK|
- LOGIN_SETMAC);
+ setusercontext(NULL, getpwuid(0), 0, LOGIN_SETALL & ~(LOGIN_SETLOGIN |
+ LOGIN_SETUSER | LOGIN_SETGROUP | LOGIN_SETPATH |
+ LOGIN_SETENV));
#endif
#ifdef USE_PAM
if (pamh) {
@@ -1465,9 +1465,8 @@ skip:
return;
}
}
- setusercontext(lc, pw, 0,
- LOGIN_SETLOGIN|LOGIN_SETGROUP|LOGIN_SETPRIORITY|
- LOGIN_SETRESOURCES|LOGIN_SETUMASK|LOGIN_SETMAC);
+ setusercontext(lc, pw, 0, LOGIN_SETALL &
+ ~(LOGIN_SETUSER | LOGIN_SETPATH | LOGIN_SETENV));
#else
setlogin(pw->pw_name);
(void) initgroups(pw->pw_name, pw->pw_gid);
More information about the svn-src-all
mailing list