From: Luke Howard <lukeh@padl.com>
Date: Wed, 21 Oct 2009 00:53:47 +0000 (+0000)
Subject: Increment authdata SPI to V2 (V1 was experimental) to account for additional
X-Git-Tag: krb5-1.8-alpha1~282
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5c17001b73583cc9df513e2d8bb5b54c6ac7d596;p=krb5.git

Increment authdata SPI to V2 (V1 was experimental) to account for additional
krbtgt key parameter.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22959 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kdc/kdc_authdata.c b/src/kdc/kdc_authdata.c
index 0950a5bf8..1b70d7c82 100644
--- a/src/kdc/kdc_authdata.c
+++ b/src/kdc/kdc_authdata.c
@@ -50,7 +50,7 @@ typedef krb5_error_code (*authdata_proc_0)
      krb5_kdc_req *request,
      krb5_enc_tkt_part * enc_tkt_reply);
 /* MIT Kerberos 1.8 (V2) authdata plugin callback */
-typedef krb5_error_code (*authdata_proc_1)
+typedef krb5_error_code (*authdata_proc_2)
     (krb5_context, unsigned int flags,
      krb5_db_entry *client, krb5_db_entry *server,
      krb5_db_entry *krbtgt,
@@ -108,7 +108,7 @@ typedef struct _krb5_authdata_systems {
     init_proc   init;
     fini_proc   fini;
     union {
-	authdata_proc_1 v2;
+	authdata_proc_2 v2;
 	authdata_proc_0 v0;
     } handle_authdata;
 } krb5_authdata_systems;
@@ -148,7 +148,7 @@ load_authdata_plugins(krb5_context context)
     n_authdata_systems = 0;
 
     if (krb5int_get_plugin_dir_data(&authdata_plugins,
-				    "authdata_server_1",
+				    "authdata_server_2",
 				    &authdata_plugins_ftables_v2, &context->err) != 0 ||
 	krb5int_get_plugin_dir_data(&authdata_plugins,
 				    "authdata_server_0",
diff --git a/src/plugins/authdata/greet_server/greet_auth.c b/src/plugins/authdata/greet_server/greet_auth.c
index cacbc659f..3f1e3d9ea 100644
--- a/src/plugins/authdata/greet_server/greet_auth.c
+++ b/src/plugins/authdata/greet_server/greet_auth.c
@@ -183,7 +183,7 @@ greet_authdata(krb5_context context,
     return code;
 }
 
-krb5plugin_authdata_server_ftable_v1 authdata_server_1 = {
+krb5plugin_authdata_server_ftable_v2 authdata_server_2 = {
     "greet",
     greet_init,
     greet_fini,