Attachment 1014 Details for Bug 2424 – patch: update uidNumber/gidNumber ldap queries.

[patch] patch: update uidNumber/gidNumber ldap queries.

uid-gid.diff (text/plain), 2.35 KB, created by Vince Brimhall on 2005-03-07 16:07:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vince Brimhall

Created: 2005-03-07 16:07:58 UTC

Size: 2.35 KB

patch

obsolete

>Author: Vince Brimhall <vbrimhall at Novell dot com>
>Subject: Modify the way uidNumber and gidNumber are accessed through LDAP
>
>--- source/passdb/pdb_ldap.c
>+++ source/passdb/pdb_ldap.c	2005-03-07 15:21:04.821762767 -0700
>@@ -2157,7 +2157,7 @@
> {
> 	pstring filter;
> 
>-	pstr_sprintf(filter, "(&(objectClass=%s)(%s=%lu))",
>+	pstr_sprintf(filter, "(&(objectClass=%s)(%s=%d))",
> 		LDAP_OBJ_GROUPMAP,
> 		get_attr_key2string(groupmap_attr_list, LDAP_ATTR_GIDNUMBER),
> 		(unsigned long)gid);
>@@ -2513,7 +2513,7 @@
> {
> 	pstring filter;
> 
>-	pstr_sprintf(filter, "(&(|(objectClass=%s)(objectclass=%s))(%s=%lu))", 
>+	pstr_sprintf(filter, "(&(|(objectClass=%s)(objectclass=%s))(%s=%d))", 
> 		LDAP_OBJ_POSIXGROUP, LDAP_OBJ_IDMAP_ENTRY,
> 		get_attr_key2string(groupmap_attr_list, LDAP_ATTR_GIDNUMBER),
> 		(unsigned long)gid);
>@@ -2566,7 +2566,7 @@
> 		ldap_msgfree(result);
> 
> 		pstrcpy( suffix, lp_ldap_idmap_suffix() );
>-		pstr_sprintf(filter, "(&(objectClass=%s)(%s=%u))",
>+		pstr_sprintf(filter, "(&(objectClass=%s)(%s=%d))",
> 			     LDAP_OBJ_IDMAP_ENTRY, LDAP_ATTRIBUTE_GIDNUMBER,
> 			     map->gid);
> 		
>diff -u -r sles9/source/sam/idmap_ldap.c gid/source/sam/idmap_ldap.c
>--- source/sam/idmap_ldap.c
>+++ source/sam/idmap_ldap.c	2005-03-07 15:22:19.507776210 -0700
>@@ -71,7 +71,7 @@
> 	else
> 		fstrcpy( type, get_attr_key2string( sidmap_attr_list, LDAP_ATTR_GIDNUMBER ) );
> 
>-	pstr_sprintf(id_str, "%lu", ((id_type & ID_USERID) ? (unsigned long)id.uid :
>+	pstr_sprintf(id_str, "%d", ((id_type & ID_USERID) ? (unsigned long)id.uid :
> 						 (unsigned long)id.gid));	
> 	
> 	smbldap_set_mod( &mods, LDAP_MOD_ADD, "objectClass", LDAP_OBJ_IDMAP_ENTRY );
>@@ -501,7 +501,7 @@
> 		type = get_attr_key2string( idpool_attr_list, LDAP_ATTR_GIDNUMBER );
> 
> 	pstrcpy( suffix, lp_ldap_idmap_suffix() );
>-	pstr_sprintf(filter, "(&(objectClass=%s)(%s=%lu))",
>+	pstr_sprintf(filter, "(&(objectClass=%s)(%s=%d))",
> 		LDAP_OBJ_IDMAP_ENTRY, type,  
> 		((id_type & ID_USERID) ? (unsigned long)id.uid : (unsigned long)id.gid));
> 		
>@@ -701,8 +701,8 @@
> 			return NT_STATUS_UNSUCCESSFUL;
> 		}
> 		
>-		fstr_sprintf( uid_str, "%lu", (unsigned long)luid );
>-		fstr_sprintf( gid_str, "%lu", (unsigned long)lgid );
>+		fstr_sprintf( uid_str, "%d", (unsigned long)luid );
>+		fstr_sprintf( gid_str, "%d", (unsigned long)lgid );
> 
> 		smbldap_set_mod( &mods, LDAP_MOD_ADD, "objectClass", LDAP_OBJ_IDPOOL );
> 		smbldap_set_mod( &mods, LDAP_MOD_ADD,

Actions: View

Attachments on bug 2424: 1014