From 4aaf97e1b0133bb834259afb71cf037028391eac Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Mon, 14 May 2001 06:19:16 +0000 Subject: [PATCH] adapt to new address functions git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9944 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kpasswd/kpasswdd.c | 8 +++++--- lib/gssapi/address_to_krb5addr.c | 7 ++++--- lib/gssapi/krb5/address_to_krb5addr.c | 7 ++++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/kpasswd/kpasswdd.c b/kpasswd/kpasswdd.c index 4e325a46f..938db963c 100644 --- a/kpasswd/kpasswdd.c +++ b/kpasswd/kpasswdd.c @@ -367,7 +367,10 @@ process (krb5_principal server, return; } - ret = krb5_sockaddr2address (sa, &other_addr); + krb5_auth_con_setflags (context, auth_context, + KRB5_AUTH_CONTEXT_DO_SEQUENCE); + + ret = krb5_sockaddr2address (context, sa, &other_addr); if (ret) { krb5_warn (context, ret, "krb5_sockaddr2address"); goto out; @@ -444,8 +447,7 @@ doit (krb5_keytab keytab, int port) for (i = 0; i < n; ++i) { int sa_size; - krb5_addr2sockaddr (&addrs.val[i], sa, &sa_size, port); - + krb5_addr2sockaddr (context, &addrs.val[i], sa, &sa_size, port); sockets[i] = socket (sa->sa_family, SOCK_DGRAM, 0); if (sockets[i] < 0) diff --git a/lib/gssapi/address_to_krb5addr.c b/lib/gssapi/address_to_krb5addr.c index 1d8c1b6a5..c8041aa93 100644 --- a/lib/gssapi/address_to_krb5addr.c +++ b/lib/gssapi/address_to_krb5addr.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 Kungliga Tekniska Högskolan + * Copyright (c) 2000 - 2001 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -61,7 +61,8 @@ gss_address_to_krb5addr(OM_uint32 gss_addr_type, return GSS_S_FAILURE; } - problem = krb5_h_addr2sockaddr (addr_type, + problem = krb5_h_addr2sockaddr (gssapi_krb5_context, + addr_type, gss_addr->value, &sa, &sa_size, @@ -69,7 +70,7 @@ gss_address_to_krb5addr(OM_uint32 gss_addr_type, if (problem) return GSS_S_FAILURE; - problem = krb5_sockaddr2address (&sa, address); + problem = krb5_sockaddr2address (gssapi_krb5_context, &sa, address); return problem; } diff --git a/lib/gssapi/krb5/address_to_krb5addr.c b/lib/gssapi/krb5/address_to_krb5addr.c index 1d8c1b6a5..c8041aa93 100644 --- a/lib/gssapi/krb5/address_to_krb5addr.c +++ b/lib/gssapi/krb5/address_to_krb5addr.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 Kungliga Tekniska Högskolan + * Copyright (c) 2000 - 2001 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -61,7 +61,8 @@ gss_address_to_krb5addr(OM_uint32 gss_addr_type, return GSS_S_FAILURE; } - problem = krb5_h_addr2sockaddr (addr_type, + problem = krb5_h_addr2sockaddr (gssapi_krb5_context, + addr_type, gss_addr->value, &sa, &sa_size, @@ -69,7 +70,7 @@ gss_address_to_krb5addr(OM_uint32 gss_addr_type, if (problem) return GSS_S_FAILURE; - problem = krb5_sockaddr2address (&sa, address); + problem = krb5_sockaddr2address (gssapi_krb5_context, &sa, address); return problem; }