diff options
| author | Nadezhda Ivanova <nadezhda.ivanova@postpath.com> | 2009-12-15 20:29:20 +0200 |
|---|---|---|
| committer | Nadezhda Ivanova <nadezhda.ivanova@postpath.com> | 2009-12-15 20:29:20 +0200 |
| commit | 4330efe0f22b7318058867a554222c3c0049f644 (patch) | |
| tree | 0587d6d2b8f5699394b9b31588bc09d2d3904eca /source4/lib | |
| parent | b85f6f63e6e957970f09acb2aab14e63d2661a22 (diff) | |
| download | samba-4330efe0f22b7318058867a554222c3c0049f644.tar.gz samba-4330efe0f22b7318058867a554222c3c0049f644.tar.bz2 samba-4330efe0f22b7318058867a554222c3c0049f644.zip | |
Removed ldb_modify_ctrl from ldb, implemented as a static in ldap_backend.
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/ldb/common/ldb.c | 17 | ||||
| -rw-r--r-- | source4/lib/ldb/include/ldb.h | 18 |
2 files changed, 4 insertions, 31 deletions
diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c index 94a5fb2153..a3472a60e5 100644 --- a/source4/lib/ldb/common/ldb.c +++ b/source4/lib/ldb/common/ldb.c @@ -1388,11 +1388,10 @@ int ldb_add(struct ldb_context *ldb, } /* - same as ldb_modify, but accepts controls + modify the specified attributes of a record */ -int ldb_modify_ctrl(struct ldb_context *ldb, - const struct ldb_message *message, - struct ldb_control **controls) +int ldb_modify(struct ldb_context *ldb, + const struct ldb_message *message) { struct ldb_request *req; int ret; @@ -1404,7 +1403,7 @@ int ldb_modify_ctrl(struct ldb_context *ldb, ret = ldb_build_mod_req(&req, ldb, ldb, message, - controls, + NULL, NULL, ldb_op_default_callback, NULL); @@ -1417,14 +1416,6 @@ int ldb_modify_ctrl(struct ldb_context *ldb, talloc_free(req); return ret; } -/* - modify the specified attributes of a record -*/ -int ldb_modify(struct ldb_context *ldb, - const struct ldb_message *message) -{ - return ldb_modify_ctrl(ldb, message, NULL); -} /* diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h index 2b80e42cb3..cf55f0ac6f 100644 --- a/source4/lib/ldb/include/ldb.h +++ b/source4/lib/ldb/include/ldb.h @@ -1231,24 +1231,6 @@ int ldb_add(struct ldb_context *ldb, ldb_init()) \param message the message containing the changes required. - \param controls ldap controls for the request - - \return result code (LDB_SUCCESS if the record was modified as - requested, otherwise a failure code) -*/ -int ldb_modify_ctrl(struct ldb_context *ldb, - const struct ldb_message *message, - struct ldb_control **controls); - -/** - Modify the specified attributes of a record - - This function modifies a record that is in the database. - - \param ldb the context associated with the database (from - ldb_init()) - \param message the message containing the changes required. - \return result code (LDB_SUCCESS if the record was modified as requested, otherwise a failure code) */ |