diff options
| author | Volker Lendecke <vl@samba.org> | 2011-02-10 22:21:19 +0100 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2011-02-10 23:20:05 +0100 |
| commit | efa460e2912f66629df4d916f950ff9e31c6c208 (patch) | |
| tree | 8b10b015539e39f110ce8fb93bfeee87303f7d19 | |
| parent | b524e58f9a37e0e780c998d819fdbac7b3c34fed (diff) | |
| download | samba-efa460e2912f66629df4d916f950ff9e31c6c208.tar.gz samba-efa460e2912f66629df4d916f950ff9e31c6c208.tar.bz2 samba-efa460e2912f66629df4d916f950ff9e31c6c208.zip | |
s3: Align the args in tldap_modify
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Thu Feb 10 23:20:05 CET 2011 on sn-devel-104
| -rw-r--r-- | source3/include/tldap.h | 4 | ||||
| -rw-r--r-- | source3/lib/tldap.c | 6 | ||||
| -rw-r--r-- | source3/passdb/pdb_ads.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/source3/include/tldap.h b/source3/include/tldap.h index d1cb57e50e..6bd086b800 100644 --- a/source3/include/tldap.h +++ b/source3/include/tldap.h @@ -131,14 +131,14 @@ struct tevent_req *tldap_modify_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct tldap_context *ld, const char *dn, - int num_mods, struct tldap_mod *mods, + struct tldap_mod *mods, int num_mods, struct tldap_control *sctrls, int num_sctrls, struct tldap_control *cctrls, int num_cctrls); int tldap_modify_recv(struct tevent_req *req); int tldap_modify(struct tldap_context *ld, const char *dn, - int num_mods, struct tldap_mod *mods, + struct tldap_mod *mods, int num_mods, struct tldap_control *sctrls, int num_sctrls, struct tldap_control *cctrls, int num_cctrls); diff --git a/source3/lib/tldap.c b/source3/lib/tldap.c index f9f9fe5e54..775d9ad817 100644 --- a/source3/lib/tldap.c +++ b/source3/lib/tldap.c @@ -2161,7 +2161,7 @@ struct tevent_req *tldap_modify_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct tldap_context *ld, const char *dn, - int num_mods, struct tldap_mod *mods, + struct tldap_mod *mods, int num_mods, struct tldap_control *sctrls, int num_sctrls, struct tldap_control *cctrls, @@ -2221,7 +2221,7 @@ int tldap_modify_recv(struct tevent_req *req) } int tldap_modify(struct tldap_context *ld, const char *dn, - int num_mods, struct tldap_mod *mods, + struct tldap_mod *mods, int num_mods, struct tldap_control *sctrls, int num_sctrls, struct tldap_control *cctrls, int num_cctrls) { @@ -2236,7 +2236,7 @@ int tldap_modify(struct tldap_context *ld, const char *dn, goto fail; } - req = tldap_modify_send(frame, ev, ld, dn, num_mods, mods, + req = tldap_modify_send(frame, ev, ld, dn, mods, num_mods, sctrls, num_sctrls, cctrls, num_cctrls); if (req == NULL) { result = TLDAP_NO_MEMORY; diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c index bf1aa79a52..a1b830634a 100644 --- a/source3/passdb/pdb_ads.c +++ b/source3/passdb/pdb_ads.c @@ -593,7 +593,7 @@ static NTSTATUS pdb_ads_update_sam_account(struct pdb_methods *m, return NT_STATUS_OK; } - rc = tldap_modify(ld, priv->dn, num_mods, mods, NULL, 0, + rc = tldap_modify(ld, priv->dn, mods, num_mods, NULL, 0, NULL, 0); TALLOC_FREE(mods); if (rc != TLDAP_SUCCESS) { @@ -1089,7 +1089,7 @@ static NTSTATUS pdb_ads_mod_groupmem(struct pdb_methods *m, return NT_STATUS_NO_MEMORY; } - rc = tldap_modify(ld, groupdn, 1, mods, NULL, 0, NULL, 0); + rc = tldap_modify(ld, groupdn, mods, 1, NULL, 0, NULL, 0); TALLOC_FREE(frame); if (rc != TLDAP_SUCCESS) { DEBUG(10, ("ldap_modify failed: %s\n", @@ -1325,7 +1325,7 @@ static NTSTATUS pdb_ads_set_aliasinfo(struct pdb_methods *m, return NT_STATUS_OK; } - rc = tldap_modify(ld, dn, num_mods, mods, NULL, 0, NULL, 0); + rc = tldap_modify(ld, dn, mods, num_mods, NULL, 0, NULL, 0); TALLOC_FREE(msg); if (rc != TLDAP_SUCCESS) { DEBUG(10, ("ldap_modify failed: %s\n", @@ -1421,7 +1421,7 @@ static NTSTATUS pdb_ads_mod_aliasmem(struct pdb_methods *m, return NT_STATUS_NO_MEMORY; } - rc = tldap_modify(ld, aliasdn, 1, mods, NULL, 0, NULL, 0); + rc = tldap_modify(ld, aliasdn, mods, 1, NULL, 0, NULL, 0); TALLOC_FREE(frame); if (rc != TLDAP_SUCCESS) { DEBUG(10, ("ldap_modify failed: %s\n", |