r25301: Merge my includes.h cleanups.

[tprouty/samba.git] / source4 / libnet / libnet.h

diff --git a/source4/libnet/libnet.h b/source4/libnet/libnet.h
index e394c1c88e3cb2fb4d5e9096e3f03edd97a77fe3..03cca1b7fe909b1803da4c24319241b60ceb3538 100644 (file)
--- a/source4/libnet/libnet.h
+++ b/source4/libnet/libnet.h
@@ -6,7 +6,7 @@
    
    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 2 of the License, or
+   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,
@@ -15,10 +15,11 @@
    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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "librpc/gen_ndr/misc.h"
+
 struct libnet_context {
        /* here we need:
         * a client env context
@@ -26,22 +27,21 @@ struct libnet_context {
         */
        struct cli_credentials *cred;
 
-       struct dcerpc_pipe *pipe;
-
        /* samr connection parameters - opened handles and related properties */
        struct {
                struct dcerpc_pipe *pipe;
-               const char *name;
+               char *name;
+               struct dom_sid *sid;
                uint32_t access_mask;
                struct policy_handle handle;
+               struct policy_handle connect_handle;
+               int buf_size;
        } samr;
 
-       struct policy_handle user_handle;
-
        /* lsa connection parameters - opened handles and related properties */
        struct {
                struct dcerpc_pipe *pipe;
-               const char *name;
+               char *name;
                uint32_t access_mask;
                struct policy_handle handle;
        } lsa;
@@ -57,13 +57,17 @@ struct libnet_context {
 #include "libnet/composite.h"
 #include "libnet/userman.h"
 #include "libnet/userinfo.h"
+#include "libnet/groupinfo.h"
 #include "libnet/libnet_passwd.h"
 #include "libnet/libnet_time.h"
 #include "libnet/libnet_rpc.h"
 #include "libnet/libnet_join.h"
 #include "libnet/libnet_site.h"
+#include "libnet/libnet_become_dc.h"
+#include "libnet/libnet_unbecome_dc.h"
 #include "libnet/libnet_vampire.h"
 #include "libnet/libnet_user.h"
+#include "libnet/libnet_group.h"
 #include "libnet/libnet_share.h"
 #include "libnet/libnet_lookup.h"
 #include "libnet/libnet_domain.h"