diff options
author | Simo Sorce <simo@redhat.com> | 2013-01-07 23:27:51 -0500 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2013-01-15 10:53:02 +0100 |
commit | 3412d14d65490c32414e72ac20fe21bad53ceb45 (patch) | |
tree | e63253f040369cfe88fa37a40377704072a168f7 /src/providers/ldap | |
parent | 044868b388b4e47499f12a9105310b247bbe1ce2 (diff) | |
download | sssd-3412d14d65490c32414e72ac20fe21bad53ceb45.tar.gz sssd-3412d14d65490c32414e72ac20fe21bad53ceb45.tar.bz2 sssd-3412d14d65490c32414e72ac20fe21bad53ceb45.zip |
Add domain argument to sysdb_delete_user()
Also remove sysdb_delete_domuser()
Diffstat (limited to 'src/providers/ldap')
-rw-r--r-- | src/providers/ldap/ldap_id.c | 8 | ||||
-rw-r--r-- | src/providers/ldap/ldap_id_cleanup.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/providers/ldap/ldap_id.c b/src/providers/ldap/ldap_id.c index 1a468906..95455d01 100644 --- a/src/providers/ldap/ldap_id.c +++ b/src/providers/ldap/ldap_id.c @@ -256,7 +256,8 @@ static void users_get_done(struct tevent_req *subreq) tevent_req_error(req, ret); return; case BE_FILTER_NAME: - ret = sysdb_delete_user(state->sysdb, state->name, 0); + ret = sysdb_delete_user(state->sysdb, + state->domain, state->name, 0); if (ret != EOK && ret != ENOENT) { tevent_req_error(req, ret); return; @@ -270,7 +271,7 @@ static void users_get_done(struct tevent_req *subreq) return; } - ret = sysdb_delete_user(state->sysdb, NULL, uid); + ret = sysdb_delete_user(state->sysdb, state->domain, NULL, uid); if (ret != EOK && ret != ENOENT) { tevent_req_error(req, ret); return; @@ -732,7 +733,8 @@ static void groups_by_user_done(struct tevent_req *subreq) } if (ret == ENOENT) { - ret = sysdb_delete_user(state->ctx->be->sysdb, state->name, 0); + ret = sysdb_delete_user(state->ctx->be->sysdb, + state->ctx->be->domain, state->name, 0); if (ret != EOK && ret != ENOENT) { tevent_req_error(req, ret); return; diff --git a/src/providers/ldap/ldap_id_cleanup.c b/src/providers/ldap/ldap_id_cleanup.c index 6e138b31..77c4d94e 100644 --- a/src/providers/ldap/ldap_id_cleanup.c +++ b/src/providers/ldap/ldap_id_cleanup.c @@ -337,7 +337,7 @@ static int cleanup_users(TALLOC_CTX *memctx, struct sdap_id_ctx *ctx) /* If not logged in or cannot check the table, delete him */ DEBUG(9, ("About to delete user %s\n", name)); - ret = sysdb_delete_user(sysdb, name, 0); + ret = sysdb_delete_user(sysdb, ctx->be->domain, name, 0); if (ret) { goto done; } |