[SCM] Samba Shared Repository - branch master updated

Volker Lendecke vlendec at samba.org
Fri Sep 29 16:34:02 UTC 2017


The branch, master has been updated
       via  05beefd s3:winbind: unmapped Unix users must be resolved locally
       via  196bd54 s3:winbind: unmapped Unix groups in getgrgid must be resolved locally
      from  7e728c8 notifyd: Broadcast to all connected nodes

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


- Log -----------------------------------------------------------------
commit 05beefd50a4812389be94513c8fa22a60f5c5e85
Author: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
Date:   Tue Sep 26 15:57:53 2017 +0200

    s3:winbind: unmapped Unix users must be resolved locally
    
    Signed-off-by: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
    Reviewed-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Fri Sep 29 18:33:21 CEST 2017 on sn-devel-144

commit 196bd5456355e93e4a7afd4a1ffdc49fd4ea46e7
Author: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
Date:   Tue Sep 26 15:56:56 2017 +0200

    s3:winbind: unmapped Unix groups in getgrgid must be resolved locally
    
    Signed-off-by: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
    Reviewed-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

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

Summary of changes:
 source3/winbindd/wb_getgrsid.c | 6 ++++++
 source3/winbindd/wb_getpwsid.c | 6 ++++++
 2 files changed, 12 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/wb_getgrsid.c b/source3/winbindd/wb_getgrsid.c
index acfedf6..8e0eac7 100644
--- a/source3/winbindd/wb_getgrsid.c
+++ b/source3/winbindd/wb_getgrsid.c
@@ -53,6 +53,12 @@ struct tevent_req *wb_getgrsid_send(TALLOC_CTX *mem_ctx,
 	state->ev = ev;
 	state->max_nesting = max_nesting;
 
+	if (dom_sid_in_domain(&global_sid_Unix_Groups, group_sid)) {
+		/* unmapped Unix groups must be resolved locally */
+		tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+		return tevent_req_post(req, ev);
+	}
+
 	if (lp_winbind_trusted_domains_only()) {
 		struct winbindd_domain *our_domain = find_our_domain();
 
diff --git a/source3/winbindd/wb_getpwsid.c b/source3/winbindd/wb_getpwsid.c
index e9ffc33..dcb2492 100644
--- a/source3/winbindd/wb_getpwsid.c
+++ b/source3/winbindd/wb_getpwsid.c
@@ -47,6 +47,12 @@ struct tevent_req *wb_getpwsid_send(TALLOC_CTX *mem_ctx,
 	state->ev = ev;
 	state->pw = pw;
 
+	if (dom_sid_in_domain(&global_sid_Unix_Users, user_sid)) {
+		/* unmapped Unix users must be resolved locally */
+		tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+		return tevent_req_post(req, ev);
+	}
+
 	subreq = wb_queryuser_send(state, ev, &state->sid);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);


-- 
Samba Shared Repository



More information about the samba-cvs mailing list