* server.c, client.c : Use krb5_auth_con_genaddrs() instead of

		krb5_auth_con_setaddrs().

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

1 files changed, 4 insertions, 11 deletions

diff --git a/src/appl/user_user/server.c b/src/appl/user_user/server.c
index 175fce123..f20347a8e 100644
--- a/src/appl/user_user/server.c
+++ b/src/appl/user_user/server.c
@@ -47,7 +47,6 @@ char *argv[];
   int l, sock = 0;
   int retval;
   struct sockaddr_in l_inaddr, f_inaddr;	/* local, foreign address */
-  krb5_address laddr, faddr;
   krb5_creds creds, *new_creds;
   krb5_ccache cc;
   krb5_data msgtext, msg;
@@ -147,10 +146,6 @@ char *argv[];
       return 6;
     }
 #endif
-  faddr.addrtype = ADDRTYPE_INET;
-  faddr.length = sizeof (f_inaddr.sin_addr);
-  faddr.contents = (krb5_octet *)&f_inaddr.sin_addr;
-
   l = sizeof(l_inaddr);
   if (getsockname(0, (struct sockaddr *)&l_inaddr, &l) == -1)
     {
@@ -158,10 +153,6 @@ char *argv[];
       return 6;
     }
 
-  laddr.addrtype = ADDRTYPE_INET;
-  laddr.length = sizeof (l_inaddr.sin_addr);
-  laddr.contents = (krb5_octet *)&l_inaddr.sin_addr;
-
   /* send a ticket/authenticator to the other side, so it can get the key
      we're using for the krb_safe below. */
 
@@ -176,8 +167,10 @@ char *argv[];
 	return 8;
     }
 
-    if (retval = krb5_auth_con_setaddrs(context, auth_context, &laddr, &faddr)){
-        com_err("uu-server", retval, "setting addresses for auth_context");
+    if (retval = krb5_auth_con_genaddrs(context, auth_context, sock,
+				KRB5_AUTH_CONTEXT_GENERATE_LOCAL_FULL_ADDR |
+				KRB5_AUTH_CONTEXT_GENERATE_REMOTE_FULL_ADDR)) {
+        com_err("uu-server", retval, "generating addrs for auth_context");
         return 9;
     }