From 2ecd50116c22536f9a77131bc14a64915a2fc12e Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 2 Nov 2011 20:07:42 +0100
Subject: librpc: remove nbt dependency to samr.

Guenther
---
 libcli/netlogon/ndr_netlogon.c | 4 ++--
 libcli/netlogon/netlogon.h     | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'libcli/netlogon')

diff --git a/libcli/netlogon/ndr_netlogon.c b/libcli/netlogon/ndr_netlogon.c
index 7d6aa974b0..cab159f3a3 100644
--- a/libcli/netlogon/ndr_netlogon.c
+++ b/libcli/netlogon/ndr_netlogon.c
@@ -48,7 +48,7 @@ enum ndr_err_code ndr_push_NETLOGON_SAM_LOGON_REQUEST(struct ndr_push *ndr, int
 			NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->mailslot_name));
 			ndr->flags = _flags_save_string;
 		}
-		NDR_CHECK(ndr_push_samr_AcctFlags(ndr, NDR_SCALARS, r->acct_control));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->acct_control));
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_size_dom_sid0(&r->sid, ndr->flags)));
 		if (ndr_size_dom_sid0(&r->sid, ndr->flags)) {
 			struct ndr_push *_ndr_sid;
@@ -93,7 +93,7 @@ enum ndr_err_code ndr_pull_NETLOGON_SAM_LOGON_REQUEST(struct ndr_pull *ndr, int
 			NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->mailslot_name));
 			ndr->flags = _flags_save_string;
 		}
-		NDR_CHECK(ndr_pull_samr_AcctFlags(ndr, NDR_SCALARS, &r->acct_control));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->acct_control));
 		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->sid_size));
 		if (r->sid_size) {
 			uint32_t _flags_save_DATA_BLOB = ndr->flags;
diff --git a/libcli/netlogon/netlogon.h b/libcli/netlogon/netlogon.h
index 9bf346af26..30f716cceb 100644
--- a/libcli/netlogon/netlogon.h
+++ b/libcli/netlogon/netlogon.h
@@ -27,7 +27,6 @@
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_svcctl.h"
-#include "librpc/gen_ndr/ndr_samr.h"
 
 struct netlogon_samlogon_response
 {
-- 
cgit