netlogon: Move netlogon_server_pipe_state to netlogon.idl

Make this available as a shared structure for both source3 and source4

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/librpc/idl/netlogon.idl b/librpc/idl/netlogon.idl
index ae5e33aea40f1960154879d92cdd251901248677..e9a4b192a9f1bf6c615cebcf41f733b83706a4db 100644 (file)
--- a/librpc/idl/netlogon.idl
+++ b/librpc/idl/netlogon.idl
@@ -16,6 +16,7 @@ cpp_quote("#define ENC_RSA_MD5 KERB_ENCTYPE_DES_CBC_MD5")
 cpp_quote("#define ENC_RC4_HMAC_MD5 KERB_ENCTYPE_RC4_HMAC_MD5")
 cpp_quote("#define ENC_HMAC_SHA1_96_AES128 KERB_ENCTYPE_AES128_CTS_HMAC_SHA1_96")
 cpp_quote("#define ENC_HMAC_SHA1_96_AES256 KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96")
+cpp_quote("#define NETLOGON_SERVER_PIPE_STATE_MAGIC 0x4f555358")
 
 [
   uuid("12345678-1234-abcd-ef00-01234567cffb"),
@@ -342,6 +343,11 @@ interface netlogon
                uint8 data[8];
        } netr_Credential;
 
+       typedef [public] struct {
+               netr_Credential client_challenge;
+               netr_Credential server_challenge;
+       } netlogon_server_pipe_state;
+
        typedef [public] struct {
                netr_Credential cred;
                time_t timestamp;

diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c
index 5d22f83afb0bd943a6839fc3bc968805eed92061..bc2a7316ed6b3c8367f5aa9e66198300f715bbf8 100644 (file)
--- a/source3/rpc_server/netlogon/srv_netlog_nt.c
+++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
@@ -56,11 +56,6 @@ extern userdom_struct current_user_info;
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
 
-struct netlogon_server_pipe_state {
-       struct netr_Credential client_challenge;
-       struct netr_Credential server_challenge;
-};
-
 /*************************************************************************
  _netr_LogonControl
  *************************************************************************/

diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 6860202a985b54ebbd8976cab7cf4e01670c7fd8..1f60f9cc79c6172c66ebe00dff173ac8308664e0 100644 (file)
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -66,12 +66,6 @@ static NTSTATUS dcesrv_interface_netlogon_bind(struct dcesrv_connection_context
        return dcesrv_interface_bind_reject_connect(context, iface);
 }
 
-#define NETLOGON_SERVER_PIPE_STATE_MAGIC 0x4f555358
-struct netlogon_server_pipe_state {
-       struct netr_Credential client_challenge;
-       struct netr_Credential server_challenge;
-};
-
 static NTSTATUS dcesrv_netr_ServerReqChallenge(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                                        struct netr_ServerReqChallenge *r)
 {