Merge branch 'upstream'

[nfs-utils.git] / tools / rpcdebug / rpcdebug.c

diff --git a/tools/rpcdebug/rpcdebug.c b/tools/rpcdebug/rpcdebug.c
index bbe57b1693c73c306700f2cbef81105bb7a96ec7..275a49175c0668cfd1afd921547f1d3abd602c34 100644 (file)
--- a/tools/rpcdebug/rpcdebug.c
+++ b/tools/rpcdebug/rpcdebug.c
@@ -15,7 +15,7 @@
  *
  */
 
-#include "config.h"
+/* #include "config.h" */
 
 #include <sys/types.h>
 #include <stdio.h>
@@ -23,6 +23,7 @@
 #include <getopt.h>
 #include <unistd.h>
 #include <string.h>
+#include <malloc.h>
 #include <fcntl.h>
 #include <ctype.h>
 /* RPC debug flags
@@ -145,11 +146,13 @@ static struct flagmap {
        FLAG(RPC,       DEBUG),
        FLAG(RPC,       NFS),
        FLAG(RPC,       AUTH),
-       FLAG(RPC,       PMAP),
+       FLAG(RPC,       BIND),
        FLAG(RPC,       SCHED),
+       FLAG(RPC,       TRANS),
        FLAG(RPC,       SVCSOCK),
        FLAG(RPC,       SVCDSP),
        FLAG(RPC,       MISC),
+       FLAG(RPC,       CACHE),
        FLAG(RPC,       ALL),
 
        /* nfs */
@@ -161,7 +164,9 @@ static struct flagmap {
        FLAG(NFS,       XDR),
        FLAG(NFS,       FILE),
        FLAG(NFS,       ROOT),
-       //      FLAG(NFS,       CALLBACK),
+       FLAG(NFS,       CALLBACK),
+       FLAG(NFS,       CLIENT),
+       FLAG(NFS,       MOUNT),
        FLAG(NFS,       ALL),
 
        /* nfsd */
@@ -186,6 +191,7 @@ static struct flagmap {
        FLAG(NLM,       CLNTSUBS),
        FLAG(NLM,       SVCSUBS),
        FLAG(NLM,       HOSTCACHE),
+       FLAG(NLM,       XDR),
        FLAG(NLM,       ALL),
 
       { NULL,          NULL,           0 }