- (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.

diff --git a/ChangeLog b/ChangeLog
index bd2370263f84ecefce1d691451fae0148d1326b9..28c0a91b22445cc064b3152a22daa78374975db9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
    - markus@cvs.openbsd.org 2002/07/12 15:50:17
      [cipher.c]
      EVP_CIPH_CUSTOM_IV for our own rijndael
+ - (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.
 
 20020714
  - (tim) [Makefile.in] replace "id sshd" with "sshd -t"
@@ -1370,4 +1372,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2368 2002/07/15 17:52:49 mouring Exp $
+$Id: ChangeLog,v 1.2369 2002/07/15 17:58:34 mouring Exp $

diff --git a/session.c b/session.c
index 774e6168aa21d3684d72ed14805b60e934081578..5fb1ace006256148f5eb1b5fd4ab27584a56a739 100644 (file)
--- a/session.c
+++ b/session.c
@@ -1159,8 +1159,6 @@ do_nologin(struct passwd *pw)
 void
 do_setusercontext(struct passwd *pw)
 {
-       char tty='\0';
-
 #ifdef HAVE_CYGWIN
        if (is_winnt) {
 #else /* HAVE_CYGWIN */
@@ -1170,9 +1168,9 @@ do_setusercontext(struct passwd *pw)
                setpcred(pw->pw_name);
 #endif /* HAVE_SETPCRED */
 #ifdef HAVE_LOGIN_CAP
-#ifdef __bsdi__
+# ifdef __bsdi__
                setpgid(0, 0);
-#endif
+# endif
                if (setusercontext(lc, pw, pw->pw_uid,
                    (LOGIN_SETALL & ~LOGIN_SETPATH)) < 0) {
                        perror("unable to set user context");