The branch, v4-1-stable has been updated
       via  6397681 VERSION: Disable git snapshots for the 4.1.21 release.
       via  821493c WHATSNEW: Add release notes for Samba 4.1.21.
       via  18e3eba samr4: Use <SID=%s> in GetGroupsForUser
       via  64305df VERSION: Bump version up to 4.1.21...
      from  74be972 VERSION: Disable git snapshots for the 4.1.20 release.

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-1-stable


- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 VERSION                               |  2 +-
 WHATSNEW.txt                          | 46 ++++++++++++++++++++++++++++++++---
 source4/rpc_server/samr/dcesrv_samr.c | 10 ++++++--
 3 files changed, 52 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/VERSION b/VERSION
index bfe6225..06ca3ff 100644
--- a/VERSION
+++ b/VERSION
@@ -25,7 +25,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=4
 SAMBA_VERSION_MINOR=1
-SAMBA_VERSION_RELEASE=20
+SAMBA_VERSION_RELEASE=21
 
 ########################################################
 # If a official release has a serious bug              #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 642653b..1c01e2b 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,46 @@
                    ==============================
+                   Release Notes for Samba 4.1.21
+                          October 13, 2015
+                   ==============================
+
+
+This is the last bugfix release of the Samba 4.1 release series.
+There will very likely be security releases beyond this point only.
+
+
+Changes since 4.1.20:
+---------------------
+
+o   Volker Lendecke <[email protected]>
+    * BUG 11488: Avoid quoting problems in user's DNs.
+
+
+#######################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored.  All bug reports should
+be filed under the Samba 4.1 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+
+Release notes for older releases follow:
+----------------------------------------
+
+======================================================================
+
+                   ==============================
                    Release Notes for Samba 4.1.20
                           September 1, 2015
                    ==============================
@@ -81,10 +123,8 @@ database (https://bugzilla.samba.org/).
 ======================================================================
 
 
-Release notes for older releases follow:
-----------------------------------------
+----------------------------------------------------------------------
 
-======================================================================
 
                    ==============================
                    Release Notes for Samba 4.1.19
diff --git a/source4/rpc_server/samr/dcesrv_samr.c 
b/source4/rpc_server/samr/dcesrv_samr.c
index 330e6fb..7441274 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -3572,17 +3572,23 @@ static NTSTATUS dcesrv_samr_GetGroupsForUser(struct 
dcesrv_call_state *dce_call,
        const char * const attrs[2] = { "objectSid", NULL };
        struct samr_RidWithAttributeArray *array;
        int i, count;
+       char membersidstr[DOM_SID_STR_BUFLEN];
 
        DCESRV_PULL_HANDLE(h, r->in.user_handle, SAMR_HANDLE_USER);
 
        a_state = h->data;
        d_state = a_state->domain_state;
 
+       dom_sid_string_buf(a_state->account_sid,
+                          membersidstr, sizeof(membersidstr)),
+
        count = samdb_search_domain(a_state->sam_ctx, mem_ctx,
                                    d_state->domain_dn, &res,
                                    attrs, d_state->domain_sid,
-                                   
"(&(member=%s)(|(grouptype=%d)(grouptype=%d))(objectclass=group))",
-                                   ldb_dn_get_linearized(a_state->account_dn),
+                                   "(&(member=<SID=%s>)"
+                                    "(|(grouptype=%d)(grouptype=%d))"
+                                    "(objectclass=group))",
+                                   membersidstr,
                                    GTYPE_SECURITY_UNIVERSAL_GROUP,
                                    GTYPE_SECURITY_GLOBAL_GROUP);
        if (count < 0)


-- 
Samba Shared Repository

Reply via email to