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/db/sysdb_ops.c | |
| parent | 044868b388b4e47499f12a9105310b247bbe1ce2 (diff) | |
| download | sssd-3412d14d65490c32414e72ac20fe21bad53ceb45.tar.gz sssd-3412d14d65490c32414e72ac20fe21bad53ceb45.tar.xz sssd-3412d14d65490c32414e72ac20fe21bad53ceb45.zip | |
Add domain argument to sysdb_delete_user()
Also remove sysdb_delete_domuser()
Diffstat (limited to 'src/db/sysdb_ops.c')
| -rw-r--r-- | src/db/sysdb_ops.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/db/sysdb_ops.c b/src/db/sysdb_ops.c index 4a0ed57b2..4b885d67e 100644 --- a/src/db/sysdb_ops.c +++ b/src/db/sysdb_ops.c @@ -1673,7 +1673,7 @@ int sysdb_store_user(struct sysdb_ctx *sysdb, /* This may be a user rename. If there is a user with the * same UID, remove it and try to add the basic user again */ - ret = sysdb_delete_user(sysdb, NULL, uid); + ret = sysdb_delete_user(sysdb, domain, NULL, uid); if (ret == ENOENT) { /* Not found by UID, return the original EEXIST, * this may be a conflict in MPG domain or something @@ -2404,6 +2404,7 @@ fail: /* =Delete-User-by-Name-OR-uid============================================ */ int sysdb_delete_user(struct sysdb_ctx *sysdb, + struct sss_domain_info *domain, const char *name, uid_t uid) { TALLOC_CTX *tmp_ctx; @@ -2421,10 +2422,10 @@ int sysdb_delete_user(struct sysdb_ctx *sysdb, } if (name) { - ret = sysdb_search_user_by_name(tmp_ctx, sysdb, sysdb->domain, + ret = sysdb_search_user_by_name(tmp_ctx, sysdb, domain, name, NULL, &msg); } else { - ret = sysdb_search_user_by_uid(tmp_ctx, sysdb, sysdb->domain, + ret = sysdb_search_user_by_uid(tmp_ctx, sysdb, domain, uid, NULL, &msg); } if (ret == EOK) { |