Merge commit 'release-4-0-0alpha15' into master4-tmp

[samba.git] / source4 / rpc_server / samr / dcesrv_samr.h

diff --git a/source4/rpc_server/samr/dcesrv_samr.h b/source4/rpc_server/samr/dcesrv_samr.h
index 7a6978344be852911ba2342771d8d6886f8e30a8..8193ee6d5b34fa44f1c33dfab798bc1db5943329 100644 (file)
--- a/source4/rpc_server/samr/dcesrv_samr.h
+++ b/source4/rpc_server/samr/dcesrv_samr.h
@@ -1,20 +1,20 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
 
    endpoint server for the samr pipe - definitions
 
    Copyright (C) Andrew Tridgell 2004
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -37,7 +37,7 @@ enum samr_handle {
   state asscoiated with a samr_Connect*() operation
 */
 struct samr_connect_state {
-       void *sam_ctx;
+       struct ldb_context *sam_ctx;
        uint32_t access_mask;
 };
 
@@ -52,6 +52,8 @@ struct samr_domain_state {
        const char *domain_name;
        struct ldb_dn *domain_dn;
        enum server_role role;
+       bool builtin;
+       struct loadparm_context *lp_ctx;
 };
 
 /*