Author: vlendec Date: 2005-12-28 21:57:24 +0000 (Wed, 28 Dec 2005) New Revision: 12548
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12548 Log: Reformatting Modified: trunk/source/sam/idmap_ldap.c Changeset: Modified: trunk/source/sam/idmap_ldap.c =================================================================== --- trunk/source/sam/idmap_ldap.c 2005-12-28 21:52:12 UTC (rev 12547) +++ trunk/source/sam/idmap_ldap.c 2005-12-28 21:57:24 UTC (rev 12548) @@ -127,14 +127,16 @@ int rc; const char *sid_attr[] = {LDAP_ATTRIBUTE_SID, NULL}; - slprintf(filter, sizeof(filter)-1, "(%s=%s)", LDAP_ATTRIBUTE_SID, sid_to_string(sid_string, sid)); + slprintf(filter, sizeof(filter)-1, "(%s=%s)", LDAP_ATTRIBUTE_SID, + sid_to_string(sid_string, sid)); rc = smbldap_search_suffix(state->smbldap_state, filter, sid_attr, &result); if (rc != LDAP_SUCCESS) { char *ld_error = NULL; - ldap_get_option(state->smbldap_state->ldap_struct, LDAP_OPT_ERROR_STRING, &ld_error); + ldap_get_option(state->smbldap_state->ldap_struct, + LDAP_OPT_ERROR_STRING, &ld_error); DEBUG(2, ("Failed to check if sid %s is alredy in use: %s\n", sid_string, ld_error)); SAFE_FREE(ld_error); @@ -143,7 +145,8 @@ return True; } - if ((ldap_count_entries(state->smbldap_state->ldap_struct, result)) > 0) { + if ((ldap_count_entries(state->smbldap_state->ldap_struct, + result)) > 0) { DEBUG(3, ("Sid %s already in use - trying next RID\n", sid_string)); ldap_msgfree(result); @@ -179,51 +182,67 @@ char *ld_error = NULL; while (attempts < 10) { - if (!NT_STATUS_IS_OK(ret = smbldap_search_domain_info(state->smbldap_state, - &domain_result, get_global_sam_name(), True))) { + ret = smbldap_search_domain_info(state->smbldap_state, + &domain_result, + get_global_sam_name(), True); + if (!NT_STATUS_IS_OK(ret)) { return ret; } - entry = ldap_first_entry(state->smbldap_state->ldap_struct, domain_result); + entry = ldap_first_entry(state->smbldap_state->ldap_struct, + domain_result); if (!entry) { DEBUG(0, ("Could not get domain info entry\n")); ldap_msgfree(domain_result); return ret; } - if ((dn = smbldap_get_dn(state->smbldap_state->ldap_struct, entry)) == NULL) { + if ((dn = smbldap_get_dn(state->smbldap_state->ldap_struct, + entry)) == NULL) { DEBUG(0, ("Could not get domain info DN\n")); ldap_msgfree(domain_result); return ret; } - /* yes, we keep 3 seperate counters, one for rids between 1000 (BASE_RID) and - algorithmic_rid_base. The other two are to avoid stomping on the - different sets of algorithmic RIDs */ + /* yes, we keep 3 seperate counters, one for rids between 1000 + (BASE_RID) and algorithmic_rid_base. The other two are to + avoid stomping on the different sets of algorithmic RIDs */ - if (smbldap_get_single_pstring(state->smbldap_state->ldap_struct, entry, - get_attr_key2string(dominfo_attr_list, LDAP_ATTR_ALGORITHMIC_RID_BASE), - algorithmic_rid_base_string)) { + if (smbldap_get_single_pstring( + state->smbldap_state->ldap_struct, entry, + get_attr_key2string(dominfo_attr_list, + LDAP_ATTR_ALGORITHMIC_RID_BASE), + algorithmic_rid_base_string)) { alg_rid_base = (uint32)atol(algorithmic_rid_base_string); } else { alg_rid_base = algorithmic_rid_base(); - /* Try to make the modification atomically by enforcing the - old value in the delete mod. */ - slprintf(algorithmic_rid_base_string, sizeof(algorithmic_rid_base_string)-1, "%d", alg_rid_base); - smbldap_make_mod(state->smbldap_state->ldap_struct, entry, &mods, - get_attr_key2string(dominfo_attr_list, LDAP_ATTR_ALGORITHMIC_RID_BASE), - algorithmic_rid_base_string); + /* Try to make the modification atomically by + enforcing the old value in the delete mod. */ + slprintf(algorithmic_rid_base_string, + sizeof(algorithmic_rid_base_string)-1, "%d", + alg_rid_base); + smbldap_make_mod( + state->smbldap_state->ldap_struct, + entry, &mods, + get_attr_key2string( + dominfo_attr_list, + LDAP_ATTR_ALGORITHMIC_RID_BASE), + algorithmic_rid_base_string); } next_rid = 0; if (alg_rid_base > BASE_RID) { - /* we have a non-default 'algorithmic rid base', so we have 'low' rids that we - can allocate to new users */ - if (smbldap_get_single_pstring(state->smbldap_state->ldap_struct, entry, - get_attr_key2string(dominfo_attr_list, LDAP_ATTR_NEXT_RID), - old_rid_string)) { + /* we have a non-default 'algorithmic rid base', so we + have 'low' rids that we can allocate to new + users */ + if (smbldap_get_single_pstring( + state->smbldap_state->ldap_struct, entry, + get_attr_key2string( + dominfo_attr_list, + LDAP_ATTR_NEXT_RID), + old_rid_string)) { *rid = (uint32)atol(old_rid_string); } else { *rid = BASE_RID; @@ -235,45 +254,60 @@ return NT_STATUS_UNSUCCESSFUL; } - slprintf(next_rid_string, sizeof(next_rid_string)-1, "%d", next_rid); + slprintf(next_rid_string, sizeof(next_rid_string)-1, + "%d", next_rid); - /* Try to make the modification atomically by enforcing the - old value in the delete mod. */ - smbldap_make_mod(state->smbldap_state->ldap_struct, entry, &mods, - get_attr_key2string(dominfo_attr_list, LDAP_ATTR_NEXT_RID), - next_rid_string); + /* Try to make the modification atomically by + enforcing the old value in the delete mod. */ + smbldap_make_mod( + state->smbldap_state->ldap_struct, + entry, &mods, + get_attr_key2string(dominfo_attr_list, + LDAP_ATTR_NEXT_RID), + next_rid_string); } if (!next_rid) { /* not got one already */ - if (smbldap_get_single_pstring(state->smbldap_state->ldap_struct, entry, - get_attr_key2string(dominfo_attr_list, LDAP_ATTR_NEXT_USERRID), - old_rid_string)) { + if (smbldap_get_single_pstring( + state->smbldap_state->ldap_struct, entry, + get_attr_key2string( + dominfo_attr_list, + LDAP_ATTR_NEXT_USERRID), + old_rid_string)) { *rid = (uint32)atol(old_rid_string); } /* This is the core of the whole routine. If we had - scheme-style closures, there would be a *lot* less code - duplication... */ + scheme-style closures, there would be a *lot* less + code duplication... */ next_rid = *rid+RID_MULTIPLIER; - slprintf(next_rid_string, sizeof(next_rid_string)-1, "%d", next_rid); + slprintf(next_rid_string, sizeof(next_rid_string)-1, + "%d", next_rid); - /* Try to make the modification atomically by enforcing the - old value in the delete mod. */ - smbldap_make_mod(state->smbldap_state->ldap_struct, entry, &mods, - get_attr_key2string(dominfo_attr_list, LDAP_ATTR_NEXT_USERRID), - next_rid_string); + /* Try to make the modification atomically by + enforcing the old value in the delete mod. */ + smbldap_make_mod( + state->smbldap_state->ldap_struct, + entry, &mods, + get_attr_key2string(dominfo_attr_list, + LDAP_ATTR_NEXT_USERRID), + next_rid_string); } - if ((smbldap_modify(state->smbldap_state, dn, mods)) == LDAP_SUCCESS) { + if ((smbldap_modify(state->smbldap_state, dn, + mods)) == LDAP_SUCCESS) { DOM_SID dom_sid; DOM_SID sid; pstring domain_sid_string; int error = 0; - if (!smbldap_get_single_pstring(state->smbldap_state->ldap_struct, domain_result, - get_attr_key2string(dominfo_attr_list, LDAP_ATTR_DOM_SID), - domain_sid_string)) { + if (!smbldap_get_single_pstring( + state->smbldap_state->ldap_struct, + domain_result, + get_attr_key2string(dominfo_attr_list, + LDAP_ATTR_DOM_SID), + domain_sid_string)) { ldap_mods_free(mods, True); SAFE_FREE(dn); ldap_msgfree(domain_result); @@ -307,8 +341,10 @@ } ld_error = NULL; - ldap_get_option(state->smbldap_state->ldap_struct, LDAP_OPT_ERROR_STRING, &ld_error); - DEBUG(2, ("Failed to modify rid: %s\n", ld_error ? ld_error : "(NULL")); + ldap_get_option(state->smbldap_state->ldap_struct, + LDAP_OPT_ERROR_STRING, &ld_error); + DEBUG(2, ("Failed to modify rid: %s\n", + ld_error ? ld_error : "(NULL")); SAFE_FREE(ld_error); ldap_mods_free(mods, True); @@ -321,7 +357,8 @@ { /* Sleep for a random timeout */ - unsigned sleeptime = (sys_random()*sys_getpid()*attempts); + unsigned sleeptime = + (sys_random()*sys_getpid()*attempts); attempts += 1; sleeptime %= 100;
