summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-09-14 13:14:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:06:44 -0500
commit7d554e4104f432c7475f6a1019deb55619976a33 (patch)
tree79c7fc6f007ca5f2f09f903ea4525798e39e86ce
parent44500d6d98eecb5190da35be0a88a4287c08f3d1 (diff)
downloadsamba-7d554e4104f432c7475f6a1019deb55619976a33.tar.gz
samba-7d554e4104f432c7475f6a1019deb55619976a33.tar.bz2
samba-7d554e4104f432c7475f6a1019deb55619976a33.zip
r25158: rename nsswitch/winbindd_nss.h => nsswitch/winbind_struct_protocol.h
metze (This used to be commit 1fc3a37902005a4f127191b9183747ddfb1f59a3)
-rw-r--r--source4/nsswitch/wbinfo.c2
-rw-r--r--source4/nsswitch/winbind_client.h2
-rw-r--r--source4/nsswitch/winbind_struct_protocol.h (renamed from source4/nsswitch/winbindd_nss.h)0
-rw-r--r--source4/winbind/wb_cmd_getpwent.c1
-rw-r--r--source4/winbind/wb_cmd_getpwnam.c1
-rw-r--r--source4/winbind/wb_cmd_getpwuid.c1
-rw-r--r--source4/winbind/wb_cmd_list_users.c1
-rw-r--r--source4/winbind/wb_cmd_setpwent.c1
-rw-r--r--source4/winbind/wb_samba3_cmd.c2
-rw-r--r--source4/winbind/wb_samba3_protocol.c2
-rw-r--r--source4/winbind/wb_server.h2
11 files changed, 2 insertions, 13 deletions
diff --git a/source4/nsswitch/wbinfo.c b/source4/nsswitch/wbinfo.c
index 120a475bc1..a67b0512a2 100644
--- 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 373d56804a..6fafe6a7e3 100644
--- 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
index 724b830604..724b830604 100644
--- a/source4/nsswitch/winbindd_nss.h
+++ b/source4/nsswitch/winbind_struct_protocol.h
diff --git a/source4/winbind/wb_cmd_getpwent.c b/source4/winbind/wb_cmd_getpwent.c
index e4023dbad7..980a8a4d92 100644
--- 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 86488d964b..059fae5201 100644
--- 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 63a71b02cc..f47090d2a3 100644
--- 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 9260a42207..fd446a56d2 100644
--- 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 ac6caee6f0..50ab2fdff6 100644
--- 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 a86fc3d3a2..e1f32b23f7 100644
--- 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 f2c9763670..b252273cb6 100644
--- 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 7e9ee2feae..369fe025a9 100644
--- 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"