r5708: BUG 2424: patch from Vince Brimhall <vbrimhall@novell.com> to ensure that...

diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c
index 7511b67bae80898eaaf2ed3325708f3060dd12d5..f086b3f09b22d3ffabb50790b4d4c36079f65b06 100644 (file)
--- a/source/passdb/pdb_ldap.c
+++ b/source/passdb/pdb_ldap.c
@@ -2157,10 +2157,10 @@ static NTSTATUS ldapsam_getgrgid(struct pdb_methods *methods, GROUP_MAP *map,
 {
        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 @@ static int ldapsam_search_one_group_by_gid(struct ldapsam_privates *ldap_state,
 {
        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 @@ static NTSTATUS ldapsam_add_group_mapping_entry(struct pdb_methods *methods,
                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 --git a/source/sam/idmap_ldap.c b/source/sam/idmap_ldap.c
index b4a8c8a75285cf217fc92e485f4b4e2322d8a7ce..5773cd34790840111e3b700cfb5d75f87552f51e 100644 (file)
--- a/source/sam/idmap_ldap.c
+++ b/source/sam/idmap_ldap.c
@@ -71,8 +71,7 @@ static NTSTATUS ldap_set_mapping(const DOM_SID *sid, unid_t id, int id_type)
        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 @@ static NTSTATUS ldap_get_sid_from_id(DOM_SID *sid, unid_t id, int id_type)
                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 @@ static NTSTATUS verify_idpool( void )
                        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,