diff options
author | John H Terpstra <jht@samba.org> | 2009-07-23 09:33:06 -0500 |
---|---|---|
committer | John H Terpstra <jht@samba.org> | 2009-07-23 09:33:06 -0500 |
commit | 94717ae8e5dfe2ccdb7f3557d5490708b00ae471 (patch) | |
tree | a39f669faf23ad05497963cf5ccf611467d0145b /source4/libnet | |
parent | 14952c72a29ec92badb1bcf16d2a15fe100f060d (diff) | |
parent | 7bad4b48c82fed4263c2bfe97a4d00b47913604a (diff) | |
download | samba-94717ae8e5dfe2ccdb7f3557d5490708b00ae471.tar.gz samba-94717ae8e5dfe2ccdb7f3557d5490708b00ae471.tar.bz2 samba-94717ae8e5dfe2ccdb7f3557d5490708b00ae471.zip |
Merge branch 'master' of ssh://jht@git.samba.org/data/git/samba
Diffstat (limited to 'source4/libnet')
-rw-r--r-- | source4/libnet/libnet_become_dc.c | 2 | ||||
-rw-r--r-- | source4/libnet/libnet_group.c | 2 | ||||
-rw-r--r-- | source4/libnet/libnet_group.h | 4 | ||||
-rw-r--r-- | source4/libnet/libnet_samdump.c | 1 | ||||
-rw-r--r-- | source4/libnet/libnet_unbecome_dc.c | 2 | ||||
-rw-r--r-- | source4/libnet/libnet_user.c | 2 | ||||
-rw-r--r-- | source4/libnet/libnet_user.h | 4 |
7 files changed, 9 insertions, 8 deletions
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c index dbbabd6a6d..b89e238a1c 100644 --- a/source4/libnet/libnet_become_dc.c +++ b/source4/libnet/libnet_become_dc.c @@ -25,7 +25,7 @@ #include "lib/ldb/include/ldb_errors.h" #include "lib/ldb_wrap.h" #include "dsdb/samdb/samdb.h" -#include "dsdb/common/flags.h" +#include "../libds/common/flags.h" #include "librpc/gen_ndr/ndr_drsuapi_c.h" #include "libcli/security/security.h" #include "librpc/gen_ndr/ndr_misc.h" diff --git a/source4/libnet/libnet_group.c b/source4/libnet/libnet_group.c index b0669640f3..9e7abe81b1 100644 --- a/source4/libnet/libnet_group.c +++ b/source4/libnet/libnet_group.c @@ -484,7 +484,7 @@ struct composite_context *libnet_GroupList_send(struct libnet_context *ctx, /* store the arguments in the state structure */ s->ctx = ctx; s->page_size = io->in.page_size; - s->resume_index = (uint32_t)io->in.resume_index; + s->resume_index = io->in.resume_index; s->domain_name = talloc_strdup(c, io->in.domain_name); s->monitor_fn = monitor; diff --git a/source4/libnet/libnet_group.h b/source4/libnet/libnet_group.h index b80d3449c8..8ac47437fd 100644 --- a/source4/libnet/libnet_group.h +++ b/source4/libnet/libnet_group.h @@ -58,11 +58,11 @@ struct libnet_GroupList { struct { const char *domain_name; int page_size; - uint resume_index; + uint32_t resume_index; } in; struct { int count; - uint resume_index; + uint32_t resume_index; struct grouplist { const char *sid; diff --git a/source4/libnet/libnet_samdump.c b/source4/libnet/libnet_samdump.c index 08a2295169..8092260515 100644 --- a/source4/libnet/libnet_samdump.c +++ b/source4/libnet/libnet_samdump.c @@ -25,6 +25,7 @@ #include "../lib/util/dlinklist.h" #include "samba3/samba3.h" #include "libcli/security/security.h" +#include "param/param.h" struct samdump_secret { diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c index e0e5e42115..3bd7a4e287 100644 --- a/source4/libnet/libnet_unbecome_dc.c +++ b/source4/libnet/libnet_unbecome_dc.c @@ -25,7 +25,7 @@ #include "lib/ldb/include/ldb_errors.h" #include "lib/ldb_wrap.h" #include "dsdb/samdb/samdb.h" -#include "dsdb/common/flags.h" +#include "../libds/common/flags.h" #include "librpc/gen_ndr/ndr_drsuapi_c.h" #include "param/param.h" diff --git a/source4/libnet/libnet_user.c b/source4/libnet/libnet_user.c index 8606d0856e..dd4d501c17 100644 --- a/source4/libnet/libnet_user.c +++ b/source4/libnet/libnet_user.c @@ -945,7 +945,7 @@ struct composite_context* libnet_UserList_send(struct libnet_context *ctx, /* store the arguments in the state structure */ s->ctx = ctx; s->page_size = r->in.page_size; - s->resume_index = (uint32_t)r->in.resume_index; + s->resume_index = r->in.resume_index; s->domain_name = talloc_strdup(c, r->in.domain_name); s->monitor_fn = monitor; diff --git a/source4/libnet/libnet_user.h b/source4/libnet/libnet_user.h index 4aad654b3b..8203d14c33 100644 --- a/source4/libnet/libnet_user.h +++ b/source4/libnet/libnet_user.h @@ -140,11 +140,11 @@ struct libnet_UserList { struct { const char *domain_name; int page_size; - uint resume_index; + uint32_t resume_index; } in; struct { int count; - uint resume_index; + uint32_t resume_index; struct userlist { const char *sid; |