[SCM] Samba Shared Repository - branch master updated

[Kai Blin]

The branch, master has been updated
       via  9848086... libwbclient: Fix s4 build failure by fixing up includes.
      from  b00d223... s3: Fix Coverity ID 629: DEADCODE

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9848086aa82d97e7cff33135065df64a6799f0a7
Author: Kai Blin <kai at samba.org>
Date:   Sat Feb 13 17:54:27 2010 +0100

    libwbclient: Fix s4 build failure by fixing up includes.
    
    Sorry about this, folks.

-----------------------------------------------------------------------

Summary of changes:
 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(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/libwbclient/libwbclient.h b/nsswitch/libwbclient/libwbclient.h
index 5a25cf4..74cba7e 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 4b84bb9..dcf59cb 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 f551f74..21d187f 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 7e3bd75..b94b88d 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 eb7fb04..8801b8e 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 b521567..31a736d 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 */


-- 
Samba Shared Repository