summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-07-15 17:58:34 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-07-15 17:58:34 +0000
commit938b8285661f56181405b8c1637b31bf7b618de0 (patch)
treeea21f21863e80b2ae8967db5f62f1c9589cce4d6
parentc491b0def1ac7b468bc6ce3ceffc3493b102ca1d (diff)
- (bal) Remove unused tty defined in do_setusercontext() pointed out by
dtucker@zip.com.au plus a a more KNF since I am near it.
-rw-r--r--ChangeLog4
-rw-r--r--session.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index bd2370263..28c0a91b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
6 - markus@cvs.openbsd.org 2002/07/12 15:50:17 6 - markus@cvs.openbsd.org 2002/07/12 15:50:17
7 [cipher.c] 7 [cipher.c]
8 EVP_CIPH_CUSTOM_IV for our own rijndael 8 EVP_CIPH_CUSTOM_IV for our own rijndael
9 - (bal) Remove unused tty defined in do_setusercontext() pointed out by
10 dtucker@zip.com.au plus a a more KNF since I am near it.
9 11
1020020714 1220020714
11 - (tim) [Makefile.in] replace "id sshd" with "sshd -t" 13 - (tim) [Makefile.in] replace "id sshd" with "sshd -t"
@@ -1370,4 +1372,4 @@
1370 - (stevesk) entropy.c: typo in debug message 1372 - (stevesk) entropy.c: typo in debug message
1371 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1373 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1372 1374
1373$Id: ChangeLog,v 1.2368 2002/07/15 17:52:49 mouring Exp $ 1375$Id: ChangeLog,v 1.2369 2002/07/15 17:58:34 mouring Exp $
diff --git a/session.c b/session.c
index 774e6168a..5fb1ace00 100644
--- a/session.c
+++ b/session.c
@@ -1159,8 +1159,6 @@ do_nologin(struct passwd *pw)
1159void 1159void
1160do_setusercontext(struct passwd *pw) 1160do_setusercontext(struct passwd *pw)
1161{ 1161{
1162 char tty='\0';
1163
1164#ifdef HAVE_CYGWIN 1162#ifdef HAVE_CYGWIN
1165 if (is_winnt) { 1163 if (is_winnt) {
1166#else /* HAVE_CYGWIN */ 1164#else /* HAVE_CYGWIN */
@@ -1170,9 +1168,9 @@ do_setusercontext(struct passwd *pw)
1170 setpcred(pw->pw_name); 1168 setpcred(pw->pw_name);
1171#endif /* HAVE_SETPCRED */ 1169#endif /* HAVE_SETPCRED */
1172#ifdef HAVE_LOGIN_CAP 1170#ifdef HAVE_LOGIN_CAP
1173#ifdef __bsdi__ 1171# ifdef __bsdi__
1174 setpgid(0, 0); 1172 setpgid(0, 0);
1175#endif 1173# endif
1176 if (setusercontext(lc, pw, pw->pw_uid, 1174 if (setusercontext(lc, pw, pw->pw_uid,
1177 (LOGIN_SETALL & ~LOGIN_SETPATH)) < 0) { 1175 (LOGIN_SETALL & ~LOGIN_SETPATH)) < 0) {
1178 perror("unable to set user context"); 1176 perror("unable to set user context");