Move netr_LogonLevel flags to IDL, rename old one to netr_LogonInfo.

Guenther

diff --git a/source/include/rpc_netlogon.h b/source/include/rpc_netlogon.h
index 1ad468308dedbe5e394678752a0c49912a5449f3..8218324173a4ac7a10ea0132f7a93c7d322553dc 100644 (file)
--- a/source/include/rpc_netlogon.h
+++ b/source/include/rpc_netlogon.h
@@ -23,9 +23,6 @@
 #ifndef _RPC_NETLOGON_H /* _RPC_NETLOGON_H */
 #define _RPC_NETLOGON_H 
 
-#define INTERACTIVE_LOGON_TYPE 1
-#define NET_LOGON_TYPE 2
-
 /* LOCKOUT_STRING */
 typedef struct account_lockout_string {
        uint32 array_size;

diff --git a/source/librpc/idl/netlogon.idl b/source/librpc/idl/netlogon.idl
index 6a7f4207e28eb1733de329c51b4960c410427ed3..a53fdfab66d4515bc3b2d368b6420f623060e0a0 100644 (file)
--- a/source/librpc/idl/netlogon.idl
+++ b/source/librpc/idl/netlogon.idl
@@ -140,7 +140,7 @@ interface netlogon
                [case(3)] netr_PasswordInfo *password;
                [case(5)] netr_PasswordInfo *password;
                [case(6)] netr_NetworkInfo  *network;
-       } netr_LogonLevel;
+       } netr_LogonInfo;
 
        typedef [public,flag(NDR_PAHEX)] struct {
                uint8 key[16];
@@ -250,13 +250,18 @@ interface netlogon
                time_t timestamp;
        } netr_Authenticator;
 
+       typedef enum {
+               INTERACTIVE_LOGON_TYPE = 1,
+               NET_LOGON_TYPE = 2
+       } netr_LogonLevel;
+
        NTSTATUS netr_LogonSamLogon(
                [in,unique] [string,charset(UTF16)] uint16 *server_name,
                [in,unique] [string,charset(UTF16)] uint16 *computer_name,
                [in,unique] netr_Authenticator *credential,
                [in,out,unique] netr_Authenticator *return_authenticator,
-               [in]  uint16 logon_level,
-               [in,ref]  [switch_is(logon_level)] netr_LogonLevel *logon,
+               [in]  netr_LogonLevel logon_level,
+               [in,ref]  [switch_is(logon_level)] netr_LogonInfo *logon,
                [in]  uint16 validation_level,
                [out,ref] [switch_is(validation_level)] netr_Validation *validation,
                [out,ref] uint8 *authoritative
@@ -271,8 +276,8 @@ interface netlogon
                [in,unique] [string,charset(UTF16)] uint16 *computer_name,
                [in,unique] netr_Authenticator *credential,
                [in,out,unique] netr_Authenticator *return_authenticator,
-               [in] uint16 logon_level,
-               [in] [switch_is(logon_level)] netr_LogonLevel logon
+               [in] netr_LogonLevel logon_level,
+               [in] [switch_is(logon_level)] netr_LogonInfo logon
                );
        
 
@@ -1291,8 +1296,8 @@ interface netlogon
        NTSTATUS netr_LogonSamLogonEx(
                [in,unique] [string,charset(UTF16)] uint16 *server_name,
                [in,unique] [string,charset(UTF16)] uint16 *computer_name,
-               [in]  uint16 logon_level,
-               [in,ref]  [switch_is(logon_level)] netr_LogonLevel *logon,
+               [in]  netr_LogonLevel logon_level,
+               [in,ref]  [switch_is(logon_level)] netr_LogonInfo *logon,
                [in]  uint16 validation_level,
                [out,ref] [switch_is(validation_level)] netr_Validation *validation,
                [out,ref] uint8 *authoritative,
@@ -1364,8 +1369,8 @@ interface netlogon
                [in,unique] [string,charset(UTF16)] uint16 *computer_name,
                [in,unique] netr_Authenticator *credential,
                [in,out,unique] netr_Authenticator *return_authenticator,
-               [in]  uint16 logon_level,
-               [in]  [switch_is(logon_level)] netr_LogonLevel logon,
+               [in]  netr_LogonLevel logon_level,
+               [in]  [switch_is(logon_level)] netr_LogonInfo logon,
                [in]  uint16 validation_level,
                [out,ref] [switch_is(validation_level)] netr_Validation *validation,
                [out,ref] uint8 *authoritative,