dcerpc.idl: Use simple boolean value instead of flag

One advantage of this is that the type of the switch value is no longer
tied to the type of the NDR flags.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/librpc/idl/dcerpc.idl b/librpc/idl/dcerpc.idl
index 1850526042c66e7f510da493bcad6e64ec24d136..414b8966e8ab2864da3604e7862fc2f88d02c35c 100644 (file)
--- a/librpc/idl/dcerpc.idl
+++ b/librpc/idl/dcerpc.idl
@@ -48,8 +48,8 @@ interface dcerpc
        } dcerpc_empty;
 
        typedef [nodiscriminant] union {
-               [case(LIBNDR_FLAG_OBJECT_PRESENT)] GUID object;
-               [default] dcerpc_empty empty;
+               [default] GUID object;
+               [case(false)] dcerpc_empty empty;
        } dcerpc_object;
 
        typedef struct {

diff --git a/librpc/ndr/ndr_dcerpc.h b/librpc/ndr/ndr_dcerpc.h
index 1a7c3bd7c5bd7d0d85c2abc31fe489556314bf81..d4ff9273e5fbe7a16c10c196e7b8fed9f7ec1a51 100644 (file)
--- a/librpc/ndr/ndr_dcerpc.h
+++ b/librpc/ndr/ndr_dcerpc.h
@@ -25,5 +25,5 @@ enum ndr_err_code ndr_pop_dcerpc_sec_verification_trailer(
        struct dcerpc_sec_verification_trailer **_r);
 
 #ifndef NDR_DCERPC_REQUEST_OBJECT_PRESENT
-#define NDR_DCERPC_REQUEST_OBJECT_PRESENT (ndr->flags & LIBNDR_FLAG_OBJECT_PRESENT)
+#define NDR_DCERPC_REQUEST_OBJECT_PRESENT (!!(ndr->flags & LIBNDR_FLAG_OBJECT_PRESENT))
 #endif /* NDR_DCERPC_REQUEST_OBJECT_PRESENT */

diff --git a/source4/librpc/rpc/pyrpc.h b/source4/librpc/rpc/pyrpc.h
index 311ba2d294d88a1a1ddd7b5069dbb444a608ff0e..390e01a11967119dfab3c4811be9c9b1adba462c 100644 (file)
--- a/source4/librpc/rpc/pyrpc.h
+++ b/source4/librpc/rpc/pyrpc.h
@@ -54,7 +54,7 @@ typedef struct {
 
 
 #ifndef NDR_DCERPC_REQUEST_OBJECT_PRESENT
-#define NDR_DCERPC_REQUEST_OBJECT_PRESENT LIBNDR_FLAG_OBJECT_PRESENT
+#define NDR_DCERPC_REQUEST_OBJECT_PRESENT true
 #endif /* NDR_DCERPC_REQUEST_OBJECT_PRESENT */
 
 #endif /* _PYRPC_H_ */