From: Tom Yu <tlyu@mit.edu>
Date: Wed, 16 Jun 2004 22:14:21 +0000 (+0000)
Subject: more rpc namespace cleanup
X-Git-Tag: krb5-1.4-beta1~316
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0290a9550dccd9c5f6ab8a85eea944e824890a4d;p=krb5.git

more rpc namespace cleanup

	* auth_gss.h: Conditionalize log_debug, log_status, log_hexdump
	prototypes on GSSRPC__IMPL.

	* rename.h: More namespace fixes.

ticket: new
status: open
component: krb5-libs

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

diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog
index e7716a9bd..cb4c16235 100644
--- a/src/lib/rpc/ChangeLog
+++ b/src/lib/rpc/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-16  Tom Yu  <tlyu@mit.edu>
+
+	* auth_gss.h: Conditionalize log_debug, log_status, log_hexdump
+	prototypes on GSSRPC__IMPL.
+
+	* rename.h: More namespace fixes.
+
 2004-06-15  Tom Yu  <tlyu@mit.edu>
 
 	* auth_gss.c (print_rpc_gss_sec): Use gss_oid_to_str().
diff --git a/src/lib/rpc/auth_gss.h b/src/lib/rpc/auth_gss.h
index 3692c548d..0bf701d90 100644
--- a/src/lib/rpc/auth_gss.h
+++ b/src/lib/rpc/auth_gss.h
@@ -128,10 +128,11 @@ AUTH   *authgss_create		(CLIENT *, gss_name_t, struct rpc_gss_sec *);
 AUTH   *authgss_create_default	(CLIENT *, char *, struct rpc_gss_sec *);
 bool_t authgss_service(AUTH *auth, int svc);
 
-
+#ifdef GSSRPC__IMPL
 void	log_debug		(const char *fmt, ...);
 void	log_status		(char *m, OM_uint32 major, OM_uint32 minor);
 void	log_hexdump		(const u_char *buf, int len, int offset);
+#endif
 
 GSSRPC__END_DECLS
 #endif /* !defined(GSSRPC_AUTH_GSS_H) */
diff --git a/src/lib/rpc/rename.h b/src/lib/rpc/rename.h
index a0444e209..2cc423231 100644
--- a/src/lib/rpc/rename.h
+++ b/src/lib/rpc/rename.h
@@ -75,6 +75,11 @@
 #define gssrpc__null_auth	_null_auth
 #endif
 
+/* auth_gss.c */
+
+#define auth_debug_gss		gssrpc_auth_debug_gss
+#define misc_debug_gss		gssrpc_misc_debug_gss
+
 /* auth_gss.h */
 
 #define xdr_rpc_gss_cred	gssrpc_xdr_rpc_gss_cred
@@ -88,6 +93,17 @@
 #define authgss_create_default	gssrpc_authgss_create_default
 #define authgss_service		gssrpc_authgss_service
 
+#ifdef GSSRPC__IMPL
+#define log_debug		gssrpc_log_debug
+#define log_status		gssrpc_log_status
+#define	log_hexdump		gssrpc_log_hexdump
+#endif
+
+/* auth_gssapi.c */
+
+#define auth_debug_gssapi	gssrpc_auth_debug_gssapi
+#define misc_debug_gssapi	gssrpc_misc_debug_gssapi
+
 /* auth_gssapi.h */
 
 #define xdr_gss_buf		gssrpc_xdr_gss_buf
@@ -109,17 +125,9 @@
 #define svcauth_gssapi_set_log_badverf_func	gssrpc_svcauth_gssapi_set_log_badverf_func
 #define svcauth_gssapi_set_log_miscerr_func	gssrpc_svcauth_gssapi_set_log_miscerr_func
 
-#if 0
-/* Unfortunately, code outside the library calls these... */
-#define gssrpc__svcauth_gssapi_set_names	_svcauth_gssapi_set_names
-#define gssrpc__svcauth_gssapi_unset_names	_svcauth_gssapi_unset_names
-#define gssrpc__svcauth_gssapi_set_log_badauth_func	\
-	_svcauth_gssapi_set_log_badauth_func
-#define gssrpc__svcauth_gssapi_set_log_badverf_func	\
-	_svcauth_gssapi_set_log_badverf_func
-#define gssrpc__svcauth_gssapi_set_log_miscerr_func	\
-	_svcauth_gssapi_set_log_miscerr_func
-#endif
+#define svcauth_gss_set_log_badauth_func	gssrpc_svcauth_gss_set_log_badauth_func
+#define svcauth_gss_set_log_badverf_func	gssrpc_svcauth_gss_set_log_badverf_func
+#define svcauth_gss_set_log_miscerr_func	gssrpc_svcauth_gss_set_log_miscerr_func
 
 /* auth_unix.h */
 
@@ -239,6 +247,16 @@
 #define gssrpc__svcauth_gss	_svcauth_gss
 #endif
 
+/* svc_auth_gss.c */
+
+#define svc_debug_gss		gssrpc_svc_debug_gss
+
+#define svcauth_gss_creds	gssrpc_svc_auth_gss_creds
+
+/* svc_auth_gssapi.c */
+
+#define svc_debug_gssapi	gssrpc_svc_debug_gssapi
+
 /* svc_auth_none.c */
 
 #define svc_auth_none		gssrpc_svc_auth_none