summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-05-02 12:36:25 +0200
committerKarolin Seeger <kseeger@samba.org>2011-05-17 09:17:44 +0200
commit16c5dcaaee74f9edcd42b63ecc86840177f6d48d (patch)
tree1047f8880842cf76692ce74b56b58943058d3436
parent83583349ffe6fc79b7b0e69c3691025bcfc87d46 (diff)
downloadsamba-16c5dcaaee74f9edcd42b63ecc86840177f6d48d.tar.gz
samba-16c5dcaaee74f9edcd42b63ecc86840177f6d48d.tar.xz
samba-16c5dcaaee74f9edcd42b63ecc86840177f6d48d.zip
s3: move pipe_auth_data to dcerpc.h
Guenther (cherry picked from commit 80fa624861e6f45c4b6837969253d5fbac2f3b1e) (cherry picked from commit e74b7405586a50349be236a81e71fd432855663d)
-rw-r--r--source3/include/ntdomain.h14
-rw-r--r--source3/librpc/rpc/dcerpc.h15
2 files changed, 14 insertions, 15 deletions
diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index 077924d6f48..a18c0a4a9fc 100644
--- 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 0a6ddaca173..30c6d1b75da 100644
--- 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,