Fix compiler warnings in libnet.

diff --git a/source4/libnet/groupinfo.c b/source4/libnet/groupinfo.c
index 5c94c34b1dd8dfc1064622c22a117d06072afa4c..1779c2816e5e8bf00b079a1bb5e662be28dd379f 100644 (file)
--- a/source4/libnet/groupinfo.c
+++ b/source4/libnet/groupinfo.c
@@ -24,13 +24,10 @@
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
-#include "libnet/composite.h"
 #include "librpc/gen_ndr/security.h"
 #include "libcli/security/security.h"
-#include "libnet/userman.h"
-#include "libnet/groupinfo.h"
+#include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
-#include "libnet/libnet_proto.h"
 
 
 struct groupinfo_state {

diff --git a/source4/libnet/groupman.c b/source4/libnet/groupman.c
index 4dfb2d8aabc3a2a071c7f09d5f64116200a0eae3..0f54db9705b6b931ce7bfea42c73335527f405c9 100644 (file)
--- a/source4/libnet/groupman.c
+++ b/source4/libnet/groupman.c
@@ -23,10 +23,8 @@
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
-#include "libnet/composite.h"
-#include "libnet/groupman.h"
+#include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
-#include "libnet/libnet_proto.h"
 
 
 struct groupadd_state {

diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index 6e7924248c632ff8b5b0ad63691641e4227b7297..294ea4b79c5517927a304e5909a39ecb1b7b2161 100644 (file)
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -1511,8 +1511,8 @@ static void becomeDC_drsuapi_connect_send(struct libnet_BecomeDC_state *s,
        drsuapi->s = s;
 
        if (!drsuapi->binding) {
-               char *krb5_str = "";
-               char *print_str = "";
+               const char *krb5_str = "";
+               const char *print_str = "";
                /*
                 * Note: Replication only works with Windows 2000 when 'krb5' is
                 *       passed as auth_type here. If NTLMSSP is used, Windows

diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 70fcb4a894eac46bc86a1a6208f27c2fe2b0daf6..0a4e357925af13a84bb079ca607138138935719e 100644 (file)
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -1223,6 +1223,8 @@ NTSTATUS libnet_Join(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, struct lib
                case SEC_CHAN_BDC:
                        return libnet_Join_primary_domain(ctx, mem_ctx, r);
                case SEC_CHAN_DOMAIN:
+               case SEC_CHAN_DNS_DOMAIN:
+               case SEC_CHAN_NULL:
                        break;
        }
 

diff --git a/source4/libnet/userinfo.c b/source4/libnet/userinfo.c
index 710154d41e195eddd5e3983dbdeb0725d19227c1..a718ab9e851a1e43a5658d87782829720f15f59e 100644 (file)
--- a/source4/libnet/userinfo.c
+++ b/source4/libnet/userinfo.c
@@ -23,13 +23,10 @@
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
-#include "libnet/composite.h"
 #include "librpc/gen_ndr/security.h"
 #include "libcli/security/security.h"
-#include "libnet/userman.h"
-#include "libnet/userinfo.h"
+#include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
-#include "libnet/libnet_proto.h"
 
 
 struct userinfo_state {

diff --git a/source4/libnet/userman.c b/source4/libnet/userman.c
index c638d8af32115aaf2c7baeb6e07b409e4c88c03e..62d4e0edd21d9928a2905333e5e1fbed4f7039ea 100644 (file)
--- a/source4/libnet/userman.c
+++ b/source4/libnet/userman.c
@@ -23,11 +23,8 @@
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
-#include "libnet/composite.h"
-#include "libnet/userman.h"
-#include "libnet/userinfo.h"
+#include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
-#include "libnet/libnet_proto.h"
 
 /*
  * Composite USER ADD functionality
@@ -684,7 +681,7 @@ static NTSTATUS usermod_change(struct composite_context *c,
                s->queryuser.in.user_handle = &s->user_handle;
                s->queryuser.in.level       = level;
                s->queryuser.out.info       = talloc(s, union samr_UserInfo *);
-               if (composite_nomem(s->queryuser.out.info, c)) return;
+               if (composite_nomem(s->queryuser.out.info, c)) return NT_STATUS_NO_MEMORY;
 
 
                /* send query user info request to retrieve complete data of