* krlogin.c (main): Don't output debugging messages if debugging wasn't turned on

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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 31bd1b4a0aca40eea7676f4765c8ed20fae8b79e..9b9c7c8d020b9aaa431729f8cf98ef7f51ee902e 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-28  Ken Raeburn  <raeburn@mit.edu>
+
+       * krlogin.c (main): Don't output debugging messages if debugging
+       wasn't turned on.
+
 2000-02-10  Ken Raeburn  <raeburn@mit.edu>
 
        * login.c (main): Only destroy xtra_creds if non-null.  (Patch

diff --git a/src/appl/bsd/krlogin.c b/src/appl/bsd/krlogin.c
index 061109eb5fbc248ea6b4ccd2027062edec993a6e..da4a8898057a0161068335a5070f4359a6176b08 100644 (file)
--- a/src/appl/bsd/krlogin.c
+++ b/src/appl/bsd/krlogin.c
@@ -376,7 +376,7 @@ main(argc, argv)
     MSG_DAT v4_msg_data;
 #endif
 #endif
-    int debug_port = 0;
+    int port, debug_port = 0;
    
     memset(&defaultservent, 0, sizeof(struct servent));
     if (strrchr(argv[0], '/'))
@@ -521,7 +521,9 @@ main(argc, argv)
 #endif
 
 
-    if(debug_port == 0) {
+    if (debug_port)
+      port = debug_port;
+    else {
 #ifdef KERBEROS
     /*
      * if there is an entry in /etc/services for Kerberos login,
@@ -544,7 +546,7 @@ main(argc, argv)
       }
 #endif /* KERBEROS */
 
-      debug_port = sp->s_port;
+      port = sp->s_port;
     }
 
 
@@ -621,7 +623,7 @@ main(argc, argv)
     if (Fflag)
       authopts |= OPTS_FORWARDABLE_CREDS;
 
-    status = kcmd(&sock, &host, debug_port,
+    status = kcmd(&sock, &host, port,
                  null_local_username ? "" : pwd->pw_name,
                  name ? name : pwd->pw_name, term,
                  0, "host", krb_realm,
@@ -635,7 +637,7 @@ main(argc, argv)
     if (status) {
 #ifdef KRB5_KRB4_COMPAT
        fprintf(stderr, "Trying krb4 rlogin...\n");
-       status = k4cmd(&sock, &host, debug_port,
+       status = k4cmd(&sock, &host, port,
                       null_local_username ? "" : pwd->pw_name,
                       name ? name : pwd->pw_name, term,
                       0, &v4_ticket, "rcmd", krb_realm,
@@ -666,7 +668,7 @@ main(argc, argv)
     rem = sock;
     
 #else
-    rem = rcmd(&host, debug_port,
+    rem = rcmd(&host, port,
               null_local_username ? "" : pwd->pw_name,
               name ? name : pwd->pw_name, term, 0);
 #endif /* KERBEROS */