librpc/idl: Merge wbint.idl with winbind.idl so we can forward IRPC requests to inter...

Change-Id: Iba3913d5a1c7f851b93f37e9beb6dbb20fbf7e55
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/source3/librpc/idl/wbint.idl b/librpc/idl/winbind.idl
similarity index 86%
rename from source3/librpc/idl/wbint.idl
rename to librpc/idl/winbind.idl
index e91ef072fcc54d59bc0434a38a6fc383b1fd7b0a..39e89c3d814457f715a81e3f8b292f7f261ce874 100644 (file)
--- a/source3/librpc/idl/wbint.idl
+++ b/librpc/idl/winbind.idl
@@ -9,8 +9,10 @@ import "lsa.idl", "netlogon.idl", "misc.idl", "security.idl", "idmap.idl";
     helpstring("winbind parent-child protocol"),
     no_srv_register
 ]
-interface wbint
+interface winbind
 {
+  /* Private methods */
+
     void wbint_Ping(
        [in] uint32 in_data,
        [out] uint32 *out_data
@@ -168,9 +170,26 @@ interface wbint
        [out,string,charset(UTF8)] char **dcname
        );
 
-    NTSTATUS wbint_DsrUpdateReadOnlyServerDnsRecords(
+  /* Public methods available via IRPC */
+
+    typedef [switch_type(uint16)] union netr_LogonLevel netr_LogonLevel;
+    typedef [switch_type(uint16)] union netr_Validation netr_Validation;
+
+    /*
+     * do a netr_LogonSamLogon() against the right DC
+     */
+    NTSTATUS winbind_SamLogon(
+       [in]  uint16 logon_level,
+       [in]  [switch_is(logon_level)] netr_LogonLevel logon,
+       [in]  uint16 validation_level,
+       [out] [switch_is(validation_level)] netr_Validation validation,
+       [out] uint8 authoritative
+       );
+
+    NTSTATUS winbind_DsrUpdateReadOnlyServerDnsRecords(
        [in,unique] [string,charset(UTF16)] uint16 *site_name,
        [in] uint32 dns_ttl,
        [in,out,ref] NL_DNS_NAME_INFO_ARRAY *dns_names
        );
+
 }

diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index f181786d013d9101644b716618172853979e4040..d1484afcda5063aa6fbe53de55068a8df72a99df 100644 (file)
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -35,3 +35,8 @@ bld.SAMBA_PIDL_LIST('PIDL',
                    'dnsp.idl nfs4acl.idl',
                     options='--header --ndr-parser --client --python',
                     output_dir='../gen_ndr')
+
+bld.SAMBA_PIDL_LIST('PIDL',
+                    'winbind.idl',
+                    options='--header --ndr-parser --samba3-ndr-server --client --python',
+                    output_dir='../gen_ndr')

diff --git a/librpc/wscript_build b/librpc/wscript_build
index 1c2062f046eaf5e54f5548bda10aba9dfbc69264..393f57979a627f2188aafaa099e98e27e4383755 100644 (file)
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -663,3 +663,18 @@ bld.SAMBA_LIBRARY('dcerpc-binding',
     pc_files=[],
     public_headers='rpc/rpc_common.h',
     vnum='0.0.1')
+
+bld.SAMBA_SUBSYSTEM('NDR_WINBIND',
+       source='gen_ndr/ndr_winbind.c',
+       public_deps='ndr'
+       )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_WINBIND',
+       source='gen_ndr/ndr_winbind_c.c',
+       public_deps='dcerpc NDR_WINBIND'
+       )
+
+bld.SAMBA3_SUBSYSTEM('SRV_NDR_WINBIND',
+       source='gen_ndr/srv_winbind.c',
+       public_deps='NDR_WINBIND'
+       )

diff --git a/source3/librpc/idl/wscript_build b/source3/librpc/idl/wscript_build
index 712108d4e6c20ce7683dd1966505271f989bca7a..c38fe7bd72b5eea7e3a5fddca0aab0ebd29cc7f3 100644 (file)
--- a/source3/librpc/idl/wscript_build
+++ b/source3/librpc/idl/wscript_build
@@ -11,8 +11,3 @@ bld.SAMBA_PIDL_LIST('PIDL',
                     ''',
                     options='--includedir=%s --header --ndr-parser' % topinclude,
                     output_dir='../gen_ndr')
-
-bld.SAMBA_PIDL_LIST('PIDL',
-                    'wbint.idl',
-                    options='--includedir=%s --header --ndr-parser --samba3-ndr-server --client' % topinclude,
-                    output_dir='../gen_ndr')

diff --git a/source3/librpc/wscript_build b/source3/librpc/wscript_build
index c0dc9b4cb5d50e0041dd70a2595bc692df0f6a89..77ae048f3af50cef122e3a61508175ac5a1f0b13 100644 (file)
--- a/source3/librpc/wscript_build
+++ b/source3/librpc/wscript_build
@@ -35,17 +35,3 @@ bld.SAMBA3_SUBSYSTEM('NDR_PERFCOUNT',
        public_deps='ndr'
        )
 
-bld.SAMBA3_SUBSYSTEM('NDR_WBINT',
-       source='gen_ndr/ndr_wbint.c',
-       public_deps='ndr'
-       )
-
-bld.SAMBA3_SUBSYSTEM('RPC_NDR_WBINT',
-       source='../librpc/gen_ndr/ndr_wbint_c.c',
-       public_deps='dcerpc NDR_WBINT'
-       )
-
-bld.SAMBA3_SUBSYSTEM('SRV_NDR_WBINT',
-       source='../librpc/gen_ndr/srv_wbint.c',
-       public_deps='NDR_WBINT'
-       )

diff --git a/source3/winbindd/wb_dsgetdcname.c b/source3/winbindd/wb_dsgetdcname.c
index 207d1b61ea4c8ce525dfdc894383a9df35c13475..bc952cd03de0ac37ca5a7ce7cfa84b828fa0165e 100644 (file)
--- a/source3/winbindd/wb_dsgetdcname.c
+++ b/source3/winbindd/wb_dsgetdcname.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 
 struct wb_dsgetdcname_state {
        struct netr_DsRGetDCNameInfo *dcinfo;

diff --git a/source3/winbindd/wb_fill_pwent.c b/source3/winbindd/wb_fill_pwent.c
index 8c8f839a51cec34eacbd56b33cf5f63bbf004529..206827cc92e5c008e7f7f2ae479de3ddb32554f6 100644 (file)
--- a/source3/winbindd/wb_fill_pwent.c
+++ b/source3/winbindd/wb_fill_pwent.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 
 struct wb_fill_pwent_state {
        struct tevent_context *ev;

diff --git a/source3/winbindd/wb_getgrsid.c b/source3/winbindd/wb_getgrsid.c
index f3899b0c466e39a8414cab22488d903c55363433..2678c5014c9c677023bb5afa79baa241d9f79c70 100644 (file)
--- a/source3/winbindd/wb_getgrsid.c
+++ b/source3/winbindd/wb_getgrsid.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "../libcli/security/security.h"
 
 struct wb_getgrsid_state {

diff --git a/source3/winbindd/wb_getpwsid.c b/source3/winbindd/wb_getpwsid.c
index 9e41bcaec7517ffdd42c5ca532e90a3b25036e87..5e218ac7b62abef18eaf6281c228dfae8091daa3 100644 (file)
--- a/source3/winbindd/wb_getpwsid.c
+++ b/source3/winbindd/wb_getpwsid.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "../libcli/security/security.h"
 
 struct wb_getpwsid_state {

diff --git a/source3/winbindd/wb_gettoken.c b/source3/winbindd/wb_gettoken.c
index aaaffa0bf209e1c2b1c60adb8ab7310b9d5d4992..527199850a3f03f967dda0c9f1f4c1faa3da4260 100644 (file)
--- a/source3/winbindd/wb_gettoken.c
+++ b/source3/winbindd/wb_gettoken.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "../libcli/security/security.h"
 #include "passdb/machine_sid.h"
 

diff --git a/source3/winbindd/wb_gid2sid.c b/source3/winbindd/wb_gid2sid.c
index 942e5f7669e38ea58f9bb7536b8691532229ce0d..d78421286664ff8c40ccb113d9d2b92ca4895026 100644 (file)
--- a/source3/winbindd/wb_gid2sid.c
+++ b/source3/winbindd/wb_gid2sid.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "idmap_cache.h"
 #include "idmap.h"
 #include "../libcli/security/security.h"

diff --git a/source3/winbindd/wb_group_members.c b/source3/winbindd/wb_group_members.c
index ec36cdacbf0dbe424659d4c8b10fe5af7f237cf0..55f28d2f5b3e6ca02b58e3484812be1d84a2aaa5 100644 (file)
--- a/source3/winbindd/wb_group_members.c
+++ b/source3/winbindd/wb_group_members.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "../libcli/security/security.h"
 

diff --git a/source3/winbindd/wb_lookupname.c b/source3/winbindd/wb_lookupname.c
index 2ebaba03d3fb5447263ea2e5c6337d95c8fb99ca..62b2e477c1a1fd54964eabb7b99e540442a7f80d 100644 (file)
--- a/source3/winbindd/wb_lookupname.c
+++ b/source3/winbindd/wb_lookupname.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "../libcli/security/security.h"
 
 struct wb_lookupname_state {

diff --git a/source3/winbindd/wb_lookupsid.c b/source3/winbindd/wb_lookupsid.c
index 2ab3917ceb718de1d13a16a949b42a6465efffd4..7ff5c1e0e22a9a6fd16bd137f5a7f0f6731fdb72 100644 (file)
--- a/source3/winbindd/wb_lookupsid.c
+++ b/source3/winbindd/wb_lookupsid.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "../libcli/security/security.h"
 
 struct wb_lookupsid_state {

diff --git a/source3/winbindd/wb_lookupsids.c b/source3/winbindd/wb_lookupsids.c
index b474220949c629b2129a49acd571a0dade58b7ca..8c5f9dbbb48af6af63973deabd2413d1609cbbae 100644 (file)
--- a/source3/winbindd/wb_lookupsids.c
+++ b/source3/winbindd/wb_lookupsids.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "../libcli/security/security.h"
 #include "passdb/machine_sid.h"
 

diff --git a/source3/winbindd/wb_lookupuseraliases.c b/source3/winbindd/wb_lookupuseraliases.c
index 5e7eb1c33c2dbc03bb7dda5d6c750bd50a9cf952..9a5794fb6ad208d51cd09e15b1587113dbd25e2c 100644 (file)
--- a/source3/winbindd/wb_lookupuseraliases.c
+++ b/source3/winbindd/wb_lookupuseraliases.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 
 struct wb_lookupuseraliases_state {
        struct tevent_context *ev;

diff --git a/source3/winbindd/wb_lookupusergroups.c b/source3/winbindd/wb_lookupusergroups.c
index aeffc178d9bc689fa42a6123fac43428ebd23f14..b91de78c7641c01cd0d52067c19faa1e3e3adac2 100644 (file)
--- a/source3/winbindd/wb_lookupusergroups.c
+++ b/source3/winbindd/wb_lookupusergroups.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "../libcli/security/security.h"
 
 struct wb_lookupusergroups_state {

diff --git a/source3/winbindd/wb_next_grent.c b/source3/winbindd/wb_next_grent.c
index d3b03333585b53b8754b13940fb50b3e651ab719..aea134bafe90287a5f91969e6878f817f5b4f97c 100644 (file)
--- a/source3/winbindd/wb_next_grent.c
+++ b/source3/winbindd/wb_next_grent.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "passdb/machine_sid.h"
 
 struct wb_next_grent_state {

diff --git a/source3/winbindd/wb_next_pwent.c b/source3/winbindd/wb_next_pwent.c
index 785658d4beca558a97a56ffae86cdf2892f5d493..ade74e342d999fb7598f637ac7413127496b39e0 100644 (file)
--- a/source3/winbindd/wb_next_pwent.c
+++ b/source3/winbindd/wb_next_pwent.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "passdb/machine_sid.h"
 
 struct wb_next_pwent_state {

diff --git a/source3/winbindd/wb_query_user_list.c b/source3/winbindd/wb_query_user_list.c
index abbf7668e97821a73916b730654e1bfaf8541b59..8bdc42b6a2764c5e5b3fac4457a40950235b8429 100644 (file)
--- a/source3/winbindd/wb_query_user_list.c
+++ b/source3/winbindd/wb_query_user_list.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 
 struct wb_query_user_list_state {
        struct wbint_userinfos users;

diff --git a/source3/winbindd/wb_queryuser.c b/source3/winbindd/wb_queryuser.c
index 33416b9017b2462fb9ee7d6174055330d79fc014..974687aa484c663335081bfb3edaa1beeea559bf 100644 (file)
--- a/source3/winbindd/wb_queryuser.c
+++ b/source3/winbindd/wb_queryuser.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "../libcli/security/security.h"
 
 struct wb_queryuser_state {

diff --git a/source3/winbindd/wb_seqnum.c b/source3/winbindd/wb_seqnum.c
index 4a92e036dc4f1f56fe66e228dea5bc94053a0fea..7affd764ca2d2f1aaf2af30adaea73de3f641808 100644 (file)
--- a/source3/winbindd/wb_seqnum.c
+++ b/source3/winbindd/wb_seqnum.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 
 struct wb_seqnum_state {
        uint32_t seqnum;

diff --git a/source3/winbindd/wb_seqnums.c b/source3/winbindd/wb_seqnums.c
index 440a540ffa96118fed71f7684ee297bd054c3693..2a4cdc930e83cc615f56f8dc832943beea9cc001 100644 (file)
--- a/source3/winbindd/wb_seqnums.c
+++ b/source3/winbindd/wb_seqnums.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 
 struct wb_seqnums_state {
        int num_domains;

diff --git a/source3/winbindd/wb_sids2xids.c b/source3/winbindd/wb_sids2xids.c
index cbd4444566f2e10ddeb9b6ba8ba47c6a190ff5e2..519a710c964f645bc2b1248afbc6a53cb76f249b 100644 (file)
--- a/source3/winbindd/wb_sids2xids.c
+++ b/source3/winbindd/wb_sids2xids.c
@@ -22,7 +22,7 @@
 #include "winbindd.h"
 #include "../libcli/security/security.h"
 #include "idmap_cache.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 
 struct wb_sids2xids_state {
        struct tevent_context *ev;

diff --git a/source3/winbindd/wb_uid2sid.c b/source3/winbindd/wb_uid2sid.c
index e17cb06ef493cafd902e42a7330deb8677b04897..f4138f6a13537387155e349333a5cd140bf71ac0 100644 (file)
--- a/source3/winbindd/wb_uid2sid.c
+++ b/source3/winbindd/wb_uid2sid.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "idmap_cache.h"
 #include "idmap.h"
 #include "../libcli/security/security.h"

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 153a400f2e8a9c3650d947bf628aad07e268471c..b9bf8be812ae42b8ad13eda6c870ece6050880a3 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -42,7 +42,7 @@
 #include "source4/lib/messaging/irpc.h"
 #include "source4/lib/messaging/messaging.h"
 #include "lib/param/param.h"
-#include "source4/librpc/gen_ndr/ndr_winbind.h"
+#include "librpc/gen_ndr/ndr_winbind.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd.h b/source3/winbindd/winbindd.h
index 8f89e275d78d8b49ed6e20bb902054b3ffde0d1b..07c87dbcf45ce65801ec7241886bfad08b8c495c 100644 (file)
--- a/source3/winbindd/winbindd.h
+++ b/source3/winbindd/winbindd.h
@@ -26,7 +26,7 @@
 #include "nsswitch/winbind_struct_protocol.h"
 #include "nsswitch/libwbclient/wbclient.h"
 #include "librpc/gen_ndr/dcerpc.h"
-#include "librpc/gen_ndr/wbint.h"
+#include "librpc/gen_ndr/winbind.h"
 
 #include "talloc_dict.h"
 

diff --git a/source3/winbindd/winbindd_allocate_gid.c b/source3/winbindd/winbindd_allocate_gid.c
index b9aaa8c66a0cf8c324d13171e2242aab929f66b8..a9236bbf23d5873ad912af334d6cdd6fdeeae81f 100644 (file)
--- a/source3/winbindd/winbindd_allocate_gid.c
+++ b/source3/winbindd/winbindd_allocate_gid.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 
 struct winbindd_allocate_gid_state {
        uint64_t gid;

diff --git a/source3/winbindd/winbindd_allocate_uid.c b/source3/winbindd/winbindd_allocate_uid.c
index e2f0a678da5957fc2e9bae07f197ff3b2a30bec6..99c0bdac10246bd09438819107aadda76b53966b 100644 (file)
--- a/source3/winbindd/winbindd_allocate_uid.c
+++ b/source3/winbindd/winbindd_allocate_uid.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 
 struct winbindd_allocate_uid_state {
        uint64_t uid;

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 264e75c8bdf872da02d94d73773fc150135c7f08..51f3e04eae74d782bbf5fc50312078a6a3ae114d 100644 (file)
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -28,7 +28,7 @@
 #include "winbindd.h"
 #include "tdb_validate.h"
 #include "../libcli/auth/libcli_auth.h"
-#include "../librpc/gen_ndr/ndr_wbint.h"
+#include "../librpc/gen_ndr/ndr_winbind.h"
 #include "ads.h"
 #include "nss_info.h"
 #include "../libcli/security/security.h"

diff --git a/source3/winbindd/winbindd_change_machine_acct.c b/source3/winbindd/winbindd_change_machine_acct.c
index f335e345e54d45630f057a9c83be82e818f00d78..83eb99ba64ae7a10c24dadd0e0d0602250144c02 100644 (file)
--- a/source3/winbindd/winbindd_change_machine_acct.c
+++ b/source3/winbindd/winbindd_change_machine_acct.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 
 struct winbindd_change_machine_acct_state {
        uint8_t dummy;

diff --git a/source3/winbindd/winbindd_check_machine_acct.c b/source3/winbindd/winbindd_check_machine_acct.c
index 279370146a611e27554122b535415ad6bf873ca4..c6573745a5271b8ecb8019f695e03ea01be4359e 100644 (file)
--- a/source3/winbindd/winbindd_check_machine_acct.c
+++ b/source3/winbindd/winbindd_check_machine_acct.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 
 struct winbindd_check_machine_acct_state {
        uint8_t dummy;

diff --git a/source3/winbindd/winbindd_dsgetdcname.c b/source3/winbindd/winbindd_dsgetdcname.c
index dcf574dae36f3ec33384c5b11d9497136dbe9a19..c447b3aaf1de18b89fa6e8edaa3636e286c79d50 100644 (file)
--- a/source3/winbindd/winbindd_dsgetdcname.c
+++ b/source3/winbindd/winbindd_dsgetdcname.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 
 struct winbindd_dsgetdcname_state {
        struct GUID guid;

diff --git a/source3/winbindd/winbindd_dual_ndr.c b/source3/winbindd/winbindd_dual_ndr.c
index f3611be786377abe623c5192b9a8aa4a77b27d67..ed2b5ea22da830478370b3558cab89b5a19e0c99 100644 (file)
--- a/source3/winbindd/winbindd_dual_ndr.c
+++ b/source3/winbindd/winbindd_dual_ndr.c
@@ -30,7 +30,7 @@
 #include "winbindd/winbindd.h"
 #include "winbindd/winbindd_proto.h"
 #include "ntdomain.h"
-#include "librpc/gen_ndr/srv_wbint.h"
+#include "librpc/gen_ndr/srv_winbind.h"
 
 struct wbint_bh_state {
        struct winbindd_domain *domain;
@@ -283,7 +283,7 @@ struct dcerpc_binding_handle *wbint_binding_handle(TALLOC_CTX *mem_ctx,
        h = dcerpc_binding_handle_create(mem_ctx,
                                         &wbint_bh_ops,
                                         NULL,
-                                        &ndr_table_wbint,
+                                        &ndr_table_winbind,
                                         &hs,
                                         struct wbint_bh_state,
                                         __location__);
@@ -304,7 +304,7 @@ enum winbindd_result winbindd_dual_ndrcmd(struct winbindd_domain *domain,
        int num_fns;
        bool ret;
 
-       wbint_get_pipe_fns(&fns, &num_fns);
+       winbind_get_pipe_fns(&fns, &num_fns);
 
        if (state->request->data.ndrcmd >= num_fns) {
                return WINBINDD_ERROR;

diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c
index 721d293c4d01adad1a2ac63873a7646f2ea31449..985f0a92097ca382225d13e1beb26bd2ecbccca4 100644 (file)
--- a/source3/winbindd/winbindd_dual_srv.c
+++ b/source3/winbindd/winbindd_dual_srv.c
@@ -25,7 +25,7 @@
 #include "winbindd/winbindd_proto.h"
 #include "rpc_client/cli_pipe.h"
 #include "ntdomain.h"
-#include "librpc/gen_ndr/srv_wbint.h"
+#include "librpc/gen_ndr/srv_winbind.h"
 #include "../librpc/gen_ndr/ndr_netlogon_c.h"
 #include "idmap.h"
 #include "../libcli/security/security.h"
@@ -719,8 +719,8 @@ NTSTATUS _wbint_PingDc(struct pipes_struct *p, struct wbint_PingDc *r)
        return NT_STATUS_OK;
 }
 
-NTSTATUS _wbint_DsrUpdateReadOnlyServerDnsRecords(struct pipes_struct *p,
-                                                 struct wbint_DsrUpdateReadOnlyServerDnsRecords *r)
+NTSTATUS _winbind_DsrUpdateReadOnlyServerDnsRecords(struct pipes_struct *p,
+                                                   struct winbind_DsrUpdateReadOnlyServerDnsRecords *r)
 {
        struct winbindd_domain *domain;
        NTSTATUS status;
@@ -756,3 +756,10 @@ NTSTATUS _wbint_DsrUpdateReadOnlyServerDnsRecords(struct pipes_struct *p,
 
        return status;
 }
+
+NTSTATUS _winbind_SamLogon(struct pipes_struct *p,
+                          struct winbind_SamLogon *r)
+{
+       p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+       return NT_STATUS_NOT_IMPLEMENTED;
+}

diff --git a/source3/winbindd/winbindd_getdcname.c b/source3/winbindd/winbindd_getdcname.c
index cbf7f22eb8829e238565e3a0168f1e1246687662..c8213ae4880dd26ca82b432d7ac9cde2ec96f7ef 100644 (file)
--- a/source3/winbindd/winbindd_getdcname.c
+++ b/source3/winbindd/winbindd_getdcname.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 
 struct winbindd_getdcname_state {
        struct netr_DsRGetDCNameInfo *dcinfo;

diff --git a/source3/winbindd/winbindd_list_groups.c b/source3/winbindd/winbindd_list_groups.c
index 2e2c70a33de84f3ffa34a575fb5b422ba6a28c0a..3b5c9dd60e7f13adf2855f046ae870e7d3776ab3 100644 (file)
--- a/source3/winbindd/winbindd_list_groups.c
+++ b/source3/winbindd/winbindd_list_groups.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 
 struct winbindd_list_groups_domstate {
        struct tevent_req *subreq;

diff --git a/source3/winbindd/winbindd_list_users.c b/source3/winbindd/winbindd_list_users.c
index 54e0106e3d68ce3b53062f585e1773c17787fa95..a6d6a29e768f9091dbc0895758dcc7760b306399 100644 (file)
--- a/source3/winbindd/winbindd_list_users.c
+++ b/source3/winbindd/winbindd_list_users.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 
 struct winbindd_list_users_domstate {
        struct tevent_req *subreq;

diff --git a/source3/winbindd/winbindd_lookuprids.c b/source3/winbindd/winbindd_lookuprids.c
index e1d7d18e0b70094bf2ad072c2f0e514c2c60ea94..6d0c0efd4291acdbbd29faf168ce9c459fdea5d3 100644 (file)
--- a/source3/winbindd/winbindd_lookuprids.c
+++ b/source3/winbindd/winbindd_lookuprids.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "../libcli/security/security.h"
 
 struct winbindd_lookuprids_state {

diff --git a/source3/winbindd/winbindd_ping_dc.c b/source3/winbindd/winbindd_ping_dc.c
index 93b16cda8c3afe8c3eaba5d921843a3ea36d7be7..0a767d9e12d277692c52c7ff3d622534e3e57bad 100644 (file)
--- a/source3/winbindd/winbindd_ping_dc.c
+++ b/source3/winbindd/winbindd_ping_dc.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 
 struct winbindd_ping_dc_state {
        const char *dcname;

diff --git a/source3/winbindd/winbindd_update_rodc_dns.c b/source3/winbindd/winbindd_update_rodc_dns.c
index f809dc615fce619c7d908e6c4dd50c4ac8c4cf23..9c13c0630040243be22fd2a4b69f7d76b868f66b 100644 (file)
--- a/source3/winbindd/winbindd_update_rodc_dns.c
+++ b/source3/winbindd/winbindd_update_rodc_dns.c
@@ -20,7 +20,6 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
 #include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "source4/lib/messaging/irpc.h"
 
@@ -51,7 +50,7 @@ NTSTATUS wb_irpc_DsrUpdateReadOnlyServerDnsRecords(struct irpc_message *msg,
                return NT_STATUS_NO_SUCH_DOMAIN;
        }
 
-       subreq = dcerpc_wbint_DsrUpdateReadOnlyServerDnsRecords_send(s, winbind_event_context(),
+       subreq = dcerpc_winbind_DsrUpdateReadOnlyServerDnsRecords_send(s, winbind_event_context(),
                                                                     dom_child_handle(domain),
                                                                     req->in.site_name,
                                                                     req->in.dns_ttl,
@@ -77,7 +76,7 @@ static void wb_irpc_DsrUpdateReadOnlyServerDnsRecords_callback(struct tevent_req
 
        DEBUG(5, ("wb_irpc_DsrUpdateReadOnlyServerDnsRecords_callback called\n"));
 
-       status = dcerpc_wbint_DsrUpdateReadOnlyServerDnsRecords_recv(subreq, s, &result);
+       status = dcerpc_winbind_DsrUpdateReadOnlyServerDnsRecords_recv(subreq, s, &result);
        any_nt_status_not_ok(status, result, &status);
        TALLOC_FREE(subreq);
 

diff --git a/source3/winbindd/winbindd_wins_byip.c b/source3/winbindd/winbindd_wins_byip.c
index 4ae1b82ac2324f66220db6ca6326e9375c1a13b9..c995dd1b0dc51f689cd34e2289c31a04d8de6995 100644 (file)
--- a/source3/winbindd/winbindd_wins_byip.c
+++ b/source3/winbindd/winbindd_wins_byip.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "libsmb/nmblib.h"
 
 struct winbindd_wins_byip_state {

diff --git a/source3/winbindd/winbindd_wins_byname.c b/source3/winbindd/winbindd_wins_byname.c
index 742aaf2c7d3fd5ba88847d973bcc3399341f1492..db6a04d4ecbb1323d39e18a0808ca6659a5ebbc8 100644 (file)
--- a/source3/winbindd/winbindd_wins_byname.c
+++ b/source3/winbindd/winbindd_wins_byname.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "libsmb/nmblib.h"
 #include "lib/util/string_wrappers.h"
 

diff --git a/source3/wscript_build b/source3/wscript_build
index a0080b32fcb97def2dd984e55bb303e3e8642004..c3cfdb9b673ad4d5fc9c5cad209de9abdc810dc4 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -964,8 +964,8 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
                  LIBCLI_SAMR
                  SLCACHE
                  RPC_NDR_DSSETUP
-                 RPC_NDR_WBINT
-                 SRV_NDR_WBINT
+                 RPC_NDR_WINBIND
+                 SRV_NDR_WINBIND
                  RPC_SAMR
                  RPC_LSARPC
                  RPC_SERVER

diff --git a/source4/librpc/idl/wscript_build b/source4/librpc/idl/wscript_build
index 7e54e8dfa4e54a43d12444aad8b46095736208e8..6e3e36a6a6bf93fe735789a80938422ffd286302 100644 (file)
--- a/source4/librpc/idl/wscript_build
+++ b/source4/librpc/idl/wscript_build
@@ -6,7 +6,7 @@ topinclude=os.path.join(bld.srcnode.abspath(), 'librpc/idl')
 
 bld.SAMBA_PIDL_LIST('PIDL',
                    source='''irpc.idl ntp_signd.idl
-                              opendb.idl sasl_helpers.idl winbind.idl
+                              opendb.idl sasl_helpers.idl
                               winsif.idl winsrepl.idl winstation.idl''',
                     options="--includedir=%s --header --ndr-parser --client --python --server" % topinclude,
                     output_dir='../gen_ndr')

diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 949622b58ae65686c25ee394d91ec07124fd7d72..582092d5142252b990a0ab88ee5364684e38581e 100755 (executable)
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -51,11 +51,6 @@ bld.SAMBA_SUBSYSTEM('NDR_WINSREPL',
        )
 
 
-bld.SAMBA_SUBSYSTEM('NDR_WINBIND',
-       source='gen_ndr/ndr_winbind.c',
-       public_deps='NDR_IDMAP ndr ndr-standard'
-       )
-
 # create a grouping library to consolidate our samba4 specific NDR code
 bld.SAMBA_LIBRARY('ndr-samba4',
        source=[],
@@ -87,7 +82,7 @@ bld.SAMBA_SUBSYSTEM('ndr-table',
         NDR_SASL_HELPERS NDR_NOTIFY NDR_WINBIND NDR_FRSRPC NDR_FRSAPI
         NDR_FRSTRANS NDR_NFS4ACL NDR_NTP_SIGND NDR_DCOM NDR_WMI
         NDR_NAMED_PIPE_AUTH NDR_NTLMSSP NDR_DFSBLOBS NDR_DNSP
-        NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY NDR_PREG NDR_WBINT''',
+        NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY NDR_PREG''',
         depends_on='GEN_NDR_TABLES'
         )
 
@@ -97,12 +92,6 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_IRPC',
        public_deps='dcerpc NDR_IRPC'
        )
 
-bld.SAMBA_SUBSYSTEM('RPC_NDR_WINBIND',
-       source='gen_ndr/ndr_winbind_c.c',
-       public_deps='dcerpc NDR_WINBIND'
-       )
-
-
 bld.SAMBA_LIBRARY('dcerpc-samr',
        source='',
        pc_files='dcerpc_samr.pc',
@@ -305,7 +294,7 @@ bld.SAMBA_PYTHON('python_server_id',
        )
 
 bld.SAMBA_PYTHON('python_winbind',
-       source='gen_ndr/py_winbind.c',
+       source='../../librpc/gen_ndr/py_winbind.c',
        deps='RPC_NDR_WINBIND pytalloc-util pyrpc_util python_netlogon',
        realname='samba/dcerpc/winbind.so'
        )