Attachment 876620 Details for Bug 1074314 – patch to fix case comparison and add extra check

[patch] patch to fix case comparison and add extra check

patch-fix-case.diff (text/plain), 1.30 KB, created by Jason Woods on 2014-03-19 20:33:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Woods

Created: 2014-03-19 20:33:53 UTC

Size: 1.30 KB

patch

obsolete

>From ca9dd885d2094c5b25152c7c337c8a3fdfcbd119 Mon Sep 17 00:00:00 2001
>From: Driskell <devel@jasonwoods.me.uk>
>Date: Wed, 19 Mar 2014 19:32:45 +0000
>Subject: [PATCH] Fix case comparison and add an extra verification check
>
>---
> daemons/ipa-sam/ipa_sam.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
>diff --git a/daemons/ipa-sam/ipa_sam.c b/daemons/ipa-sam/ipa_sam.c
>index 7df3512..017bc33 100644
>--- a/daemons/ipa-sam/ipa_sam.c
>+++ b/daemons/ipa-sam/ipa_sam.c
>@@ -962,7 +962,7 @@ static bool ldapsam_gid_to_sid(struct pdb_methods *methods, gid_t gid,
> 		}
> 
> 		for (c = 0; values[c] != NULL; c++) {
>-			if (strncmp(LDAP_OBJ_GROUPMAP, values[c]->bv_val,
>+			if (strncasecmp(LDAP_OBJ_GROUPMAP, values[c]->bv_val,
> 				                       values[c]->bv_len) == 0) {
> 				goto found;
> 			} else {
>@@ -977,6 +977,14 @@ found:
> 	// For user private group, use fallback group
> 	if (entry == NULL) {
> 
>+        // Make sure we did actually find a user
>+        if (user_entry == NULL) {
>+			DEBUG(3, ("ERROR: Got %d entries for gid %u, and none were groups or the user\n",
>+				   ldap_count_entries(priv2ld(priv), result),
>+				   (unsigned int)gid));
>+			goto done;
>+		}
>+
> 		DEBUG(10, ("Found user private group %u, returning fallback group.\n", (unsigned int)gid));
> 
> 		sid_copy(sid,
>-- 
>1.8.5.2 (Apple Git-48)
>

Flags:

abokovoy: review-

Actions: View | Diff

Attachments on bug 1074314: 872438 | 876620