sss_userdel

Also install tools into /sbin, own them in specfile

4 files changed, 237 insertions, 2 deletions

diff --git a/server/Makefile.in b/server/Makefile.in
index 39b6306f..97b71128 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -117,7 +117,7 @@ endif
 ifneq (x$(HAVE_POLICYKIT), x)
     LIBEXECBINS += sbin/sssd_pk
 endif
-TOOLSBINS = sbin/sss_useradd
+TOOLSBINS = sbin/sss_useradd sbin/sss_userdel
 BINS = sbin/sssd $(LIBEXECBINS) $(TOOLSBINS)
 
 ifneq (x$(HAVE_TESTS), x)
@@ -162,6 +162,7 @@ testclean::
 install:: all installdirs installheaders installlibs installbin installsupport
 	${INSTALLCMD} -d $(DESTDIR)$(sbindir)
 	${INSTALLCMD} -m 755 sbin/sssd $(DESTDIR)$(sbindir)
+	${INSTALLCMD} -m 755 $(TOOLSBINS) $(DESTDIR)$(sbindir)
 	${INSTALLCMD} -d $(DESTDIR)$(SSSD_LIBEXEC_PATH)
 	${INSTALLCMD} -m 755 $(LIBEXECBINS) $(DESTDIR)$(SSSD_LIBEXEC_PATH)
 
diff --git a/server/server.mk b/server/server.mk
index af052f45..ba0485df 100644
--- a/server/server.mk
+++ b/server/server.mk
@@ -132,5 +132,7 @@ tests/infopipe-tests: $(INFP_TEST_OBJ) $(UTIL_OBJ)
 
 #Tools
 sbin/sss_useradd: $(USERADD_OBJ) $(TOOLS_OBJ) $(UTIL_OBJ)
-	$(CC) -o tools/sss_useradd $(USERADD_OBJ) $(TOOLS_OBJ) $(UTIL_OBJ) $(LDFLAGS) $(LIBS)
+	$(CC) -o sbin/sss_useradd $(USERADD_OBJ) $(TOOLS_OBJ) $(UTIL_OBJ) $(LDFLAGS) $(LIBS)
 
+sbin/sss_userdel: $(USERDEL_OBJ) $(TOOLS_OBJ) $(UTIL_OBJ)
+	$(CC) -o sbin/sss_userdel $(USERDEL_OBJ) $(TOOLS_OBJ) $(UTIL_OBJ) $(LDFLAGS) $(LIBS)
diff --git a/server/tools/sss_userdel.c b/server/tools/sss_userdel.c
new file mode 100644
index 00000000..1fa00fb3
--- /dev/null
+++ b/server/tools/sss_userdel.c
@@ -0,0 +1,230 @@
+/*
+   SSSD
+
+   sss_userdel
+
+   Copyright (C) Jakub Hrozek <jhrozek@redhat.com>        2009
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <talloc.h>
+#include <popt.h>
+
+#include "db/sysdb.h"
+#include "util/util.h"
+#include "tools/tools_util.h"
+
+struct user_del_ctx {
+    struct sysdb_req *sysreq;
+    sysdb_callback_t next_fn;
+
+    const char *username;
+    uid_t uid;
+
+    struct sss_domain_info *domain;
+    struct tools_ctx *ctx;
+
+    int error;
+    bool done;
+};
+
+struct fetch_user {
+    uid_t uid;
+    int error;
+    bool done;
+};
+
+static void getpwnam_callback(void *ptr, int error, struct ldb_result *res)
+{
+    struct fetch_user *data = talloc_get_type(ptr, struct fetch_user);
+
+    data->done = true;
+
+    if (error) {
+        data->error = error;
+        return;
+    }
+
+    switch (res->count) {
+    case 0:
+        data->error = ENOENT;
+        break;
+
+    case 1:
+        data->uid = ldb_msg_find_attr_as_uint(res->msgs[0], SYSDB_UIDNUM, 0);
+        break;
+
+    default:
+        data->error = EFAULT;
+        break;
+    }
+}
+
+/* sysdb callback */
+static void userdel_done(void *pvt, int error, struct ldb_result *ignore)
+{
+    struct user_del_ctx *data = talloc_get_type(pvt, struct user_del_ctx);
+
+    data->done = true;
+
+    sysdb_transaction_done(data->sysreq, error);
+
+    if (error)
+        data->error = error;
+}
+
+/* sysdb_req_fn_t */
+static void user_del(struct sysdb_req *req, void *pvt)
+{
+    struct user_del_ctx *user_ctx;
+    int ret;
+
+    user_ctx = talloc_get_type(pvt, struct user_del_ctx);
+    user_ctx->sysreq = req;
+
+    ret = sysdb_delete_user_by_uid(req, "LOCAL",
+                                   user_ctx->uid,
+                                   userdel_done,
+                                   user_ctx);
+
+    if(ret != EOK)
+        userdel_done(user_ctx, ret, NULL);
+}
+
+int main(int argc, const char **argv)
+{
+    int ret = EXIT_SUCCESS;
+    struct user_del_ctx *user_ctx = NULL;
+    struct tools_ctx *ctx = NULL;
+    struct fetch_user *fetch_ctx = NULL;
+
+
+    poptContext pc;
+    struct poptOption long_options[] = {
+        POPT_AUTOHELP
+        POPT_TABLEEND
+    };
+
+    debug_prg_name = argv[0];
+
+    ret = setup_db(&ctx);
+    if(ret != EOK) {
+        DEBUG(0, ("Could not set up database\n"));
+        ret = EXIT_FAILURE;
+        goto fini;
+    }
+
+    user_ctx = talloc_zero(NULL, struct user_del_ctx);
+    if (user_ctx == NULL) {
+        DEBUG(0, ("Could not allocate memory for user_ctx context\n"));
+        return ENOMEM;
+    }
+    user_ctx->ctx = ctx;
+
+    fetch_ctx = talloc_zero(ctx, struct fetch_user);
+    if (fetch_ctx == NULL) {
+        DEBUG(0, ("Could not allocate memory for fetch_user context\n"));
+        return ENOMEM;
+    }
+
+    /* parse user_ctx */
+    pc = poptGetContext(NULL, argc, argv, long_options, 0);
+    poptSetOtherOptionHelp(pc, "USERNAME");
+    if((ret = poptGetNextOpt(pc)) < -1) {
+        usage(pc, poptStrerror(ret));
+        ret = EXIT_FAILURE;
+        goto fini;
+    }
+
+    user_ctx->username = poptGetArg(pc);
+    if(user_ctx->username == NULL) {
+        usage(pc, "Specify user to delete\n");
+        ret = EXIT_FAILURE;
+        goto fini;
+    }
+
+    /* arguments processed, go on to actual work */
+
+    user_ctx->domain = btreemap_get_value(ctx->domains, "LOCAL");
+    if (user_ctx->domain == NULL) {
+        DEBUG(0, ("Could not set default values\n"));
+        ret = EXIT_FAILURE;
+        goto fini;
+    }
+
+    /* Look up uid for given username */
+    ret = sysdb_getpwnam(fetch_ctx, ctx->sysdb,
+                         "LOCAL",
+                         user_ctx->username,
+                         false,
+                         getpwnam_callback,
+                         fetch_ctx);
+    if(ret != EOK) {
+        DEBUG(1, ("sysdb_getpwnam failed: %d\n", ret));
+        ret = EXIT_FAILURE;
+        goto fini;
+    }
+
+    while (!fetch_ctx->done) {
+        tevent_loop_once(ctx->ev);
+    }
+
+    if(fetch_ctx->error) {
+        ret = fetch_ctx->error;
+        switch(ret) {
+            case ENOENT:
+                DEBUG(0, ("No such user: %s\n", user_ctx->username));
+                break;
+
+            default:
+                DEBUG(0, ("sysdb_getpwnam failed: (%d) [%s]\n",
+                          ret, strerror(ret)));
+                break;
+        }
+        goto fini;
+    }
+
+    user_ctx->uid = fetch_ctx->uid;
+
+    /* userdel */
+    ret = sysdb_transaction(ctx, ctx->sysdb, user_del, user_ctx);
+    if(ret != EOK) {
+        DEBUG(1, ("Could not start transaction (%d)[%s]\n", ret, strerror(ret)));
+        ret = EXIT_FAILURE;
+        goto fini;
+    }
+
+    while (!user_ctx->done) {
+        tevent_loop_once(ctx->ev);
+    }
+
+    if (user_ctx->error) {
+        ret = user_ctx->error;
+        DEBUG(0, ("Operation failed (%d)[%s]\n", ret, strerror(ret)));
+        ret = EXIT_FAILURE;
+        goto fini;
+    }
+
+    ret = EXIT_SUCCESS;
+
+fini:
+    talloc_free(ctx);
+    talloc_free(user_ctx);
+    poptFreeContext(pc);
+    exit(ret);
+}
+
diff --git a/sssd.spec b/sssd.spec
index 8b1ef6d3..71c14f39 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -79,6 +79,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING
 %{_sbindir}/sssd
+%{_sbindir}/sss_useradd
+%{_sbindir}/sss_userdel
 %{_libexecdir}/%{name}/
 %{_libdir}/%{name}/
 %{_libdir}/ldb/memberof.so*