From 064ec564a8a14c5f41bd2bb966f2277728187baf Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@mit.edu>
Date: Wed, 24 May 2006 21:19:23 +0000
Subject: Rename locate.h to locate_plugin.h.  Change references, update
 dependencies

ticket: 3784

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18037 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/include/Makefile.in          |  2 +-
 src/include/k5-int.h             |  2 +-
 src/include/krb5/locate.h        | 31 -------------------------------
 src/include/krb5/locate_plugin.h | 31 +++++++++++++++++++++++++++++++
 4 files changed, 33 insertions(+), 33 deletions(-)
 delete mode 100644 src/include/krb5/locate.h
 create mode 100644 src/include/krb5/locate_plugin.h

(limited to 'src/include')

diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 0fb6b3a20..313a01782 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -116,5 +116,5 @@ clean::
 install-headers-unix install:: krb5/krb5.h profile.h
 	$(INSTALL_DATA) $(srcdir)/krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5.h
 	$(INSTALL_DATA) krb5/krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)krb5.h
-	$(INSTALL_DATA) $(srcdir)/krb5/locate.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)locate.h
+	$(INSTALL_DATA) $(srcdir)/krb5/locate_plugin.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)locate_plugin.h
 	$(INSTALL_DATA) profile.h $(DESTDIR)$(KRB5_INCDIR)$(S)profile.h
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index da5d8b5eb..6bfdfeed1 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -538,7 +538,7 @@ extern int krb5int_grow_addrlist (struct addrlist *, int);
 extern int krb5int_add_host_to_list (struct addrlist *, const char *,
 				     int, int, int, int);
 
-#include <krb5/locate.h>
+#include <krb5/locate_plugin.h>
 krb5_error_code
 krb5int_locate_server (krb5_context, const krb5_data *realm,
 		       struct addrlist *, enum locate_service_type svc,
diff --git a/src/include/krb5/locate.h b/src/include/krb5/locate.h
deleted file mode 100644
index aed22c869..000000000
--- a/src/include/krb5/locate.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef KRB5_LOCATE_PLUGIN_H_INCLUDED
-#define KRB5_LOCATE_PLUGIN_H_INCLUDED
-#include <krb5/krb5.h>
-
-enum locate_service_type {
-    locate_service_kdc = 1,
-    locate_service_master_kdc,
-    locate_service_kadmin,
-    locate_service_krb524,
-    locate_service_kpasswd
-};
-
-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 **);
-    void (*fini)(void *);
-    /* Callback function returns non-zero if the plugin function
-       should quit and return; this may be because of an error, or may
-       indicate we've already contacted the service, whatever.  The
-       lookup function should only return an error if it detects a
-       problem, not if the callback function tells it to quit.  */
-    krb5_error_code (*lookup)(void *,
-			      enum locate_service_type svc, const char *realm,
-			      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/include/krb5/locate_plugin.h b/src/include/krb5/locate_plugin.h
new file mode 100644
index 000000000..aed22c869
--- /dev/null
+++ b/src/include/krb5/locate_plugin.h
@@ -0,0 +1,31 @@
+#ifndef KRB5_LOCATE_PLUGIN_H_INCLUDED
+#define KRB5_LOCATE_PLUGIN_H_INCLUDED
+#include <krb5/krb5.h>
+
+enum locate_service_type {
+    locate_service_kdc = 1,
+    locate_service_master_kdc,
+    locate_service_kadmin,
+    locate_service_krb524,
+    locate_service_kpasswd
+};
+
+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 **);
+    void (*fini)(void *);
+    /* Callback function returns non-zero if the plugin function
+       should quit and return; this may be because of an error, or may
+       indicate we've already contacted the service, whatever.  The
+       lookup function should only return an error if it detects a
+       problem, not if the callback function tells it to quit.  */
+    krb5_error_code (*lookup)(void *,
+			      enum locate_service_type svc, const char *realm,
+			      int socktype, int family,
+			      int (*cbfunc)(void *,int,struct sockaddr *),
+			      void *cbdata);
+} krb5plugin_service_locate_ftable;
+/* extern krb5plugin_service_locate_ftable service_locator; */
+#endif
-- 
cgit