Attachment 2135 Details for Bug 4097 – Patch

[patch] Patch

look1 (text/plain), 1.88 KB, created by Jeremy Allison on 2006-09-13 11:31:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2006-09-13 11:31:31 UTC

Size: 1.88 KB

patch

obsolete

>Index: passdb/lookup_sid.c
>===================================================================
>--- passdb/lookup_sid.c	(revision 18476)
>+++ passdb/lookup_sid.c	(working copy)
>@@ -1069,6 +1069,7 @@
> {
> 	uid_t low, high;
> 	uint32 rid;
>+	BOOL ret;
> 
> 	ZERO_STRUCTP(psid);
> 
>@@ -1083,7 +1084,11 @@
> 		goto done;
> 	}
> 
>-	if (pdb_uid_to_rid(uid, &rid)) {
>+	become_root();
>+	ret = pdb_uid_to_rid(uid, &rid);
>+	unbecome_root();
>+
>+	if (ret) {
> 		/* This is a mapped user */
> 		sid_copy(psid, get_global_sam_sid());
> 		sid_append_rid(psid, rid);
>@@ -1108,6 +1113,7 @@
> 
> void gid_to_sid(DOM_SID *psid, gid_t gid)
> {
>+	BOOL ret;
> 	gid_t low, high;
> 
> 	ZERO_STRUCTP(psid);
>@@ -1123,7 +1129,11 @@
> 		goto done;
> 	}
> 
>-	if (pdb_gid_to_sid(gid, psid)) {
>+	become_root();
>+	ret = pdb_gid_to_sid(gid, psid);
>+	unbecome_root();
>+
>+	if (ret) {
> 		/* This is a mapped group */
> 		goto done;
> 	}
>@@ -1165,8 +1175,13 @@
> 
> 	if (sid_peek_check_rid(get_global_sam_sid(), psid, &rid)) {
> 		union unid_t id;
>+		BOOL ret;
> 
>-		if (pdb_sid_to_id(psid, &id, &type)) {
>+		become_root();
>+		ret = pdb_sid_to_id(psid, &id, &type);
>+		unbecome_root();
>+
>+		if (ret) {
> 			if (type != SID_NAME_USER) {
> 				DEBUG(5, ("sid %s is a %s, expected a user\n",
> 					  sid_string_static(psid),
>@@ -1240,7 +1255,13 @@
> 
> 	if ((sid_check_is_in_builtin(psid) ||
> 	     sid_check_is_in_wellknown_domain(psid))) {
>-		if (pdb_getgrsid(&map, *psid)) {
>+		BOOL ret;
>+
>+		become_root();
>+		ret = pdb_getgrsid(&map, *psid);
>+		unbecome_root();
>+
>+		if (ret) {
> 			*pgid = map.gid;
> 			goto done;
> 		}
>@@ -1248,7 +1269,13 @@
> 	}
> 
> 	if (sid_peek_check_rid(get_global_sam_sid(), psid, &rid)) {
>-		if (pdb_sid_to_id(psid, &id, &type)) {
>+		BOOL ret;
>+
>+		become_root();
>+		ret = pdb_sid_to_id(psid, &id, &type);
>+		unbecome_root();
>+
>+		if (ret) {
> 			if ((type != SID_NAME_DOM_GRP) &&
> 			    (type != SID_NAME_ALIAS)) {
> 				DEBUG(5, ("sid %s is a %s, expected a group\n",

Actions: View

Attachments on bug 4097: 2134 | 2135