s3-libnet: better separate headers.

[kamenim/samba.git] / source3 / libnet / libnet_dssync_keytab.c

diff --git a/source3/libnet/libnet_dssync_keytab.c b/source3/libnet/libnet_dssync_keytab.c
index a05bfdcbe29d85efacea084707e8303f4c19472d..b0c745d1107ade72e80c866a9d95d2feefe49f87 100644 (file)
--- a/source3/libnet/libnet_dssync_keytab.c
+++ b/source3/libnet/libnet_dssync_keytab.c
@@ -19,7 +19,10 @@
 */
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "smb_krb5.h"
+#include "ads.h"
+#include "libnet/libnet_dssync.h"
+#include "libnet/libnet_keytab.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 
 #if defined(HAVE_ADS) && defined(ENCTYPE_ARCFOUR_HMAC)
@@ -52,8 +55,7 @@ static NTSTATUS keytab_startup(struct dssync_context *ctx, TALLOC_CTX *mem_ctx,
                enum ndr_err_code ndr_err;
                old_utdv = talloc(mem_ctx, struct replUpToDateVectorBlob);
 
-               ndr_err = ndr_pull_struct_blob(&entry->password, old_utdv,
-                               NULL, old_utdv,
+               ndr_err = ndr_pull_struct_blob(&entry->password, old_utdv, old_utdv,
                                (ndr_pull_flags_fn_t)ndr_pull_replUpToDateVectorBlob);
                if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                        NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
@@ -91,7 +93,7 @@ static NTSTATUS keytab_finish(struct dssync_context *ctx, TALLOC_CTX *mem_ctx,
                        NDR_PRINT_DEBUG(replUpToDateVectorBlob, new_utdv);
                }
 
-               ndr_err = ndr_push_struct_blob(&blob, mem_ctx, NULL, new_utdv,
+               ndr_err = ndr_push_struct_blob(&blob, mem_ctx, new_utdv,
                                (ndr_push_flags_fn_t)ndr_push_replUpToDateVectorBlob);
                if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                        status = ndr_map_error2ntstatus(ndr_err);
@@ -146,7 +148,7 @@ static  NTSTATUS parse_supplemental_credentials(TALLOC_CTX *mem_ctx,
        bool newer_keys = false;
        uint32_t j;
 
-       ndr_err = ndr_pull_struct_blob_all(blob, mem_ctx, NULL, &scb,
+       ndr_err = ndr_pull_struct_blob_all(blob, mem_ctx, &scb,
                        (ndr_pull_flags_fn_t)ndr_pull_supplementalCredentialsBlob);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                status = ndr_map_error2ntstatus(ndr_err);
@@ -203,7 +205,7 @@ static  NTSTATUS parse_supplemental_credentials(TALLOC_CTX *mem_ctx,
                status = NT_STATUS_NO_MEMORY;
                goto done;
        }
-       ndr_err = ndr_pull_struct_blob(&scpk_blob, mem_ctx, NULL, pkb,
+       ndr_err = ndr_pull_struct_blob(&scpk_blob, mem_ctx, pkb,
                        (ndr_pull_flags_fn_t)ndr_pull_package_PrimaryKerberosBlob);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                status = ndr_map_error2ntstatus(ndr_err);