linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/4] Fix debugging reference from non-GSS to optional GSS code.
@ 2012-02-05 20:02 Nick Alcock
  2012-02-05 20:02 ` [PATCH 2/4] Make svc_auth_none always available Nick Alcock
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Nick Alcock @ 2012-02-05 20:02 UTC (permalink / raw)
  To: linux-nfs; +Cc: Nick Alcock

From: Nick Alcock <nick.alcock@oracle.com>

AUTH_DESTROY() and auth_destroy() are pulling in log_debug() from
authgss_prot.c, but are used from outside the GSS code, thus preventing libtirpc
from being used if compiled without GSS support.

The (somewhat ugly) fix here defines a new macro to do the job. Because we're
not compiling as C99, I use the GNU C variadic macro extension: if we mean to
be compiled with other compilers, this needs to change.

Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
---
 tirpc/rpc/auth.h |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/tirpc/rpc/auth.h b/tirpc/rpc/auth.h
index 5f66e67..e7bbe36 100644
--- a/tirpc/rpc/auth.h
+++ b/tirpc/rpc/auth.h
@@ -51,6 +51,7 @@
 #include <sys/cdefs.h>
 #include <sys/socket.h>
 #include <sys/types.h>
+#include <stdio.h>
 
 
 #define MAX_AUTH_BYTES	400
@@ -248,12 +249,18 @@ auth_put(AUTH *auth)
 #define auth_refresh(auth, msg)		\
 		((*((auth)->ah_ops->ah_refresh))(auth, msg))
 
+#if defined(__GNUC__) && defined(DEBUG)
+#define auth_log_debug(fmt,args...) printf(stderr, fmt, args)
+#else
+#define auth_log_debug(fmt,args...)
+#endif
+
 #define AUTH_DESTROY(auth)						\
 		do {							\
 			int refs;					\
 			if ((refs = auth_put((auth))) == 0)		\
 				((*((auth)->ah_ops->ah_destroy))(auth));\
-			log_debug("%s: auth_put(), refs %d\n",		\
+			auth_log_debug("%s: auth_put(), refs %d\n",	\
 				__func__, refs);			\
 		} while (0)
 
@@ -262,7 +269,7 @@ auth_put(AUTH *auth)
 			int refs;					\
 			if ((refs = auth_put((auth))) == 0)		\
 				((*((auth)->ah_ops->ah_destroy))(auth));\
-			log_debug("%s: auth_put(), refs %d\n",		\
+			auth_log_debug("%s: auth_put(), refs %d\n",	\
 				__func__, refs);			\
 		} while (0)
 
-- 
1.7.8.3.146.gfe6a0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2012-04-26 20:07 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-05 20:02 [PATCH 1/4] Fix debugging reference from non-GSS to optional GSS code Nick Alcock
2012-02-05 20:02 ` [PATCH 2/4] Make svc_auth_none always available Nick Alcock
2012-04-26 20:06   ` Steve Dickson
2012-02-05 20:02 ` [PATCH 3/4] No longer require NIS Nick Alcock
2012-04-26 20:07   ` Steve Dickson
2012-02-05 20:02 ` [PATCH 4/4] Fix debugging-related namespace pollution Nick Alcock
2012-04-26 20:07   ` Steve Dickson
2012-04-26 20:06 ` [PATCH 1/4] Fix debugging reference from non-GSS to optional GSS code Steve Dickson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).