----------------------------------------------------------------------

automatically CVS: CVS: Committing in .  CVS: CVS: Modified Files:
----------------------------------------------------------------------
login.krb5: Don't display warning about no tickets being obtained if -F, -f or -k
specified.

CVS:

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6971 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 598739aec384c7607c8ad91b0242c023ae7422f3..b56cfaa307c4846a5182ba1bdc5ae7fe0ab88e40 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 16 17:27:43 1995  Sam Hartman  <hartmans@tertius.mit.edu>
+
+       * login.c (main): Don't print warning about no tickets obtained if we didn't ask for a password.  Also, define LOGNAME for so sysvish systems are happy.  Patch from ramus@nersc.gov.
+
 Wed Sep 06 14:20:57 1995   Chris Provenzano (proven@mit.edu)
 
         * krcp.c, krlogin.c, krlogind.c, krsh.c, krshd.c : 

diff --git a/src/appl/bsd/login.c b/src/appl/bsd/login.c
index a1f87b76cc398e541273c71256f25b23bc657053..8600f9531a8046f416fa0f8b2d7a31f719647ff1 100644 (file)
--- a/src/appl/bsd/login.c
+++ b/src/appl/bsd/login.c
@@ -894,6 +894,7 @@ bad_login:
        setenv("PATH", LPATH, 0);
        setenv("USER", pwd->pw_name, 0);
        setenv("SHELL", pwd->pw_shell, 0);
+       setenv("LOGNAME", pwd->pw_name, 0);
 
        if (term[0] == '\0')
                (void) strncpy(term, stypeof(tty), sizeof(term));
@@ -960,7 +961,7 @@ bad_login:
                struct stat st;
 
 #ifdef KRB4
-               if (!krbflag)
+               if (!krbflag && !fflag && !Fflag && !eflag )
                    printf("\nWarning: No Kerberos tickets obtained.\n\n");
 #endif /* KRB4 */
                motd();