svn rev #22959: trunk/src/ kdc/ plugins/authdata/greet_server/

[lhoward@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22959
Commit By: lhoward
Log Message:
Increment authdata SPI to V2 (V1 was experimental) to account for additional
krbtgt key parameter.



Changed Files:
U   trunk/src/kdc/kdc_authdata.c
U   trunk/src/plugins/authdata/greet_server/greet_auth.c
Modified: trunk/src/kdc/kdc_authdata.c
===================================================================
--- trunk/src/kdc/kdc_authdata.c	2009-10-21 00:50:08 UTC (rev 22958)
+++ trunk/src/kdc/kdc_authdata.c	2009-10-21 00:53:47 UTC (rev 22959)
@@ -50,7 +50,7 @@
      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 @@
     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 @@
     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",

Modified: trunk/src/plugins/authdata/greet_server/greet_auth.c
===================================================================
--- trunk/src/plugins/authdata/greet_server/greet_auth.c	2009-10-21 00:50:08 UTC (rev 22958)
+++ trunk/src/plugins/authdata/greet_server/greet_auth.c	2009-10-21 00:53:47 UTC (rev 22959)
@@ -183,7 +183,7 @@
     return code;
 }
 
-krb5plugin_authdata_server_ftable_v1 authdata_server_1 = {
+krb5plugin_authdata_server_ftable_v2 authdata_server_2 = {
     "greet",
     greet_init,
     greet_fini,