From 9848086aa82d97e7cff33135065df64a6799f0a7 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Sat, 13 Feb 2010 17:54:27 +0100
Subject: libwbclient: Fix s4 build failure by fixing up includes.

Sorry about this, folks.
---
 nsswitch/libwbclient/libwbclient.h     | 1 -
 nsswitch/libwbclient/wbc_idmap_async.c | 1 +
 nsswitch/libwbclient/wbc_pam_async.c   | 1 +
 nsswitch/libwbclient/wbc_sid_async.c   | 1 +
 nsswitch/libwbclient/wbc_util_async.c  | 1 +
 nsswitch/libwbclient/wbclient.c        | 2 --
 6 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nsswitch/libwbclient/libwbclient.h b/nsswitch/libwbclient/libwbclient.h
index 5a25cf462c..74cba7e796 100644
--- a/nsswitch/libwbclient/libwbclient.h
+++ b/nsswitch/libwbclient/libwbclient.h
@@ -36,7 +36,6 @@
 /* Public headers */
 
 #include "wbclient.h"
-#include "wbc_async.h"
 
 /* Private headers */
 
diff --git a/nsswitch/libwbclient/wbc_idmap_async.c b/nsswitch/libwbclient/wbc_idmap_async.c
index 4b84bb9ca5..dcf59cbb58 100644
--- a/nsswitch/libwbclient/wbc_idmap_async.c
+++ b/nsswitch/libwbclient/wbc_idmap_async.c
@@ -23,6 +23,7 @@
 
 #include "replace.h"
 #include "libwbclient.h"
+#include "wbc_async.h"
 
 struct wbc_sid_to_uid_state {
 	struct winbindd_request req;
diff --git a/nsswitch/libwbclient/wbc_pam_async.c b/nsswitch/libwbclient/wbc_pam_async.c
index f551f7473d..21d187f124 100644
--- a/nsswitch/libwbclient/wbc_pam_async.c
+++ b/nsswitch/libwbclient/wbc_pam_async.c
@@ -24,6 +24,7 @@
 #include "replace.h"
 #include "libwbclient.h"
 #include "../winbind_client.h"
+#include "wbc_async.h"
 
 /* FIXME: Currently this is still a copy of the same function from wbc_pam.c */
 static wbcErr wbc_create_auth_info(TALLOC_CTX *mem_ctx,
diff --git a/nsswitch/libwbclient/wbc_sid_async.c b/nsswitch/libwbclient/wbc_sid_async.c
index 7e3bd75d82..b94b88d491 100644
--- a/nsswitch/libwbclient/wbc_sid_async.c
+++ b/nsswitch/libwbclient/wbc_sid_async.c
@@ -24,6 +24,7 @@
 #include "replace.h"
 #include "libwbclient.h"
 #include "../winbind_client.h"
+#include "wbc_async.h"
 
 struct wbc_lookup_name_state {
 	struct winbindd_request req;
diff --git a/nsswitch/libwbclient/wbc_util_async.c b/nsswitch/libwbclient/wbc_util_async.c
index eb7fb040ce..8801b8ecc5 100644
--- a/nsswitch/libwbclient/wbc_util_async.c
+++ b/nsswitch/libwbclient/wbc_util_async.c
@@ -23,6 +23,7 @@
 
 #include "replace.h"
 #include "libwbclient.h"
+#include "wbc_async.h"
 
 struct wbc_ping_state {
 	struct winbindd_request req;
diff --git a/nsswitch/libwbclient/wbclient.c b/nsswitch/libwbclient/wbclient.c
index b521567c90..31a736da0b 100644
--- a/nsswitch/libwbclient/wbclient.c
+++ b/nsswitch/libwbclient/wbclient.c
@@ -23,8 +23,6 @@
 /* Required Headers */
 
 #include "replace.h"
-#include "talloc.h"
-#include "tevent.h"
 #include "libwbclient.h"
 
 /* From wb_common.c */
-- 
cgit