Remove call to krb5_os_localaddr(), since get_in_tkt will default

correctly.

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

diff --git a/src/clients/ksu/ChangeLog b/src/clients/ksu/ChangeLog
index d4bbbd4f07c167bb5edf3e91660967a3fcac279c..7ed995d38a0512994e3a019ca7c3c0062771b96b 100644 (file)
--- a/src/clients/ksu/ChangeLog
+++ b/src/clients/ksu/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 18 15:54:41 1996  Theodore Y. Ts'o  <tytso@mit.edu>
+
+       * krb_auth_su.c (krb5_get_tkt_via_passwd): Remove call to
+               krb5_os_localaddr(), since get_in_tkt will default correctly.
+
 Tue Sep 10 14:15:02 1996  Tom Yu  <tlyu@mit.edu>
 
        * ksu.M: remove ".so man1/header.doc"

diff --git a/src/clients/ksu/krb_auth_su.c b/src/clients/ksu/krb_auth_su.c
index de7d055007d4f7b18ac4c85308fc6cc5e6311224..01cd77110ab1c708e1bd939cbfaaef8a01499635 100644 (file)
--- a/src/clients/ksu/krb_auth_su.c
+++ b/src/clients/ksu/krb_auth_su.c
@@ -392,7 +392,6 @@ krb5_boolean krb5_get_tkt_via_passwd (context, ccache, client, server,
     opt_info *options;
     krb5_boolean *zero_password;
 {
-    krb5_address **my_addresses;
     krb5_error_code code;
     krb5_creds my_creds;
     krb5_timestamp now;
@@ -419,13 +418,6 @@ krb5_boolean krb5_get_tkt_via_passwd (context, ccache, client, server,
        return (FALSE); 
     }  
 
-    code = krb5_os_localaddr(context, &my_addresses);
-
-    if (code != 0) {
-       com_err (prog_name, code, "when getting my address");
-       return (FALSE); 
-    }
-
     if ((code = krb5_timeofday(context, &now))) {
        com_err(prog_name, code, "while getting time of day");
        return (FALSE); 
@@ -450,7 +442,6 @@ krb5_boolean krb5_get_tkt_via_passwd (context, ccache, client, server,
              com_err(prog_name, code, "while reading password for '%s'\n",
                      client_name);
              memset(password, 0, sizeof(password));
-             krb5_free_addresses(context, my_addresses);
              return (FALSE); 
         }
 
@@ -458,18 +449,15 @@ krb5_boolean krb5_get_tkt_via_passwd (context, ccache, client, server,
              fprintf(stderr, "No password given\n");
              *zero_password = TRUE;
              memset(password, 0, sizeof(password));
-             krb5_free_addresses(context, my_addresses);
              return (FALSE); 
         }
 
         code = krb5_get_in_tkt_with_password(context, options->opt, 
-                                             my_addresses, NULL, preauth_ptr,
+                                             0, NULL, preauth_ptr,
                                              password, *ccache, &my_creds, 0);
         memset(password, 0, sizeof(password));
 
     
-    krb5_free_addresses(context, my_addresses);
-    
     if (code) {
        if (code == KRB5KRB_AP_ERR_BAD_INTEGRITY)
            fprintf (stderr, "%s: Password incorrect\n", prog_name);