From ae36783c7bed73461c012d78ec3e1f3a6bc3d221 Mon Sep 17 00:00:00 2001
From: =?utf8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
Date: Mon, 2 Aug 2010 22:52:00 +0200
Subject: [PATCH] s3-passdb: include samr.h where needed.

Guenther
---
 source3/libsmb/passchange.c        | 2 +-
 source3/pam_smbpass/general.h      | 2 ++
 source3/passdb/pdb_ads.c           | 1 +
 source3/passdb/pdb_interface.c     | 1 +
 source3/passdb/pdb_smbpasswd.c     | 1 +
 source3/rpc_server/srv_samr_util.c | 1 +
 source3/utils/net_sam.c            | 1 +
 source3/utils/pdbedit.c            | 1 +
 source3/utils/smbpasswd.c          | 1 +
 9 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c
index 88f1ca8da27..5117d78d479 100644
--- a/source3/libsmb/passchange.c
+++ b/source3/libsmb/passchange.c
@@ -18,8 +18,8 @@
 */
 
 #include "includes.h"
-#include "rpc_client/cli_samr.h"
 #include "../librpc/gen_ndr/ndr_samr.h"
+#include "rpc_client/cli_samr.h"
 
 /*************************************************************
  Change a password on a remote machine using IPC calls.
diff --git a/source3/pam_smbpass/general.h b/source3/pam_smbpass/general.h
index 320bdd0cc87..4607620c29b 100644
--- a/source3/pam_smbpass/general.h
+++ b/source3/pam_smbpass/general.h
@@ -1,3 +1,5 @@
+#include "../librpc/gen_ndr/samr.h"
+
 #ifndef LINUX
 /* This is only needed by modules in the Sun implementation. */
 #if defined(HAVE_SECURITY_PAM_APPL_H)
diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c
index 3ca24c49911..9eb5b6067e2 100644
--- a/source3/passdb/pdb_ads.c
+++ b/source3/passdb/pdb_ads.c
@@ -22,6 +22,7 @@
 #include "tldap_util.h"
 #include "../libds/common/flags.h"
 #include "secrets.h"
+#include "../librpc/gen_ndr/samr.h"
 
 struct pdb_ads_state {
 	struct sockaddr_un socket_address;
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index ba6725e7a5e..b11fab45081 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "secrets.h"
+#include "../librpc/gen_ndr/samr.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index bfd996436ef..dd89c8e10ba 100644
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -21,6 +21,7 @@
  */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/samr.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB
diff --git a/source3/rpc_server/srv_samr_util.c b/source3/rpc_server/srv_samr_util.c
index d456486a102..8bbcc1a5ee3 100644
--- a/source3/rpc_server/srv_samr_util.c
+++ b/source3/rpc_server/srv_samr_util.c
@@ -23,6 +23,7 @@
 */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/samr.h"
 #include "rpc_server/srv_samr_util.h"
 
 #undef DBGC_CLASS
diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index 311cdd591b6..e02837fbc61 100644
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "../librpc/gen_ndr/samr.h"
 
 /*
  * Set a user's data
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index b3c6d14a96e..9dff45b8f37 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "popt_common.h"
+#include "../librpc/gen_ndr/samr.h"
 
 #define BIT_BACKEND	0x00000004
 #define BIT_VERBOSE	0x00000008
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 08ccab21261..1b68136c687 100644
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -18,6 +18,7 @@
 
 #include "includes.h"
 #include "secrets.h"
+#include "../librpc/gen_ndr/samr.h"
 
 extern bool AllowDebugChange;
 
-- 
2.34.1