Drop major version number from service-locator function table structure.

Add a typedef name for the structure.  Change multiple-inclusion macro name.
Add a comment indicating desired symbol name.

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

2 files changed, 8 insertions, 7 deletions

diff --git a/src/include/krb5/locate.h b/src/include/krb5/locate.h
index 552369c..aed22c8 100644
--- a/src/include/krb5/locate.h
+++ b/src/include/krb5/locate.h
@@ -1,5 +1,5 @@
-#ifndef K5_PLUGIN_H_INCLUDED
-#define K5_PLUGIN_H_INCLUDED
+#ifndef KRB5_LOCATE_PLUGIN_H_INCLUDED
+#define KRB5_LOCATE_PLUGIN_H_INCLUDED
 #include <krb5/krb5.h>
 
 enum locate_service_type {
@@ -10,8 +10,8 @@ enum locate_service_type {
     locate_service_kpasswd
 };
 
-struct krb5plugin_service_locate_ftable {
-    int vmajor, vminor;
+typedef struct krb5plugin_service_locate_ftable {
+    int minor_version;		/* currently 0 */
     /* Per-context setup and teardown.  Returned void* blob is
        private to the plugin.  */
     krb5_error_code (*init)(krb5_context, void **);
@@ -26,5 +26,6 @@ struct krb5plugin_service_locate_ftable {
 			      int socktype, int family,
 			      int (*cbfunc)(void *,int,struct sockaddr *),
 			      void *cbdata);
-};
+} krb5plugin_service_locate_ftable;
+/* extern krb5plugin_service_locate_ftable service_locator; */
 #endif
diff --git a/src/plugins/locate/python/py-locate.c b/src/plugins/locate/python/py-locate.c
index 54f8703..d555dca 100644
--- a/src/plugins/locate/python/py-locate.c
+++ b/src/plugins/locate/python/py-locate.c
@@ -305,9 +305,9 @@ lookup (void *blob, enum locate_service_type svc, const char *realm,
     return 0;
 }
 
-const struct krb5plugin_service_locate_ftable service_locator = {
+const krb5plugin_service_locate_ftable service_locator = {
     /* version */
-    1, 0,
+    0,
     /* functions */
     ctxinit, ctxfini, lookup,
 };