svn commit: samba r5708 - in branches/SAMBA_3_0/source: passdb sam

[jerry at samba.org]

Author: jerry
Date: 2005-03-09 15:22:06 +0000 (Wed, 09 Mar 2005)
New Revision: 5708

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5708

Log:
BUG 2424: patch from Vince Brimhall <vbrimhall at novell.com> to ensure that uidNumber and gidNumber use match the rfc2307 schema
Modified:
   branches/SAMBA_3_0/source/passdb/pdb_ldap.c
   branches/SAMBA_3_0/source/sam/idmap_ldap.c


Changeset:
Modified: branches/SAMBA_3_0/source/passdb/pdb_ldap.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/pdb_ldap.c	2005-03-09 15:13:23 UTC (rev 5707)
+++ branches/SAMBA_3_0/source/passdb/pdb_ldap.c	2005-03-09 15:22:06 UTC (rev 5708)
@@ -2157,10 +2157,10 @@
 {
 	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);
+		gid);
 
 	return ldapsam_getgroup(methods, filter, map);
 }
@@ -2513,10 +2513,10 @@
 {
 	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);
+		gid);
 
 	return ldapsam_search_one_group(ldap_state, filter, result);
 }
@@ -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);
 		

Modified: branches/SAMBA_3_0/source/sam/idmap_ldap.c
===================================================================
--- branches/SAMBA_3_0/source/sam/idmap_ldap.c	2005-03-09 15:13:23 UTC (rev 5707)
+++ branches/SAMBA_3_0/source/sam/idmap_ldap.c	2005-03-09 15:22:06 UTC (rev 5708)
@@ -71,8 +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 :
-						 (unsigned long)id.gid));	
+	pstr_sprintf(id_str, "%d", ((id_type & ID_USERID) ? id.uid : id.gid));	
 	
 	smbldap_set_mod( &mods, LDAP_MOD_ADD, "objectClass", LDAP_OBJ_IDMAP_ENTRY );
 
@@ -501,9 +500,9 @@
 		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));
+		((id_type & ID_USERID) ? id.uid : id.gid));
 		
 	attr_list = get_attr_list( sidmap_attr_list );
 	rc = smbldap_search(ldap_state.smbldap_state, suffix, LDAP_SCOPE_SUBTREE, 
@@ -701,8 +700,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", luid );
+		fstr_sprintf( gid_str, "%d", lgid );
 
 		smbldap_set_mod( &mods, LDAP_MOD_ADD, "objectClass", LDAP_OBJ_IDPOOL );
 		smbldap_set_mod( &mods, LDAP_MOD_ADD,