Add custom implementation of xdr_uint64_t

This is needed because gssrpc doesn't have one.

4 files changed, 90 insertions, 1 deletions

diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 529de6d..e1adef0 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -85,7 +85,7 @@ if BUILD_SELINUX
     GSS_PROXY_LIBS += $(SELINUX_LIBS)
 endif
 
-GP_RPCGEN_OBJ = rpcgen/gp_rpc_xdr.c rpcgen/gss_proxy_xdr.c
+GP_RPCGEN_OBJ = rpcgen/gp_rpc_xdr.c rpcgen/gss_proxy_xdr.c rpcgen/gp_xdr.c
 GP_RPCCLI_OBJ = \
     src/client/gpm_display_status.c \
     src/client/gpm_accept_sec_context.c \
@@ -116,6 +116,7 @@ GP_MECHGLUE_OBJ = \
 
 dist_noinst_HEADERS = \
     rpcgen/gp_rpc.h \
+    rpcgen/gp_xdr.h \
     rpcgen/gss_proxy.h \
     src/gp_rpc_process.h \
     src/gp_proxy.h \
diff --git a/proxy/rpcgen/gp_xdr.c b/proxy/rpcgen/gp_xdr.c
new file mode 100644
index 0000000..2670212
--- /dev/null
+++ b/proxy/rpcgen/gp_xdr.c
@@ -0,0 +1,52 @@
+/*
+   GSS-PROXY
+
+   Copyright (C) 2013 Red Hat, Inc.
+   Copyright (C) 2013 Simo Sorce <simo@redhat.com>
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
+*/
+
+#include "rpcgen/gp_xdr.h"
+
+bool_t gp_xdr_uint64_t(XDR *xdrs, uint64_t *objp)
+{
+    uint32_t h;
+    uint32_t l;
+
+    switch(xdrs->x_op) {
+    case XDR_ENCODE:
+        h = (uint32_t)((*objp) >> 32);
+        l = (uint32_t)(*objp);
+        if (!xdr_u_int32(xdrs, &h) || !xdr_u_int32(xdrs, &l)) {
+            return FALSE;
+        }
+        return TRUE;
+    case XDR_DECODE:
+        if (!xdr_u_int32(xdrs, &h) || !xdr_u_int32(xdrs, &l)) {
+            return FALSE;
+        }
+        *objp = (((uint64_t)h) << 32) | l;
+        return TRUE;
+    case XDR_FREE:
+        return TRUE;
+    default:
+        return FALSE;
+    }
+}
diff --git a/proxy/rpcgen/gp_xdr.h b/proxy/rpcgen/gp_xdr.h
new file mode 100644
index 0000000..0d4304d
--- /dev/null
+++ b/proxy/rpcgen/gp_xdr.h
@@ -0,0 +1,35 @@
+/*
+   GSS-PROXY
+
+   Copyright (C) 2013 Red Hat, Inc.
+   Copyright (C) 2013 Simo Sorce <simo@redhat.com>
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef _GP_XDR_H_
+#define _GP_XDR_H_
+
+#include "gssrpc/rpc.h"
+
+#define xdr_u_quad_t gp_xdr_uint64_t
+
+bool_t gp_xdr_uint64_t(XDR *xdrs, uint64_t *objp);
+
+#endif /* _GP_XDR_H_ */
diff --git a/proxy/rpcgen/gss_proxy_xdr.c b/proxy/rpcgen/gss_proxy_xdr.c
index 576b9c9..215761d 100644
--- a/proxy/rpcgen/gss_proxy_xdr.c
+++ b/proxy/rpcgen/gss_proxy_xdr.c
@@ -3,6 +3,7 @@
  * It was generated using rpcgen.
  */
 
+#include "rpcgen/gp_xdr.h"
 #include "rpcgen/gss_proxy.h"
 
 bool_t