From: Matt Rogers <mrogers@redhat.com>
Date: Fri, 13 May 2016 00:44:14 +0000 (-0400)
Subject: Shorten authdata module function table names
X-Git-Tag: krb5-1.15-beta1~168
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f905e7185e933f1fab5342587ea660f11799c32a;p=thirdparty%2Fkrb5.git

Shorten authdata module function table names
---

diff --git a/src/lib/krb5/krb/authdata.c b/src/lib/krb5/krb/authdata.c
index 91261b8059..b5cb78866d 100644
--- a/src/lib/krb5/krb/authdata.c
+++ b/src/lib/krb5/krb/authdata.c
@@ -43,8 +43,8 @@ static const char *objdirs[] = {
 
 /* Internal authdata systems */
 static krb5plugin_authdata_client_ftable_v0 *authdata_systems[] = {
-    &krb5int_mspac_authdata_client_ftable,
-    &krb5int_s4u2proxy_authdata_client_ftable,
+    &k5_mspac_ad_client_ftable,
+    &k5_s4u2proxy_ad_client_ftable,
     &k5_authind_ad_client_ftable,
     NULL
 };
diff --git a/src/lib/krb5/krb/authdata.h b/src/lib/krb5/krb/authdata.h
index b193f6a493..1e5c08426b 100644
--- a/src/lib/krb5/krb/authdata.h
+++ b/src/lib/krb5/krb/authdata.h
@@ -76,8 +76,8 @@ struct krb5_pac_data {
 
 #define NT_TIME_EPOCH               11644473600LL
 
-extern krb5plugin_authdata_client_ftable_v0 krb5int_mspac_authdata_client_ftable;
-extern krb5plugin_authdata_client_ftable_v0 krb5int_s4u2proxy_authdata_client_ftable;
+extern krb5plugin_authdata_client_ftable_v0 k5_mspac_ad_client_ftable;
+extern krb5plugin_authdata_client_ftable_v0 k5_s4u2proxy_ad_client_ftable;
 extern krb5plugin_authdata_client_ftable_v0 k5_authind_ad_client_ftable;
 
 krb5_error_code
diff --git a/src/lib/krb5/krb/pac.c b/src/lib/krb5/krb/pac.c
index 2458695b1c..3a2ea23595 100644
--- a/src/lib/krb5/krb/pac.c
+++ b/src/lib/krb5/krb/pac.c
@@ -1233,7 +1233,7 @@ mspac_copy(krb5_context kcontext,
 
 static krb5_authdatatype mspac_ad_types[] = { KRB5_AUTHDATA_WIN2K_PAC, 0 };
 
-krb5plugin_authdata_client_ftable_v0 krb5int_mspac_authdata_client_ftable = {
+krb5plugin_authdata_client_ftable_v0 k5_mspac_ad_client_ftable = {
     "mspac",
     mspac_ad_types,
     mspac_init,
diff --git a/src/lib/krb5/krb/s4u_authdata.c b/src/lib/krb5/krb/s4u_authdata.c
index 5b4704b752..36ca82d719 100644
--- a/src/lib/krb5/krb/s4u_authdata.c
+++ b/src/lib/krb5/krb/s4u_authdata.c
@@ -577,7 +577,7 @@ s4u2proxy_copy(krb5_context kcontext,
 
 static krb5_authdatatype s4u2proxy_ad_types[] = { KRB5_AUTHDATA_SIGNTICKET, 0 };
 
-krb5plugin_authdata_client_ftable_v0 krb5int_s4u2proxy_authdata_client_ftable = {
+krb5plugin_authdata_client_ftable_v0 k5_s4u2proxy_ad_client_ftable = {
     "constrained-delegation",
     s4u2proxy_ad_types,
     s4u2proxy_init,