svn rev #23590: trunk/src/lib/krb5/ krb/
tsitkova@MIT.EDU
tsitkova at MIT.EDU
Tue Jan 5 16:11:03 EST 2010
http://src.mit.edu/fisheye/changelog/krb5/?cs=23590
Commit By: tsitkova
Log Message:
Rename krb5int_tgtname into krb5_tgtname as an internal function
Changed Files:
U trunk/src/lib/krb5/krb/fast.c
U trunk/src/lib/krb5/krb/gc_frm_kdc.c
U trunk/src/lib/krb5/krb/int-proto.h
U trunk/src/lib/krb5/krb/s4u_creds.c
U trunk/src/lib/krb5/krb/tgtname.c
U trunk/src/lib/krb5/krb/walk_rtree.c
U trunk/src/lib/krb5/libkrb5.exports
Modified: trunk/src/lib/krb5/krb/fast.c
===================================================================
--- trunk/src/lib/krb5/krb/fast.c 2010-01-05 04:48:57 UTC (rev 23589)
+++ trunk/src/lib/krb5/krb/fast.c 2010-01-05 21:11:03 UTC (rev 23590)
@@ -148,7 +148,7 @@
retval = krb5_cc_resolve(context, opte->opt_private->fast_ccache_name,
&ccache);
if (retval == 0) {
- retval = krb5_tgtname(context, target_realm, target_realm,
+ retval = krb5int_tgtname(context, target_realm, target_realm,
&target_principal);
}
if (retval == 0) {
Modified: trunk/src/lib/krb5/krb/gc_frm_kdc.c
===================================================================
--- trunk/src/lib/krb5/krb/gc_frm_kdc.c 2010-01-05 04:48:57 UTC (rev 23589)
+++ trunk/src/lib/krb5/krb/gc_frm_kdc.c 2010-01-05 21:11:03 UTC (rev 23590)
@@ -293,7 +293,7 @@
* krbtgt/realm_of(DST)@realm_of(SRC) as the server principal. Zeroes
* MCREDS first, does not allocate MCREDS, and cleans MCREDS on
* failure. The peculiar ordering of DST and SRC args is for
- * consistency with krb5_tgtname().
+ * consistency with krb5int_tgtname().
*/
static krb5_error_code
tgt_mcred(krb5_context ctx, krb5_principal client,
@@ -309,7 +309,7 @@
if (retval)
goto cleanup;
- retval = krb5_tgtname(ctx, krb5_princ_realm(ctx, dst),
+ retval = krb5int_tgtname(ctx, krb5_princ_realm(ctx, dst),
krb5_princ_realm(ctx, src), &mcreds->server);
if (retval)
goto cleanup;
@@ -547,7 +547,7 @@
if (retval)
goto cleanup;
- retval = krb5_tgtname(ts->ctx, rdst, rsrc, &mcreds->server);
+ retval = krb5int_tgtname(ts->ctx, rdst, rsrc, &mcreds->server);
if (retval)
goto cleanup;
@@ -801,7 +801,7 @@
nxt_tgt = NULL;
memset(&mcred, 0, sizeof(mcred));
rsrc = krb5_princ_component(ts->ctx, cur_tgt->server, 1);
- retval = krb5_tgtname(ts->ctx, rdst, rsrc, &mcred.server);
+ retval = krb5int_tgtname(ts->ctx, rdst, rsrc, &mcred.server);
if (retval)
goto cleanup;
mcred.client = client;
Modified: trunk/src/lib/krb5/krb/int-proto.h
===================================================================
--- trunk/src/lib/krb5/krb/int-proto.h 2010-01-05 04:48:57 UTC (rev 23589)
+++ trunk/src/lib/krb5/krb/int-proto.h 2010-01-05 21:11:03 UTC (rev 23590)
@@ -33,7 +33,7 @@
#define KRB5_INT_FUNC_PROTO__
krb5_error_code
-krb5_tgtname(krb5_context context, const krb5_data *, const krb5_data *,
+krb5int_tgtname(krb5_context context, const krb5_data *, const krb5_data *,
krb5_principal *);
krb5_error_code
Modified: trunk/src/lib/krb5/krb/s4u_creds.c
===================================================================
--- trunk/src/lib/krb5/krb/s4u_creds.c 2010-01-05 04:48:57 UTC (rev 23589)
+++ trunk/src/lib/krb5/krb/s4u_creds.c 2010-01-05 21:11:03 UTC (rev 23590)
@@ -506,7 +506,7 @@
s4u_user.user_id.options = KRB5_S4U_OPTS_USE_REPLY_KEY_USAGE;
/* First, acquire a TGT to the user's realm. */
- code = krb5_tgtname(context, user_realm,
+ code = krb5int_tgtname(context, user_realm,
krb5_princ_realm(context, in_creds->server), &tgs);
if (code != 0)
goto cleanup;
Modified: trunk/src/lib/krb5/krb/tgtname.c
===================================================================
--- trunk/src/lib/krb5/krb/tgtname.c 2010-01-05 04:48:57 UTC (rev 23589)
+++ trunk/src/lib/krb5/krb/tgtname.c 2010-01-05 21:11:03 UTC (rev 23590)
@@ -25,16 +25,14 @@
* or implied warranty.
*
*
- * krb5_tgtname()
+ * krb5int_tgtname()
*/
#include "k5-int.h"
#include "int-proto.h"
-/* This is an internal-only function, used by krb5_get_cred_from_kdc() */
-
krb5_error_code
-krb5_tgtname(krb5_context context, const krb5_data *server, const krb5_data *client, krb5_principal *tgtprinc)
+krb5int_tgtname(krb5_context context, const krb5_data *server, const krb5_data *client, krb5_principal *tgtprinc)
{
return krb5_build_principal_ext(context, tgtprinc, client->length, client->data,
KRB5_TGS_NAME_SIZE, KRB5_TGS_NAME,
Modified: trunk/src/lib/krb5/krb/walk_rtree.c
===================================================================
--- trunk/src/lib/krb5/krb/walk_rtree.c 2010-01-05 04:48:57 UTC (rev 23589)
+++ trunk/src/lib/krb5/krb/walk_rtree.c 2010-01-05 21:11:03 UTC (rev 23590)
@@ -213,17 +213,17 @@
/* Invariant: PPRINC points one past end of list. */
pprinc = &tree[0];
/* Local TGS name */
- retval = krb5_tgtname(context, client, client, pprinc++);
+ retval = krb5int_tgtname(context, client, client, pprinc++);
if (retval) goto error;
srcrealm = *client;
for (i = 0; i < nlinks; i++) {
dstrealm.data = vals[i];
dstrealm.length = strcspn(vals[i], "\t ");
- retval = krb5_tgtname(context, &dstrealm, &srcrealm, pprinc++);
+ retval = krb5int_tgtname(context, &dstrealm, &srcrealm, pprinc++);
if (retval) goto error;
srcrealm = dstrealm;
}
- retval = krb5_tgtname(context, server, &srcrealm, pprinc++);
+ retval = krb5int_tgtname(context, server, &srcrealm, pprinc++);
if (retval) goto error;
*rettree = tree;
@@ -326,7 +326,7 @@
srcrealm = client;
for (i = 0; i < nrealms; i++) {
dstrealm = &realms[i];
- retval = krb5_tgtname(context, dstrealm, srcrealm, pprinc++);
+ retval = krb5int_tgtname(context, dstrealm, srcrealm, pprinc++);
if (retval) goto error;
srcrealm = dstrealm;
}
Modified: trunk/src/lib/krb5/libkrb5.exports
===================================================================
--- trunk/src/lib/krb5/libkrb5.exports 2010-01-05 04:48:57 UTC (rev 23589)
+++ trunk/src/lib/krb5/libkrb5.exports 2010-01-05 21:11:03 UTC (rev 23590)
@@ -548,7 +548,7 @@
krb5_string_to_salttype
krb5_string_to_timestamp
krb5_sync_disk_file
-krb5_tgtname
+krb5int_tgtname
krb5_timeofday
krb5_timestamp_to_sfstring
krb5_timestamp_to_string
More information about the cvs-krb5
mailing list