diff options
| author | Volker Lendecke <vl@samba.org> | 2011-02-12 16:58:10 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2011-02-13 12:11:53 +0100 |
| commit | 84abb428f640e4c48a7231ed78383b197ed715a9 (patch) | |
| tree | fed2344f30389fed416ef4fc15a65abdbf41d40d /source3/passdb | |
| parent | 158c1e315b2b680dad56d1b14ccfd4679c04c8bc (diff) | |
| download | samba-84abb428f640e4c48a7231ed78383b197ed715a9.tar.gz samba-84abb428f640e4c48a7231ed78383b197ed715a9.tar.xz samba-84abb428f640e4c48a7231ed78383b197ed715a9.zip | |
s3: Add an explicit counter to tldap_add_mod_[blobs|str]
Diffstat (limited to 'source3/passdb')
| -rw-r--r-- | source3/passdb/pdb_ads.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c index 99170aacc3..8c5ea81145 100644 --- a/source3/passdb/pdb_ads.c +++ b/source3/passdb/pdb_ads.c @@ -330,11 +330,9 @@ static bool pdb_ads_init_ads_from_sam(struct pdb_ads_state *state, } blob = data_blob_const(pw_utf16, pw_utf16_len); - ret &= tldap_add_mod_blobs(mem_ctx, pmods, TLDAP_MOD_REPLACE, + ret &= tldap_add_mod_blobs(mem_ctx, pmods, pnum_mods, + TLDAP_MOD_REPLACE, "unicodePwd", &blob, 1); - if (ret) { - *pnum_mods = talloc_array_length(*pmods); - } TALLOC_FREE(pw_utf16); TALLOC_FREE(pw_quote); } @@ -1084,6 +1082,7 @@ static NTSTATUS pdb_ads_mod_groupmem(struct pdb_methods *m, struct dom_sid groupsid, membersid; char *groupdn, *memberdn; struct tldap_mod *mods; + int num_mods; int rc; NTSTATUS status; @@ -1107,14 +1106,15 @@ static NTSTATUS pdb_ads_mod_groupmem(struct pdb_methods *m, } mods = NULL; + num_mods = 0; - if (!tldap_add_mod_str(talloc_tos(), &mods, mod_op, + if (!tldap_add_mod_str(talloc_tos(), &mods, &num_mods, mod_op, "member", memberdn)) { TALLOC_FREE(frame); return NT_STATUS_NO_MEMORY; } - rc = tldap_modify(ld, groupdn, mods, 1, NULL, 0, NULL, 0); + rc = tldap_modify(ld, groupdn, mods, num_mods, NULL, 0, NULL, 0); TALLOC_FREE(frame); if (rc != TLDAP_SUCCESS) { DEBUG(10, ("ldap_modify failed: %s\n", @@ -1414,6 +1414,7 @@ static NTSTATUS pdb_ads_mod_aliasmem(struct pdb_methods *m, struct tldap_context *ld; TALLOC_CTX *frame = talloc_stackframe(); struct tldap_mod *mods; + int num_mods; int rc; char *aliasdn, *memberdn; NTSTATUS status; @@ -1439,14 +1440,15 @@ static NTSTATUS pdb_ads_mod_aliasmem(struct pdb_methods *m, } mods = NULL; + num_mods = 0; - if (!tldap_add_mod_str(talloc_tos(), &mods, mod_op, + if (!tldap_add_mod_str(talloc_tos(), &mods, &num_mods, mod_op, "member", memberdn)) { TALLOC_FREE(frame); return NT_STATUS_NO_MEMORY; } - rc = tldap_modify(ld, aliasdn, mods, 1, NULL, 0, NULL, 0); + rc = tldap_modify(ld, aliasdn, mods, num_mods, NULL, 0, NULL, 0); TALLOC_FREE(frame); if (rc != TLDAP_SUCCESS) { DEBUG(10, ("ldap_modify failed: %s\n", |