From f4ab082d2b984b7deb3afbc7a26e238aa5b3b8c3 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 8 May 2014 12:17:32 +1200 Subject: [PATCH] librpc/idl: Merge wbint.idl with winbind.idl so we can forward IRPC requests to internal winbind calls Change-Id: Iba3913d5a1c7f851b93f37e9beb6dbb20fbf7e55 Signed-off-by: Andrew Bartlett Reviewed-by: Andreas Schneider --- .../librpc/idl/wbint.idl => librpc/idl/winbind.idl | 23 ++++++++++++++++++++-- librpc/idl/wscript_build | 5 +++++ librpc/wscript_build | 15 ++++++++++++++ source3/librpc/idl/wscript_build | 5 ----- source3/librpc/wscript_build | 14 ------------- source3/winbindd/wb_dsgetdcname.c | 2 +- source3/winbindd/wb_fill_pwent.c | 2 +- source3/winbindd/wb_getgrsid.c | 2 +- source3/winbindd/wb_getpwsid.c | 2 +- source3/winbindd/wb_gettoken.c | 2 +- source3/winbindd/wb_gid2sid.c | 2 +- source3/winbindd/wb_group_members.c | 2 +- source3/winbindd/wb_lookupname.c | 2 +- source3/winbindd/wb_lookupsid.c | 2 +- source3/winbindd/wb_lookupsids.c | 2 +- source3/winbindd/wb_lookupuseraliases.c | 2 +- source3/winbindd/wb_lookupusergroups.c | 2 +- source3/winbindd/wb_next_grent.c | 2 +- source3/winbindd/wb_next_pwent.c | 2 +- source3/winbindd/wb_query_user_list.c | 2 +- source3/winbindd/wb_queryuser.c | 2 +- source3/winbindd/wb_seqnum.c | 2 +- source3/winbindd/wb_seqnums.c | 2 +- source3/winbindd/wb_sids2xids.c | 2 +- source3/winbindd/wb_uid2sid.c | 2 +- source3/winbindd/winbindd.c | 2 +- source3/winbindd/winbindd.h | 2 +- source3/winbindd/winbindd_allocate_gid.c | 2 +- source3/winbindd/winbindd_allocate_uid.c | 2 +- source3/winbindd/winbindd_cache.c | 2 +- source3/winbindd/winbindd_change_machine_acct.c | 2 +- source3/winbindd/winbindd_check_machine_acct.c | 2 +- source3/winbindd/winbindd_dsgetdcname.c | 2 +- source3/winbindd/winbindd_dual_ndr.c | 6 +++--- source3/winbindd/winbindd_dual_srv.c | 13 +++++++++--- source3/winbindd/winbindd_getdcname.c | 2 +- source3/winbindd/winbindd_list_groups.c | 2 +- source3/winbindd/winbindd_list_users.c | 2 +- source3/winbindd/winbindd_lookuprids.c | 2 +- source3/winbindd/winbindd_ping_dc.c | 2 +- source3/winbindd/winbindd_update_rodc_dns.c | 5 ++--- source3/winbindd/winbindd_wins_byip.c | 2 +- source3/winbindd/winbindd_wins_byname.c | 2 +- source3/wscript_build | 4 ++-- source4/librpc/idl/wscript_build | 2 +- source4/librpc/wscript_build | 15 ++------------ 46 files changed, 96 insertions(+), 81 deletions(-) rename source3/librpc/idl/wbint.idl => librpc/idl/winbind.idl (86%) 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 e91ef072fcc..39e89c3d814 100644 --- 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 f181786d013..d1484afcda5 100644 --- 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 1c2062f046e..393f57979a6 100644 --- 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 712108d4e6c..c38fe7bd72b 100644 --- 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 c0dc9b4cb5d..77ae048f3af 100644 --- 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 207d1b61ea4..bc952cd03de 100644 --- 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 8c8f839a51c..206827cc92e 100644 --- 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 f3899b0c466..2678c5014c9 100644 --- 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 9e41bcaec75..5e218ac7b62 100644 --- 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 aaaffa0bf20..527199850a3 100644 --- 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 942e5f7669e..d7842128666 100644 --- 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 ec36cdacbf0..55f28d2f5b3 100644 --- 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 2ebaba03d3f..62b2e477c1a 100644 --- 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 2ab3917ceb7..7ff5c1e0e22 100644 --- 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 b474220949c..8c5f9dbbb48 100644 --- 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 5e7eb1c33c2..9a5794fb6ad 100644 --- 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 aeffc178d9b..b91de78c764 100644 --- 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 d3b03333585..aea134bafe9 100644 --- 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 785658d4bec..ade74e342d9 100644 --- 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 abbf7668e97..8bdc42b6a27 100644 --- 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 33416b9017b..974687aa484 100644 --- 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 4a92e036dc4..7affd764ca2 100644 --- 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 440a540ffa9..2a4cdc930e8 100644 --- 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 cbd4444566f..519a710c964 100644 --- 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 e17cb06ef49..f4138f6a135 100644 --- 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 153a400f2e8..b9bf8be812a 100644 --- 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 8f89e275d78..07c87dbcf45 100644 --- 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 b9aaa8c66a0..a9236bbf23d 100644 --- 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 e2f0a678da5..99c0bdac102 100644 --- 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 264e75c8bdf..51f3e04eae7 100644 --- 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 f335e345e54..83eb99ba64a 100644 --- 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 279370146a6..c6573745a52 100644 --- 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 dcf574dae36..c447b3aaf1d 100644 --- 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 f3611be7863..ed2b5ea22da 100644 --- 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 721d293c4d0..985f0a92097 100644 --- 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 cbf7f22eb88..c8213ae4880 100644 --- 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 2e2c70a33de..3b5c9dd60e7 100644 --- 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 54e0106e3d6..a6d6a29e768 100644 --- 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 e1d7d18e0b7..6d0c0efd429 100644 --- 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 93b16cda8c3..0a767d9e12d 100644 --- 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 f809dc615fc..9c13c063004 100644 --- 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 4ae1b82ac23..c995dd1b0dc 100644 --- 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 742aaf2c7d3..db6a04d4ecb 100644 --- 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 a0080b32fcb..c3cfdb9b673 100755 --- 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 7e54e8dfa4e..6e3e36a6a6b 100644 --- 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 949622b58ae..582092d5142 100755 --- 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' ) -- 2.11.4.GIT