diff options
| author | Simo Sorce <simo@redhat.com> | 2013-01-07 23:39:50 -0500 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2013-01-15 10:53:02 +0100 |
| commit | a58ccee5afc802c7560624929614616aeefa9bd0 (patch) | |
| tree | c007a5d2faaa1978740419e5978ce227b7b81640 /src/db/sysdb_ops.c | |
| parent | 2b7ee2a760e7fcc70f4970a3bbee6fbf8f2ccb9d (diff) | |
| download | sssd-a58ccee5afc802c7560624929614616aeefa9bd0.tar.gz sssd-a58ccee5afc802c7560624929614616aeefa9bd0.tar.xz sssd-a58ccee5afc802c7560624929614616aeefa9bd0.zip | |
Add domain argument to sysdb_delete_group()
Also remove sysdb_delete_domgroup()
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 37e6b682b..a32f41833 100644 --- a/src/db/sysdb_ops.c +++ b/src/db/sysdb_ops.c @@ -1831,7 +1831,7 @@ int sysdb_store_group(struct sysdb_ctx *sysdb, /* This may be a group rename. If there is a group with the * same GID, remove it and try to add the basic group again */ - ret = sysdb_delete_group(sysdb, NULL, gid); + ret = sysdb_delete_group(sysdb, domain, NULL, gid); if (ret == ENOENT) { /* Not found by GID, return the original EEXIST, * this may be a conflict in MPG domain or something @@ -2562,6 +2562,7 @@ fail: /* =Delete-Group-by-Name-OR-gid=========================================== */ int sysdb_delete_group(struct sysdb_ctx *sysdb, + struct sss_domain_info *domain, const char *name, gid_t gid) { TALLOC_CTX *tmp_ctx; @@ -2574,10 +2575,10 @@ int sysdb_delete_group(struct sysdb_ctx *sysdb, } if (name) { - ret = sysdb_search_group_by_name(tmp_ctx, sysdb, sysdb->domain, + ret = sysdb_search_group_by_name(tmp_ctx, sysdb, domain, name, NULL, &msg); } else { - ret = sysdb_search_group_by_gid(tmp_ctx, sysdb, sysdb->domain, + ret = sysdb_search_group_by_gid(tmp_ctx, sysdb, domain, gid, NULL, &msg); } if (ret) { |