From 26e259121399ae3e11921a2dbc989b8b7b050f87 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 12 Apr 2010 10:24:47 -0400 Subject: [PATCH] Fix merge error for sss_userdel.c --- src/tools/sss_userdel.c | 22 +--------------------- 1 files changed, 1 insertions(+), 21 deletions(-) diff --git a/src/tools/sss_userdel.c b/src/tools/sss_userdel.c index be90fc9321c672896e39b767f1de5271b6669fd5..869ec9c80334825174283d495457a86d8c53ec2d 100644 --- a/src/tools/sss_userdel.c +++ b/src/tools/sss_userdel.c @@ -78,22 +78,11 @@ static int kick_user(struct tools_ctx *tctx) tctx->octx->lock = 1; - start_transaction(tctx); - if (tctx->error != EOK) { - return tctx->error; - } - - ret = usermod(tctx, tctx->ev, tctx->sysdb, tctx->handle, tctx->octx); + ret = usermod(tctx, tctx->sysdb, tctx->octx); if (ret != EOK) { - talloc_zfree(tctx->handle); return ret; } - end_transaction(tctx); - if (tctx->error != EOK) { - return tctx->error; - } - errno = 0; pid = fork(); if (pid == 0) { @@ -254,25 +243,16 @@ int main(int argc, const char **argv) if (ret != EOK) { tctx->error = ret; - /* cancel transaction */ - talloc_zfree(tctx->handle); goto done; } } - start_transaction(tctx); - if (tctx->error != EOK) { - goto done; - } - /* userdel */ ret = userdel(tctx, tctx->sysdb, tctx->octx); if (ret != EOK) { goto done; } - end_transaction(tctx); - /* Set SELinux login context - must be done after transaction is done * b/c libselinux calls getpwnam */ ret = del_seuser(tctx->octx->name); -- 1.6.6.1