adapt to new address functions
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9944 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -367,7 +367,10 @@ process (krb5_principal server,
|
|||||||
return;
|
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) {
|
if (ret) {
|
||||||
krb5_warn (context, ret, "krb5_sockaddr2address");
|
krb5_warn (context, ret, "krb5_sockaddr2address");
|
||||||
goto out;
|
goto out;
|
||||||
@@ -444,8 +447,7 @@ doit (krb5_keytab keytab, int port)
|
|||||||
for (i = 0; i < n; ++i) {
|
for (i = 0; i < n; ++i) {
|
||||||
int sa_size;
|
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);
|
sockets[i] = socket (sa->sa_family, SOCK_DGRAM, 0);
|
||||||
if (sockets[i] < 0)
|
if (sockets[i] < 0)
|
||||||
|
@@ -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).
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -61,7 +61,8 @@ gss_address_to_krb5addr(OM_uint32 gss_addr_type,
|
|||||||
return GSS_S_FAILURE;
|
return GSS_S_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
problem = krb5_h_addr2sockaddr (addr_type,
|
problem = krb5_h_addr2sockaddr (gssapi_krb5_context,
|
||||||
|
addr_type,
|
||||||
gss_addr->value,
|
gss_addr->value,
|
||||||
&sa,
|
&sa,
|
||||||
&sa_size,
|
&sa_size,
|
||||||
@@ -69,7 +70,7 @@ gss_address_to_krb5addr(OM_uint32 gss_addr_type,
|
|||||||
if (problem)
|
if (problem)
|
||||||
return GSS_S_FAILURE;
|
return GSS_S_FAILURE;
|
||||||
|
|
||||||
problem = krb5_sockaddr2address (&sa, address);
|
problem = krb5_sockaddr2address (gssapi_krb5_context, &sa, address);
|
||||||
|
|
||||||
return problem;
|
return problem;
|
||||||
}
|
}
|
||||||
|
@@ -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).
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -61,7 +61,8 @@ gss_address_to_krb5addr(OM_uint32 gss_addr_type,
|
|||||||
return GSS_S_FAILURE;
|
return GSS_S_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
problem = krb5_h_addr2sockaddr (addr_type,
|
problem = krb5_h_addr2sockaddr (gssapi_krb5_context,
|
||||||
|
addr_type,
|
||||||
gss_addr->value,
|
gss_addr->value,
|
||||||
&sa,
|
&sa,
|
||||||
&sa_size,
|
&sa_size,
|
||||||
@@ -69,7 +70,7 @@ gss_address_to_krb5addr(OM_uint32 gss_addr_type,
|
|||||||
if (problem)
|
if (problem)
|
||||||
return GSS_S_FAILURE;
|
return GSS_S_FAILURE;
|
||||||
|
|
||||||
problem = krb5_sockaddr2address (&sa, address);
|
problem = krb5_sockaddr2address (gssapi_krb5_context, &sa, address);
|
||||||
|
|
||||||
return problem;
|
return problem;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user