summaryrefslogtreecommitdiff
path: root/server/db
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2009-02-12 08:26:50 -0500
committerSimo Sorce <idra@samba.org>2009-02-12 17:08:57 -0500
commit659a34f2a1e635cad8dac26df7c51e6edaf2d094 (patch)
tree0e8dcdb64d726d4f8c762a244f491f559b1e2e6c /server/db
parent7c3629bc78edd79f557805176f3024eaf4fa51b1 (diff)
downloadsssd-659a34f2a1e635cad8dac26df7c51e6edaf2d094.tar.gz
sssd-659a34f2a1e635cad8dac26df7c51e6edaf2d094.tar.bz2
sssd-659a34f2a1e635cad8dac26df7c51e6edaf2d094.zip
Added sysdb_remove_group_posix and sysdb_remove_group_posix_by_gid
Fixed a few small bugs in sysdb_[store|remove]_account_posix. The string "uid=" needed to be replaced with SYSDB_PW_NAME, and the search scope in sysdb_remove_account_posix_by_uid needed to be LDB_SCOPE_ONELEVEL, not LDB_SCOPE_BASE. Added associated unit tests. Modified the unit test structure so that it is called as a single suite, rather than a User and Group suite, since there is too much overlap.
Diffstat (limited to 'server/db')
-rw-r--r--server/db/sysdb.c135
-rw-r--r--server/db/sysdb.h8
2 files changed, 140 insertions, 3 deletions
diff --git a/server/db/sysdb.c b/server/db/sysdb.c
index 31233e58..ab338746 100644
--- a/server/db/sysdb.c
+++ b/server/db/sysdb.c
@@ -755,7 +755,7 @@ int sysdb_store_account_posix(TALLOC_CTX *memctx,
}
account_dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb,
- "uid=%s,"SYSDB_TMPL_USER_BASE,
+ SYSDB_PW_NAME"=%s,"SYSDB_TMPL_USER_BASE,
name, domain);
if (!account_dn) {
talloc_free(tmp_ctx);
@@ -988,7 +988,7 @@ int sysdb_remove_account_posix(TALLOC_CTX *memctx,
}
account_dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb,
- "uid=%s,"SYSDB_TMPL_USER_BASE,
+ SYSDB_PW_NAME"=%s,"SYSDB_TMPL_USER_BASE,
name, domain);
if (!account_dn) {
talloc_free(tmp_ctx);
@@ -1038,7 +1038,7 @@ int sysdb_remove_account_posix_by_uid(TALLOC_CTX *memctx,
}
lret = ldb_search(sysdb->ldb, tmp_ctx, &res, base_dn,
- LDB_SCOPE_BASE, attrs,
+ LDB_SCOPE_ONELEVEL, attrs,
SYSDB_PWUID_FILTER,
(unsigned long)uid);
if (lret != LDB_SUCCESS) {
@@ -1049,6 +1049,8 @@ int sysdb_remove_account_posix_by_uid(TALLOC_CTX *memctx,
}
if (res->count == 0) {
+ DEBUG(0, ("Base search returned %d results\n",
+ res->count));
ret = EOK;
goto done;
}
@@ -1097,6 +1099,7 @@ done:
talloc_free(tmp_ctx);
return ret;
}
+
int sysdb_store_group_posix(TALLOC_CTX *memctx,
struct sysdb_ctx *sysdb,
const char *domain,
@@ -1458,6 +1461,132 @@ done:
return ret;
}
+int sysdb_remove_group_posix(TALLOC_CTX *memctx,
+ struct sysdb_ctx *sysdb,
+ const char *domain, const char *name)
+{
+ TALLOC_CTX *tmp_ctx;
+ struct ldb_dn *group_dn;
+ int ret;
+
+ tmp_ctx = talloc_new(memctx);
+ if (!tmp_ctx) {
+ return ENOMEM;
+ }
+
+ group_dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb,
+ SYSDB_GR_NAME"=%s,"SYSDB_TMPL_GROUP_BASE,
+ name, domain);
+ if (!group_dn) {
+ talloc_free(tmp_ctx);
+ return ENOMEM;
+ }
+
+ ret = ldb_delete(sysdb->ldb, group_dn);
+
+ if (ret != LDB_SUCCESS) {
+ DEBUG(2, ("LDB Error: %s(%d)\nError Message: [%s]\n",
+ ldb_strerror(ret), ret, ldb_errstring(sysdb->ldb)));
+ ret = EIO;
+ }
+
+ talloc_free(tmp_ctx);
+ return ret;
+}
+
+int sysdb_remove_group_posix_by_gid(TALLOC_CTX *memctx,
+ struct sysdb_ctx *sysdb,
+ const char *domain, gid_t gid)
+{
+ TALLOC_CTX *tmp_ctx;
+ const char *attrs[] = { SYSDB_GR_NAME, SYSDB_GR_GIDNUM, NULL };
+ struct ldb_dn *base_dn;
+ struct ldb_dn *group_dn;
+ struct ldb_result *res;
+ int lret, ret;
+
+ tmp_ctx = talloc_new(memctx);
+ if (!tmp_ctx) {
+ return ENOMEM;
+ }
+
+ base_dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb,
+ SYSDB_TMPL_GROUP_BASE, domain);
+ if (!base_dn) {
+ talloc_free(tmp_ctx);
+ return ENOMEM;
+ }
+
+ lret = ldb_transaction_start(sysdb->ldb);
+ if (lret != LDB_SUCCESS) {
+ DEBUG(1, ("Failed ldb transaction start !? (%d)\n", lret));
+ ret = EIO;
+ goto done;
+ }
+
+ lret = ldb_search(sysdb->ldb, tmp_ctx, &res, base_dn,
+ LDB_SCOPE_ONELEVEL, attrs,
+ SYSDB_GRGID_FILTER,
+ (unsigned long)gid);
+ if (lret != LDB_SUCCESS) {
+ DEBUG(1, ("Failed to make search request: %s(%d)[%s]\n",
+ ldb_strerror(lret), lret, ldb_errstring(sysdb->ldb)));
+ ret = EIO;
+ goto done;
+ }
+
+ if (res->count == 0) {
+ DEBUG(0, ("Base search returned %d results\n",
+ res->count));
+ ret = EOK;
+ goto done;
+ }
+ if (res->count > 1) {
+ DEBUG(0, ("Cache DB corrupted, base search returned %d results\n",
+ res->count));
+ ret = EOK;
+ goto done;
+ }
+
+ group_dn = ldb_dn_copy(tmp_ctx, res->msgs[0]->dn);
+ if (!group_dn) {
+ ret = ENOMEM;
+ goto done;
+ }
+
+ talloc_free(res);
+ res = NULL;
+
+ ret = ldb_delete(sysdb->ldb, group_dn);
+
+ if (ret != LDB_SUCCESS) {
+ DEBUG(2, ("LDB Error: %s(%d)\nError Message: [%s]\n",
+ ldb_strerror(ret), ret, ldb_errstring(sysdb->ldb)));
+ ret = EIO;
+ goto done;
+ }
+
+ lret = ldb_transaction_commit(sysdb->ldb);
+ if (lret != LDB_SUCCESS) {
+ DEBUG(1, ("Failed ldb transaction commit !! (%d)\n", lret));
+ ret = EIO;
+ goto done;
+ }
+
+ ret = EOK;
+
+done:
+ if (ret != EOK) {
+ lret = ldb_transaction_cancel(sysdb->ldb);
+ if (lret != LDB_SUCCESS) {
+ DEBUG(1, ("Failed to cancel ldb transaction (%d)\n", lret));
+ }
+ }
+
+ talloc_free(tmp_ctx);
+ return ret;
+}
+
int sysdb_init(TALLOC_CTX *mem_ctx,
struct event_context *ev,
struct confdb_ctx *cdb,
diff --git a/server/db/sysdb.h b/server/db/sysdb.h
index 656cb8fe..4af6323a 100644
--- a/server/db/sysdb.h
+++ b/server/db/sysdb.h
@@ -182,4 +182,12 @@ int sysdb_add_remove_posix_group_member(TALLOC_CTX *mem_ctx,
int flag,
struct ldb_dn *member_dn,
struct ldb_dn *group_dn);
+
+int sysdb_remove_group_posix(TALLOC_CTX *memctx,
+ struct sysdb_ctx *sysdb,
+ const char *domain, const char *name);
+
+int sysdb_remove_group_posix_by_gid(TALLOC_CTX *memctx,
+ struct sysdb_ctx *sysdb,
+ const char *domain, gid_t gid);
#endif /* __SYS_DB_H__ */