Move the known NETLOGON_CONTROL reply flags to IDL.

Guenther

diff --git a/source/include/rpc_netlogon.h b/source/include/rpc_netlogon.h
index 239fe0f7c695c5b66a42bffd3723628c30fef51a..45b087942cb8f95e4bc1dcdb4cd2fbb7a3589a06 100644 (file)
--- a/source/include/rpc_netlogon.h
+++ b/source/include/rpc_netlogon.h
@@ -23,14 +23,6 @@
 #ifndef _RPC_NETLOGON_H /* _RPC_NETLOGON_H */
 #define _RPC_NETLOGON_H 
 
-/* Some flag values reverse engineered from NLTEST.EXE */
-/* used in the NETLOGON_CONTROL[2] reply */
-
-#define NL_CTRL_IN_SYNC          0x0000
-#define NL_CTRL_REPL_NEEDED      0x0001
-#define NL_CTRL_REPL_IN_PROGRESS 0x0002
-#define NL_CTRL_FULL_SYNC        0x0004
-
 #define LOGON_KRB5_FAIL_CLOCK_SKEW     0x02000000
 
 #define INTERACTIVE_LOGON_TYPE 1

diff --git a/source/librpc/idl/netlogon.idl b/source/librpc/idl/netlogon.idl
index b1c5b12efc5c4902d6b6a2f34e7b56774f29294e..d701b1e1c91a41be0a18316a7e5a8c9e313a2f99 100644 (file)
--- a/source/librpc/idl/netlogon.idl
+++ b/source/librpc/idl/netlogon.idl
@@ -779,20 +779,26 @@ interface netlogon
        /*****************/
        /* Function 0x0C */
 
+       typedef [bitmap32bit] bitmap {
+               NETLOGON_CTRL_REPL_NEEDED       = 0x0001,
+               NETLOGON_CTRL_REPL_IN_PROGRESS  = 0x0002,
+               NETLOGON_CTRL_REPL_FULL_SYNC    = 0x0004
+       } netr_InfoFlags;
+
        typedef struct {
-               uint32 flags;
+               netr_InfoFlags flags;
                uint32 pdc_connection_status;
        } netr_NETLOGON_INFO_1;
 
        typedef struct {
-               uint32 flags;
+               netr_InfoFlags flags;
                uint32 pdc_connection_status;
                [string,charset(UTF16)] uint16 *trusted_dc_name;
                uint32 tc_connection_status;
        } netr_NETLOGON_INFO_2;
 
        typedef struct {
-               uint32 flags;
+               netr_InfoFlags flags;
                uint32 logon_attempts;
                uint32 unknown1;
                uint32 unknown2;