adapt to new address functions

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9944 ec53bebd-3082-4978-b11e-865c3cabbd6b

diff --git a/kpasswd/kpasswdd.c b/kpasswd/kpasswdd.c
index 4e325a46f522610379a63fb1b909943c3d01897c..938db963cc66821653e7e9df13a02ee01676b576 100644 (file)
--- 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 1d8c1b6a5c34b973d599eb66d2cd7cdf81f8ea69..c8041aa9362600f5cb25c5d457a5f980a7406ce4 100644 (file)
--- 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 1d8c1b6a5c34b973d599eb66d2cd7cdf81f8ea69..c8041aa9362600f5cb25c5d457a5f980a7406ce4 100644 (file)
--- 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;  
 }