summaryrefslogtreecommitdiffstats
path: root/src/lib/krb5/krb/gic_keytab.c
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2013-03-24 01:28:13 -0400
committerGreg Hudson <ghudson@mit.edu>2013-03-24 01:28:13 -0400
commit6c8fed1bb850b92d471b0741a452bb56354fc0e9 (patch)
treee170a09d8457a58976562d1b0f369348d2198416 /src/lib/krb5/krb/gic_keytab.c
parent81fde7e475b02986c1aff88766cc48882004d5dc (diff)
downloadkrb5-6c8fed1bb850b92d471b0741a452bb56354fc0e9.tar.gz
krb5-6c8fed1bb850b92d471b0741a452bb56354fc0e9.tar.xz
krb5-6c8fed1bb850b92d471b0741a452bb56354fc0e9.zip
Move a bunch of stuff out of k5-int.h
Move internal declarations from k5-int.h to more localized headers (like int-proto.h) where appropriate. Rename many symbols whose prototypes were moved to use the k5_ prefix instead of krb5int_. Remove some unused declarations or move them to the single source file they were needed in. Remove krb5_creds_compare since it isn't used any more.
Diffstat (limited to 'src/lib/krb5/krb/gic_keytab.c')
-rw-r--r--src/lib/krb5/krb/gic_keytab.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/lib/krb5/krb/gic_keytab.c b/src/lib/krb5/krb/gic_keytab.c
index 9eef3750d..4c2942e3f 100644
--- a/src/lib/krb5/krb/gic_keytab.c
+++ b/src/lib/krb5/krb/gic_keytab.c
@@ -338,9 +338,8 @@ krb5_get_in_tkt_with_keytab(krb5_context context, krb5_flags options,
krb5_principal client_princ, server_princ;
int use_master = 0;
- retval = krb5int_populate_gic_opt(context, &opts,
- options, addrs, ktypes,
- pre_auth_types, creds);
+ retval = k5_populate_gic_opt(context, &opts, options, addrs, ktypes,
+ pre_auth_types, creds);
if (retval)
return retval;
@@ -356,11 +355,10 @@ krb5_get_in_tkt_with_keytab(krb5_context context, krb5_flags options,
goto cleanup;
server_princ = creds->server;
client_princ = creds->client;
- retval = krb5int_get_init_creds(context, creds, creds->client,
- krb5_prompter_posix, NULL,
- 0, server, opts,
- get_as_key_keytab, (void *)keytab,
- &use_master, ret_as_reply);
+ retval = k5_get_init_creds(context, creds, creds->client,
+ krb5_prompter_posix, NULL, 0, server, opts,
+ get_as_key_keytab, (void *)keytab, &use_master,
+ ret_as_reply);
krb5_free_unparsed_name( context, server);
if (retval) {
goto cleanup;