summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2010-03-11 23:30:55 -0500
committerStephen Gallagher <sgallagh@redhat.com>2010-04-12 09:22:15 -0400
commit40bb1ddf0a3f69922466b2b99bcdaf7746fc81ba (patch)
treed1e643223e87a99166a5c8b0493582f76914feba
parent488d314e6a330b92516577fe889bde52393288b4 (diff)
downloadsssd-40bb1ddf0a3f69922466b2b99bcdaf7746fc81ba.tar.gz
sssd-40bb1ddf0a3f69922466b2b99bcdaf7746fc81ba.tar.bz2
sssd-40bb1ddf0a3f69922466b2b99bcdaf7746fc81ba.zip
Use the sysdb synchronous transaction functions
-rw-r--r--src/python/pysss.c55
-rw-r--r--src/tools/sss_groupadd.c12
-rw-r--r--src/tools/sss_groupmod.c12
-rw-r--r--src/tools/sss_sync_ops.c411
-rw-r--r--src/tools/sss_sync_ops.h11
-rw-r--r--src/tools/sss_useradd.c15
-rw-r--r--src/tools/sss_usermod.c12
7 files changed, 104 insertions, 424 deletions
diff --git a/src/python/pysss.c b/src/python/pysss.c
index bd6d16e3..48c5aea2 100644
--- a/src/python/pysss.c
+++ b/src/python/pysss.c
@@ -237,25 +237,22 @@ static PyObject *py_sss_useradd(PySssLocalObject *self,
}
/* Add the user within a transaction */
- start_transaction(tctx);
+ tctx->error = sysdb_transaction_start(tctx->sysdb);
if (tctx->error != EOK) {
PyErr_SetSssError(tctx->error);
goto fail;
}
/* useradd */
- ret = useradd(tctx, self->ev,
- self->sysdb, tctx->handle, tctx->octx);
- if (ret != EOK) {
- tctx->error = ret;
-
+ tctx->error = useradd(tctx, tctx->sysdb, tctx->octx);
+ if (tctx->error) {
/* cancel transaction */
- talloc_zfree(tctx->handle);
+ sysdb_transaction_cancel(tctx->sysdb);
PyErr_SetSssError(tctx->error);
goto fail;
}
- end_transaction(tctx);
+ tctx->error = sysdb_transaction_commit(tctx->sysdb);
if (tctx->error) {
PyErr_SetSssError(tctx->error);
goto fail;
@@ -435,7 +432,6 @@ static PyObject *py_sss_usermod(PySssLocalObject *self,
PyObject *kwds)
{
struct tools_ctx *tctx = NULL;
- int ret;
PyObject *py_addgroups = Py_None;
PyObject *py_rmgroups = Py_None;
unsigned long uid = 0;
@@ -506,25 +502,22 @@ static PyObject *py_sss_usermod(PySssLocalObject *self,
tctx->octx->lock = lock;
/* Modify the user within a transaction */
- start_transaction(tctx);
+ tctx->error = sysdb_transaction_start(tctx->sysdb);
if (tctx->error != EOK) {
PyErr_SetSssError(tctx->error);
goto fail;
}
/* usermod */
- ret = usermod(tctx, self->ev,
- self->sysdb, tctx->handle, tctx->octx);
- if (ret != EOK) {
- tctx->error = ret;
-
+ tctx->error = usermod(tctx, tctx->sysdb, tctx->octx);
+ if (tctx->error) {
/* cancel transaction */
- talloc_zfree(tctx->handle);
+ sysdb_transaction_cancel(tctx->sysdb);
PyErr_SetSssError(tctx->error);
goto fail;
}
- end_transaction(tctx);
+ tctx->error = sysdb_transaction_commit(tctx->sysdb);
if (tctx->error) {
PyErr_SetSssError(tctx->error);
goto fail;
@@ -555,7 +548,6 @@ static PyObject *py_sss_groupadd(PySssLocalObject *self,
struct tools_ctx *tctx = NULL;
char *groupname;
unsigned long gid = 0;
- int ret;
const char * const kwlist[] = { "groupname", "gid", NULL };
/* parse arguments */
@@ -577,25 +569,22 @@ static PyObject *py_sss_groupadd(PySssLocalObject *self,
tctx->octx->gid = gid;
/* Add the group within a transaction */
- start_transaction(tctx);
+ tctx->error = sysdb_transaction_start(tctx->sysdb);
if (tctx->error != EOK) {
PyErr_SetSssError(tctx->error);
goto fail;
}
/* groupadd */
- ret = groupadd(tctx, self->ev,
- self->sysdb, tctx->handle, tctx->octx);
- if (ret != EOK) {
- tctx->error = ret;
-
+ tctx->error = groupadd(tctx, tctx->sysdb, tctx->octx);
+ if (tctx->error) {
/* cancel transaction */
- talloc_zfree(tctx->handle);
+ sysdb_transaction_cancel(tctx->sysdb);
PyErr_SetSssError(tctx->error);
goto fail;
}
- end_transaction(tctx);
+ tctx->error = sysdb_transaction_commit(tctx->sysdb);
if (tctx->error) {
PyErr_SetSssError(tctx->error);
goto fail;
@@ -668,7 +657,6 @@ static PyObject *py_sss_groupmod(PySssLocalObject *self,
PyObject *kwds)
{
struct tools_ctx *tctx = NULL;
- int ret;
PyObject *py_addgroups = Py_None;
PyObject *py_rmgroups = Py_None;
unsigned long gid = 0;
@@ -717,25 +705,22 @@ static PyObject *py_sss_groupmod(PySssLocalObject *self,
tctx->octx->gid = gid;
/* Modify the group within a transaction */
- start_transaction(tctx);
+ tctx->error = sysdb_transaction_start(tctx->sysdb);
if (tctx->error != EOK) {
PyErr_SetSssError(tctx->error);
goto fail;
}
/* groupmod */
- ret = groupmod(tctx, self->ev,
- self->sysdb, tctx->handle, tctx->octx);
- if (ret != EOK) {
- tctx->error = ret;
-
+ tctx->error = groupmod(tctx, tctx->sysdb, tctx->octx);
+ if (tctx->error) {
/* cancel transaction */
- talloc_zfree(tctx->handle);
+ sysdb_transaction_cancel(tctx->sysdb);
PyErr_SetSssError(tctx->error);
goto fail;
}
- end_transaction(tctx);
+ tctx->error = sysdb_transaction_commit(tctx->sysdb);
if (tctx->error) {
PyErr_SetSssError(tctx->error);
goto fail;
diff --git a/src/tools/sss_groupadd.c b/src/tools/sss_groupadd.c
index 15eed100..e5ef7218 100644
--- a/src/tools/sss_groupadd.c
+++ b/src/tools/sss_groupadd.c
@@ -108,22 +108,20 @@ int main(int argc, const char **argv)
goto fini;
}
- start_transaction(tctx);
+ tctx->error = sysdb_transaction_start(tctx->sysdb);
if (tctx->error != EOK) {
goto done;
}
/* groupadd */
- ret = groupadd(tctx, tctx->ev, tctx->sysdb, tctx->handle, tctx->octx);
- if (ret != EOK) {
- tctx->error = ret;
-
+ tctx->error = groupadd(tctx, tctx->sysdb, tctx->octx);
+ if (tctx->error) {
/* cancel transaction */
- talloc_zfree(tctx->handle);
+ sysdb_transaction_cancel(tctx->sysdb);
goto done;
}
- end_transaction(tctx);
+ tctx->error = sysdb_transaction_commit(tctx->sysdb);
done:
if (tctx->error) {
diff --git a/src/tools/sss_groupmod.c b/src/tools/sss_groupmod.c
index b25a018d..6c784240 100644
--- a/src/tools/sss_groupmod.c
+++ b/src/tools/sss_groupmod.c
@@ -196,22 +196,20 @@ int main(int argc, const char **argv)
goto fini;
}
- start_transaction(tctx);
+ tctx->error = sysdb_transaction_start(tctx->sysdb);
if (tctx->error != EOK) {
goto done;
}
/* groupmod */
- ret = groupmod(tctx, tctx->ev, tctx->sysdb, tctx->handle, tctx->octx);
- if (ret != EOK) {
- tctx->error = ret;
-
+ tctx->error = groupmod(tctx, tctx->sysdb, tctx->octx);
+ if (tctx->error) {
/* cancel transaction */
- talloc_zfree(tctx->handle);
+ sysdb_transaction_cancel(tctx->sysdb);
goto done;
}
- end_transaction(tctx);
+ tctx->error = sysdb_transaction_commit(tctx->sysdb);
done:
if (tctx->error) {
diff --git a/src/tools/sss_sync_ops.c b/src/tools/sss_sync_ops.c
index d84ec7c2..f9230a38 100644
--- a/src/tools/sss_sync_ops.c
+++ b/src/tools/sss_sync_ops.c
@@ -57,16 +57,6 @@ struct sync_op_res {
};
/*
- * Generic recv function
- */
-static int sync_ops_recv(struct tevent_req *req)
-{
- TEVENT_REQ_RETURN_ON_ERROR(req);
-
- return EOK;
-}
-
-/*
* Generic modify groups member
*/
static int mod_groups_member(TALLOC_CTX *mem_ctx,
@@ -210,215 +200,120 @@ static int usermod_build_attrs(TALLOC_CTX *mem_ctx,
return EOK;
}
-static void user_mod_attr_wakeup(struct tevent_req *subreq);
-
-static struct tevent_req *user_mod_send(TALLOC_CTX *mem_ctx,
- struct tevent_context *ev,
- struct sysdb_ctx *sysdb,
- struct sysdb_handle *handle,
- struct ops_ctx *data)
+/*
+ * Public interface for modifying users
+ */
+int usermod(TALLOC_CTX *mem_ctx,
+ struct sysdb_ctx *sysdb,
+ struct ops_ctx *data)
{
- struct user_mod_state *state = NULL;
- struct tevent_req *req;
- struct tevent_req *subreq;
+ struct sysdb_attrs *attrs;
+ struct ldb_dn *member_dn;
int ret;
- struct timeval tv = { 0, 0 };
-
- req = tevent_req_create(mem_ctx, &state, struct user_mod_state);
- if (req == NULL) {
- return NULL;
- }
- state->ev = ev;
- state->sysdb = sysdb;
- state->handle = handle;
- state->data = data;
if (data->addgroups || data->rmgroups) {
- state->member_dn = sysdb_user_dn(state->sysdb, state,
- state->data->domain->name,
- state->data->name);
- if (!state->member_dn) {
- talloc_zfree(req);
- return NULL;
+ member_dn = sysdb_user_dn(sysdb, mem_ctx,
+ data->domain->name, data->name);
+ if (!member_dn) {
+ return ENOMEM;
}
}
- ret = usermod_build_attrs(state,
- state->data->gecos,
- state->data->home,
- state->data->shell,
- state->data->uid,
- state->data->gid,
- state->data->lock,
- &state->attrs);
+ ret = usermod_build_attrs(mem_ctx,
+ data->gecos,
+ data->home,
+ data->shell,
+ data->uid,
+ data->gid,
+ data->lock,
+ &attrs);
if (ret != EOK) {
- talloc_zfree(req);
- return NULL;
+ return ret;
}
- subreq = tevent_wakeup_send(req, ev, tv);
- if (!subreq) {
- talloc_zfree(req);
- return NULL;
- }
-
- tevent_req_set_callback(subreq, user_mod_attr_wakeup, req);
- return req;
-}
-
-static void user_mod_attr_wakeup(struct tevent_req *subreq)
-{
- struct tevent_req *req = tevent_req_callback_data(subreq,
- struct tevent_req);
- struct user_mod_state *state = tevent_req_data(req,
- struct user_mod_state);
- int ret;
-
- if (state->attrs->num != 0) {
- ret = sysdb_set_user_attr(state, sysdb_handle_get_ctx(state->handle),
- state->data->domain, state->data->name,
- state->attrs, SYSDB_MOD_REP);
+ if (attrs->num != 0) {
+ ret = sysdb_set_user_attr(mem_ctx, sysdb,
+ data->domain, data->name,
+ attrs, SYSDB_MOD_REP);
if (ret) {
- tevent_req_error(req, ret);
- return;
+ return ret;
}
}
- if (state->data->rmgroups != NULL) {
- ret = remove_from_groups(state, state->sysdb,
- state->data, state->member_dn);
+ if (data->rmgroups != NULL) {
+ ret = remove_from_groups(mem_ctx, sysdb, data, member_dn);
if (ret) {
- tevent_req_error(req, ret);
- return;
+ return ret;
}
}
- if (state->data->addgroups != NULL) {
- ret = add_to_groups(state, state->sysdb,
- state->data, state->member_dn);
+ if (data->addgroups != NULL) {
+ ret = add_to_groups(mem_ctx, sysdb, data, member_dn);
if (ret) {
- tevent_req_error(req, ret);
- return;
+ return ret;
}
}
- tevent_req_done(req);
-}
+ flush_nscd_cache(mem_ctx, NSCD_DB_PASSWD);
+ flush_nscd_cache(mem_ctx, NSCD_DB_GROUP);
-static int user_mod_recv(struct tevent_req *req)
-{
- return sync_ops_recv(req);
+ return EOK;
}
/*
- * Modify a group
+ * Public interface for modifying groups
*/
-struct group_mod_state {
- struct tevent_context *ev;
- struct sysdb_ctx *sysdb;
- struct sysdb_handle *handle;
-
+int groupmod(TALLOC_CTX *mem_ctx,
+ struct sysdb_ctx *sysdb,
+ struct ops_ctx *data)
+{
struct sysdb_attrs *attrs;
struct ldb_dn *member_dn;
-
- struct ops_ctx *data;
-};
-
-static void group_mod_attr_wakeup(struct tevent_req *);
-
-static struct tevent_req *group_mod_send(TALLOC_CTX *mem_ctx,
- struct tevent_context *ev,
- struct sysdb_ctx *sysdb,
- struct sysdb_handle *handle,
- struct ops_ctx *data)
-{
- struct group_mod_state *state;
- struct tevent_req *req;
- struct tevent_req *subreq;
- struct timeval tv = { 0, 0 };
-
- req = tevent_req_create(mem_ctx, &state, struct group_mod_state);
- if (req == NULL) {
- return NULL;
- }
- state->ev = ev;
- state->sysdb = sysdb;
- state->handle = handle;
- state->data = data;
+ int ret;
if (data->addgroups || data->rmgroups) {
- state->member_dn = sysdb_group_dn(state->sysdb, state,
- state->data->domain->name,
- state->data->name);
- if (!state->member_dn) {
- return NULL;
+ member_dn = sysdb_group_dn(sysdb, mem_ctx,
+ data->domain->name, data->name);
+ if (!member_dn) {
+ return ENOMEM;
}
}
- subreq = tevent_wakeup_send(req, ev, tv);
- if (!subreq) {
- talloc_zfree(req);
- return NULL;
- }
-
- tevent_req_set_callback(subreq, group_mod_attr_wakeup, req);
- return req;
-}
-
-static void group_mod_attr_wakeup(struct tevent_req *subreq)
-{
- struct tevent_req *req = tevent_req_callback_data(subreq,
- struct tevent_req);
- struct group_mod_state *state = tevent_req_data(req,
- struct group_mod_state);
- struct sysdb_attrs *attrs;
- int ret;
-
- if (state->data->gid != 0) {
- attrs = sysdb_new_attrs(NULL);
+ if (data->gid != 0) {
+ attrs = sysdb_new_attrs(mem_ctx);
if (!attrs) {
- tevent_req_error(req, ENOMEM);
- return;
+ return ENOMEM;
}
- ret = sysdb_attrs_add_uint32(attrs, SYSDB_GIDNUM, state->data->gid);
+ ret = sysdb_attrs_add_uint32(attrs, SYSDB_GIDNUM, data->gid);
if (ret) {
- tevent_req_error(req, ret);
- return;
+ return ret;
}
- ret = sysdb_set_group_attr(state, sysdb_handle_get_ctx(state->handle),
- state->data->domain, state->data->name,
+ ret = sysdb_set_group_attr(mem_ctx, sysdb,
+ data->domain, data->name,
attrs, SYSDB_MOD_REP);
if (ret) {
- tevent_req_error(req, ret);
- return;
+ return ret;
}
}
- if (state->data->rmgroups != NULL) {
- ret = remove_from_groups(state, state->sysdb,
- state->data, state->member_dn);
+ if (data->rmgroups != NULL) {
+ ret = remove_from_groups(mem_ctx, sysdb, data, member_dn);
if (ret) {
- tevent_req_error(req, ret);
- return;
+ return ret;
}
}
- if (state->data->addgroups != NULL) {
- ret = add_to_groups(state, state->sysdb,
- state->data, state->member_dn);
+ if (data->addgroups != NULL) {
+ ret = add_to_groups(mem_ctx, sysdb, data, member_dn);
if (ret) {
- tevent_req_error(req, ret);
- return;
+ return ret;
}
}
- tevent_req_done(req);
-}
+ flush_nscd_cache(mem_ctx, NSCD_DB_GROUP);
-static int group_mod_recv(struct tevent_req *req)
-{
- return sync_ops_recv(req);
+ return EOK;
}
int userdel_defaults(TALLOC_CTX *mem_ctx,
@@ -585,9 +480,7 @@ done:
* Public interface for adding users
*/
int useradd(TALLOC_CTX *mem_ctx,
- struct tevent_context *ev,
struct sysdb_ctx *sysdb,
- struct sysdb_handle *handle,
struct ops_ctx *data)
{
int ret;
@@ -651,63 +544,10 @@ int userdel(TALLOC_CTX *mem_ctx,
}
/*
- * Public interface for modifying users
- */
-static void usermod_done(struct tevent_req *req);
-
-int usermod(TALLOC_CTX *mem_ctx,
- struct tevent_context *ev,
- struct sysdb_ctx *sysdb,
- struct sysdb_handle *handle,
- struct ops_ctx *data)
-{
- int ret;
- struct tevent_req *req;
- struct sync_op_res *res = NULL;
-
- res = talloc_zero(mem_ctx, struct sync_op_res);
- if (!res) {
- return ENOMEM;
- }
-
- req = user_mod_send(res, ev, sysdb, handle, data);
- if (!req) {
- return ENOMEM;
- }
- tevent_req_set_callback(req, usermod_done, res);
-
- SYNC_LOOP(res, ret);
-
- flush_nscd_cache(mem_ctx, NSCD_DB_PASSWD);
- flush_nscd_cache(mem_ctx, NSCD_DB_GROUP);
-
- talloc_free(res);
- return ret;
-}
-
-static void usermod_done(struct tevent_req *req)
-{
- int ret;
- struct sync_op_res *res = tevent_req_callback_data(req,
- struct sync_op_res);
-
- ret = user_mod_recv(req);
- talloc_free(req);
- if (ret) {
- DEBUG(2, ("Modifying user failed: %s (%d)\n", strerror(ret), ret));
- }
-
- res->done = true;
- res->error = ret;
-}
-
-/*
* Public interface for adding groups
*/
int groupadd(TALLOC_CTX *mem_ctx,
- struct tevent_context *ev,
struct sysdb_ctx *sysdb,
- struct sysdb_handle *handle,
struct ops_ctx *data)
{
int ret;
@@ -749,135 +589,6 @@ int groupdel(TALLOC_CTX *mem_ctx,
}
/*
- * Public interface for modifying groups
- */
-static void groupmod_done(struct tevent_req *req);
-
-int groupmod(TALLOC_CTX *mem_ctx,
- struct tevent_context *ev,
- struct sysdb_ctx *sysdb,
- struct sysdb_handle *handle,
- struct ops_ctx *data)
-{
- int ret;
- struct tevent_req *req;
- struct sync_op_res *res = NULL;
-
- res = talloc_zero(mem_ctx, struct sync_op_res);
- if (!res) {
- return ENOMEM;
- }
-
- req = group_mod_send(res, ev, sysdb, handle, data);
- if (!req) {
- return ENOMEM;
- }
- tevent_req_set_callback(req, groupmod_done, res);
-
- SYNC_LOOP(res, ret);
-
- flush_nscd_cache(mem_ctx, NSCD_DB_GROUP);
-
- talloc_free(res);
- return ret;
-}
-
-static void groupmod_done(struct tevent_req *req)
-{
- int ret;
- struct sync_op_res *res = tevent_req_callback_data(req,
- struct sync_op_res);
-
- ret = group_mod_recv(req);
- talloc_free(req);
- if (ret) {
- DEBUG(2, ("Modifying group failed: %s (%d)\n", strerror(ret), ret));
- }
-
- res->done = true;
- res->error = ret;
-}
-
-/*
- * Synchronous transaction functions
- */
-static void start_transaction_done(struct tevent_req *req);
-
-void start_transaction(struct tools_ctx *tctx)
-{
- struct tevent_req *req;
-
- /* make sure handle is NULL, as it is the spy to check if the transaction
- * has been started */
- tctx->handle = NULL;
- tctx->error = 0;
-
- req = sysdb_transaction_send(tctx->octx, tctx->ev, tctx->sysdb);
- if (!req) {
- DEBUG(1, ("Could not start transaction\n"));
- tctx->error = ENOMEM;
- return;
- }
- tevent_req_set_callback(req, start_transaction_done, tctx);
-
- /* loop to obtain a transaction */
- while (!tctx->handle && !tctx->error) {
- tevent_loop_once(tctx->ev);
- }
-}
-
-static void start_transaction_done(struct tevent_req *req)
-{
- struct tools_ctx *tctx = tevent_req_callback_data(req,
- struct tools_ctx);
- int ret;
-
- ret = sysdb_transaction_recv(req, tctx, &tctx->handle);
- if (ret) {
- tctx->error = ret;
- }
- if (!tctx->handle) {
- tctx->error = EIO;
- }
- talloc_zfree(req);
-}
-
-static void end_transaction_done(struct tevent_req *req);
-
-void end_transaction(struct tools_ctx *tctx)
-{
- struct tevent_req *req;
-
- tctx->error = 0;
-
- req = sysdb_transaction_commit_send(tctx, tctx->ev, tctx->handle);
- if (!req) {
- /* free transaction and signal error */
- tctx->error = ENOMEM;
- return;
- }
- tevent_req_set_callback(req, end_transaction_done, tctx);
-
- /* loop to obtain a transaction */
- while (!tctx->transaction_done && !tctx->error) {
- tevent_loop_once(tctx->ev);
- }
-}
-
-static void end_transaction_done(struct tevent_req *req)
-{
- struct tools_ctx *tctx = tevent_req_callback_data(req,
- struct tools_ctx);
- int ret;
-
- ret = sysdb_transaction_commit_recv(req);
-
- tctx->transaction_done = true;
- tctx->error = ret;
- talloc_zfree(req);
-}
-
-/*
* getpwnam, getgrnam and friends
*/
static void sss_getpwnam_done(void *ptr, int status,
diff --git a/src/tools/sss_sync_ops.h b/src/tools/sss_sync_ops.h
index 6629d9c9..b2bb51c5 100644
--- a/src/tools/sss_sync_ops.h
+++ b/src/tools/sss_sync_ops.h
@@ -73,36 +73,25 @@ int userdel_defaults(TALLOC_CTX *mem_ctx,
/* synchronous operations */
int useradd(TALLOC_CTX *mem_ctx,
- struct tevent_context *ev,
struct sysdb_ctx *sysdb,
- struct sysdb_handle *handle,
struct ops_ctx *data);
int userdel(TALLOC_CTX *mem_ctx,
struct sysdb_ctx *sysdb,
struct ops_ctx *data);
int usermod(TALLOC_CTX *mem_ctx,
- struct tevent_context *ev,
struct sysdb_ctx *sysdb,
- struct sysdb_handle *handle,
struct ops_ctx *data);
int groupadd(TALLOC_CTX *mem_ctx,
- struct tevent_context *ev,
struct sysdb_ctx *sysdb,
- struct sysdb_handle *handle,
struct ops_ctx *data);
int groupdel(TALLOC_CTX *mem_ctx,
struct sysdb_ctx *sysdb,
struct ops_ctx *data);
int groupmod(TALLOC_CTX *mem_ctx,
- struct tevent_context *ev,
struct sysdb_ctx *sysdb,
- struct sysdb_handle *handle,
struct ops_ctx *data);
-void start_transaction(struct tools_ctx *tctx);
-void end_transaction(struct tools_ctx *tctx);
-
int sysdb_getpwnam_sync(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct sysdb_ctx *sysdb,
diff --git a/src/tools/sss_useradd.c b/src/tools/sss_useradd.c
index 6c6b5851..6198dcae 100644
--- a/src/tools/sss_useradd.c
+++ b/src/tools/sss_useradd.c
@@ -255,22 +255,23 @@ int main(int argc, const char **argv)
goto fini;
}
- start_transaction(tctx);
+ tctx->error = sysdb_transaction_start(tctx->sysdb);
if (tctx->error != EOK) {
goto done;
}
/* useradd */
- ret = useradd(tctx, tctx->ev, tctx->sysdb, tctx->handle, tctx->octx);
- if (ret != EOK) {
- tctx->error = ret;
-
+ tctx->error = useradd(tctx, tctx->sysdb, tctx->octx);
+ if (tctx->error) {
/* cancel transaction */
- talloc_zfree(tctx->handle);
+ sysdb_transaction_cancel(tctx->sysdb);
goto done;
}
- end_transaction(tctx);
+ tctx->error = sysdb_transaction_commit(tctx->sysdb);
+ if (tctx->error) {
+ goto done;
+ }
/* Set SELinux login context - must be done after transaction is done
* b/c libselinux calls getpwnam */
diff --git a/src/tools/sss_usermod.c b/src/tools/sss_usermod.c
index 65431fa5..88e3fda3 100644
--- a/src/tools/sss_usermod.c
+++ b/src/tools/sss_usermod.c
@@ -218,22 +218,20 @@ int main(int argc, const char **argv)
tctx->octx->gid = pc_gid;
tctx->octx->lock = pc_lock;
- start_transaction(tctx);
+ tctx->error = sysdb_transaction_start(tctx->sysdb);
if (tctx->error != EOK) {
goto done;
}
/* usermod */
- ret = usermod(tctx, tctx->ev, tctx->sysdb, tctx->handle, tctx->octx);
- if (ret != EOK) {
- tctx->error = ret;
-
+ tctx->error = usermod(tctx, tctx->sysdb, tctx->octx);
+ if (tctx->error) {
/* cancel transaction */
- talloc_zfree(tctx->handle);
+ sysdb_transaction_cancel(tctx->sysdb);
goto done;
}
- end_transaction(tctx);
+ tctx->error = sysdb_transaction_commit(tctx->sysdb);
/* Set SELinux login context - must be done after transaction is done
* b/c libselinux calls getpwnam */