s3: move pipe_auth_data to dcerpc.h

Guenther
(cherry picked from commit 80fa624861e6f45c4b6837969253d5fbac2f3b1e)

diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index 077924d6f489127d70fe58047d5188b62a57122e..a18c0a4a9fcce17c9f8cb81c9e8a0e3826b9c71f 100644 (file)
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -97,20 +97,6 @@ typedef struct pipe_rpc_fns {
 
 struct gse_context;
 
-/* auth state for all bind types. */
-
-struct pipe_auth_data {
-       enum dcerpc_AuthType auth_type;
-       enum dcerpc_AuthLevel auth_level;
-
-       void *auth_ctx;
-
-       /* Only the client code uses these 3 for now */
-       char *domain;
-       char *user_name;
-       DATA_BLOB user_session_key;
-};
-
 struct dcesrv_ep_entry_list;
 
 /*

diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h
index 0a6ddaca17323bf023c9c08fc62fe2abc08d6ae3..30c6d1b75da55f8639b952073d9cdf4548814c7a 100644 (file)
--- a/source3/librpc/rpc/dcerpc.h
+++ b/source3/librpc/rpc/dcerpc.h
@@ -33,7 +33,20 @@
 #define SMB_RPC_INTERFACE_VERSION 1
 
 struct NL_AUTH_MESSAGE;
-struct pipe_auth_data;
+
+/* auth state for all bind types. */
+
+struct pipe_auth_data {
+       enum dcerpc_AuthType auth_type;
+       enum dcerpc_AuthLevel auth_level;
+
+       void *auth_ctx;
+
+       /* Only the client code uses these 3 for now */
+       char *domain;
+       char *user_name;
+       DATA_BLOB user_session_key;
+};
 
 /* The following definitions come from librpc/rpc/dcerpc_helpers.c  */
 NTSTATUS dcerpc_push_ncacn_packet(TALLOC_CTX *mem_ctx,