(get_key_from_keytab): rename parameter to `out_key' to avoid
conflicting with label. reported by Sean Doran <smd@ebone.net> git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7847 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H<>gskolan
|
* Copyright (c) 1997 - 2000 Kungliga Tekniska H<>gskolan
|
||||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -343,7 +343,7 @@ get_key_from_keytab(krb5_context context,
|
|||||||
krb5_ap_req *ap_req,
|
krb5_ap_req *ap_req,
|
||||||
krb5_const_principal server,
|
krb5_const_principal server,
|
||||||
krb5_keytab keytab,
|
krb5_keytab keytab,
|
||||||
krb5_keyblock **out)
|
krb5_keyblock **out_key)
|
||||||
{
|
{
|
||||||
krb5_keytab_entry entry;
|
krb5_keytab_entry entry;
|
||||||
krb5_error_code ret;
|
krb5_error_code ret;
|
||||||
@@ -368,7 +368,7 @@ get_key_from_keytab(krb5_context context,
|
|||||||
&entry);
|
&entry);
|
||||||
if(ret)
|
if(ret)
|
||||||
goto out;
|
goto out;
|
||||||
ret = krb5_copy_keyblock(context, &entry.keyblock, out);
|
ret = krb5_copy_keyblock(context, &entry.keyblock, out_key);
|
||||||
krb5_kt_free_entry (context, &entry);
|
krb5_kt_free_entry (context, &entry);
|
||||||
out:
|
out:
|
||||||
if(keytab == NULL)
|
if(keytab == NULL)
|
||||||
|
Reference in New Issue
Block a user