r25158: rename nsswitch/winbindd_nss.h => nsswitch/winbind_struct_protocol.h

metze
(This used to be commit 1fc3a37902005a4f127191b9183747ddfb1f59a3)

diff --git a/source4/nsswitch/wbinfo.c b/source4/nsswitch/wbinfo.c
index 120a475bc17073df6c8b35c51dd619b48fa3d962..a67b0512a2bc276ada683fa7b2091fe7b673882f 100644 (file)
--- a/source4/nsswitch/wbinfo.c
+++ b/source4/nsswitch/wbinfo.c
@@ -22,8 +22,6 @@
 
 #include "includes.h"
 #include "pstring.h"
-#include "winbind_nss_config.h"
-#include "winbindd_nss.h"
 #include "winbind_client.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "libcli/auth/libcli_auth.h"

diff --git a/source4/nsswitch/winbind_client.h b/source4/nsswitch/winbind_client.h
index 373d56804a901192523bb4872a61a9b242b6a244..6fafe6a7e3a8c848475f42dfd5963e4bfa792cb5 100644 (file)
--- a/source4/nsswitch/winbind_client.h
+++ b/source4/nsswitch/winbind_client.h
@@ -1,5 +1,5 @@
 #include "nsswitch/winbind_nss_config.h"
-#include "nsswitch/winbindd_nss.h"
+#include "nsswitch/winbind_struct_protocol.h"
 
 void init_request(struct winbindd_request *req,int rq_type);
 NSS_STATUS winbindd_send_request(int req_type,

diff --git a/source4/nsswitch/winbindd_nss.h b/source4/nsswitch/winbind_struct_protocol.h
similarity index 100%
rename from source4/nsswitch/winbindd_nss.h
rename to source4/nsswitch/winbind_struct_protocol.h

diff --git a/source4/winbind/wb_cmd_getpwent.c b/source4/winbind/wb_cmd_getpwent.c
index e4023dbad73c9b7f893ed0c94c9ecb64072e1313..980a8a4d92d3c6af44d8bf960882423e2c3813d1 100644 (file)
--- a/source4/winbind/wb_cmd_getpwent.c
+++ b/source4/winbind/wb_cmd_getpwent.c
@@ -25,7 +25,6 @@
 #include "winbind/wb_async_helpers.h"
 #include "winbind/wb_helper.h"
 #include "smbd/service_task.h"
-#include "nsswitch/winbindd_nss.h"
 #include "libnet/libnet_proto.h"
 
 struct cmd_getpwent_state {

diff --git a/source4/winbind/wb_cmd_getpwnam.c b/source4/winbind/wb_cmd_getpwnam.c
index 86488d964b6e73bd6c7c400e3d568a55784f4d02..059fae52010256622d8b556e5ea1cf1b5fb77f88 100644 (file)
--- a/source4/winbind/wb_cmd_getpwnam.c
+++ b/source4/winbind/wb_cmd_getpwnam.c
@@ -25,7 +25,6 @@
 #include "winbind/wb_async_helpers.h"
 #include "winbind/wb_helper.h"
 #include "smbd/service_task.h"
-#include "nsswitch/winbindd_nss.h"
 #include "libnet/libnet_proto.h"
 #include "param/param.h"
 #include "libcli/security/proto.h"

diff --git a/source4/winbind/wb_cmd_getpwuid.c b/source4/winbind/wb_cmd_getpwuid.c
index 63a71b02ccd76c72196baa23587d771c0687f244..f47090d2a3e5da992bea6f840170bb4f9fbd116b 100644 (file)
--- a/source4/winbind/wb_cmd_getpwuid.c
+++ b/source4/winbind/wb_cmd_getpwuid.c
@@ -25,7 +25,6 @@
 #include "winbind/wb_async_helpers.h"
 #include "winbind/wb_helper.h"
 #include "smbd/service_task.h"
-#include "nsswitch/winbindd_nss.h"
 #include "libnet/libnet_proto.h"
 #include "param/param.h"
 #include "libcli/security/proto.h"

diff --git a/source4/winbind/wb_cmd_list_users.c b/source4/winbind/wb_cmd_list_users.c
index 9260a422077814e499dc148abb04fa88029a160f..fd446a56d2c5b4884a909225a622a8b0cb5f3885 100644 (file)
--- a/source4/winbind/wb_cmd_list_users.c
+++ b/source4/winbind/wb_cmd_list_users.c
@@ -25,7 +25,6 @@
 #include "winbind/wb_async_helpers.h"
 #include "winbind/wb_helper.h"
 #include "smbd/service_task.h"
-#include "nsswitch/winbindd_nss.h"
 #include "libnet/libnet_proto.h"
 
 struct cmd_list_users_state {

diff --git a/source4/winbind/wb_cmd_setpwent.c b/source4/winbind/wb_cmd_setpwent.c
index ac6caee6f0b02b0b81d916c8f1552d9d5facc813..50ab2fdff61f4548f609fd35f38be6aa5a00dde0 100644 (file)
--- a/source4/winbind/wb_cmd_setpwent.c
+++ b/source4/winbind/wb_cmd_setpwent.c
@@ -25,7 +25,6 @@
 #include "winbind/wb_async_helpers.h"
 #include "winbind/wb_helper.h"
 #include "smbd/service_task.h"
-#include "nsswitch/winbindd_nss.h"
 #include "libnet/libnet_proto.h"
 
 struct cmd_setpwent_state {

diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c
index a86fc3d3a2cba89104e0a8cab988e277772bb9ff..e1f32b23f70840d160386a44739a471fc6be7e7c 100644 (file)
--- a/source4/winbind/wb_samba3_cmd.c
+++ b/source4/winbind/wb_samba3_cmd.c
@@ -21,8 +21,6 @@
 */
 
 #include "includes.h"
-#include "nsswitch/winbind_nss_config.h"
-#include "nsswitch/winbindd_nss.h"
 #include "winbind/wb_server.h"
 #include "winbind/wb_async_helpers.h"
 #include "winbind/wb_helper.h"

diff --git a/source4/winbind/wb_samba3_protocol.c b/source4/winbind/wb_samba3_protocol.c
index f2c9763670e5d2b0ef2bba57f97c10fe3cede3c6..b252273cb63bdbd9eade1e57855e4da3d063c16a 100644 (file)
--- a/source4/winbind/wb_samba3_protocol.c
+++ b/source4/winbind/wb_samba3_protocol.c
@@ -20,8 +20,6 @@
 */
 
 #include "includes.h"
-#include "nsswitch/winbind_nss_config.h"
-#include "nsswitch/winbindd_nss.h"
 #include "winbind/wb_server.h"
 #include "smbd/service_stream.h"
 #include "lib/stream/packet.h"

diff --git a/source4/winbind/wb_server.h b/source4/winbind/wb_server.h
index 7e9ee2feaeb44b4ea0a0d6ae74df3a6ea263cec9..369fe025a997952d058cb491587106de8996fb2a 100644 (file)
--- a/source4/winbind/wb_server.h
+++ b/source4/winbind/wb_server.h
@@ -20,7 +20,7 @@
 */
 
 #include "nsswitch/winbind_nss_config.h"
-#include "nsswitch/winbindd_nss.h"
+#include "nsswitch/winbind_struct_protocol.h"
 #include "libnet/libnet.h"
 
 #define WINBINDD_SAMBA3_SOCKET "pipe"