118 lines
5.1 KiB
Diff
118 lines
5.1 KiB
Diff
From 9aa26f6514220bae3b3314f830e3e3f95fab2cf9 Mon Sep 17 00:00:00 2001
|
|
From: Sumit Bose <sbose@redhat.com>
|
|
Date: Thu, 7 May 2020 21:18:13 +0200
|
|
Subject: [PATCH 15/19] sysdb: make new_subdomain() public
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Resolves: https://github.com/SSSD/sssd/issues/5151
|
|
|
|
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
|
|
---
|
|
src/db/sysdb.h | 18 ++++++++++++++++++
|
|
src/db/sysdb_private.h | 19 -------------------
|
|
src/tests/cmocka/test_negcache.c | 1 -
|
|
src/tests/cmocka/test_nss_srv.c | 1 -
|
|
src/tests/cmocka/test_responder_cache_req.c | 1 -
|
|
5 files changed, 18 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/src/db/sysdb.h b/src/db/sysdb.h
|
|
index 64e546f5b..e4ed10b54 100644
|
|
--- a/src/db/sysdb.h
|
|
+++ b/src/db/sysdb.h
|
|
@@ -562,6 +562,24 @@ errno_t sysdb_subdomain_delete(struct sysdb_ctx *sysdb, const char *name);
|
|
errno_t sysdb_subdomain_content_delete(struct sysdb_ctx *sysdb,
|
|
const char *name);
|
|
|
|
+/* The utility function to create a subdomain sss_domain_info object is handy
|
|
+ * for unit tests, so it should be available in a headerr.
|
|
+ */
|
|
+struct sss_domain_info *new_subdomain(TALLOC_CTX *mem_ctx,
|
|
+ struct sss_domain_info *parent,
|
|
+ const char *name,
|
|
+ const char *realm,
|
|
+ const char *flat_name,
|
|
+ const char *id,
|
|
+ enum sss_domain_mpg_mode mpg_mode,
|
|
+ bool enumerate,
|
|
+ const char *forest,
|
|
+ const char **upn_suffixes,
|
|
+ uint32_t trust_direction,
|
|
+ struct confdb_ctx *confdb,
|
|
+ bool enabled);
|
|
+
|
|
+
|
|
errno_t sysdb_get_ranges(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb,
|
|
size_t *range_count,
|
|
struct range_info ***range_list);
|
|
diff --git a/src/db/sysdb_private.h b/src/db/sysdb_private.h
|
|
index 3302919a6..70fe3fa18 100644
|
|
--- a/src/db/sysdb_private.h
|
|
+++ b/src/db/sysdb_private.h
|
|
@@ -196,25 +196,6 @@ int sysdb_replace_ulong(struct ldb_message *msg,
|
|
int sysdb_delete_ulong(struct ldb_message *msg,
|
|
const char *attr, unsigned long value);
|
|
|
|
-/* The utility function to create a subdomain sss_domain_info object is handy
|
|
- * for unit tests, so it should be available in a header, but not a public util
|
|
- * one, because the only interface for the daemon itself should be adding
|
|
- * the sysdb domain object and calling sysdb_update_subdomains()
|
|
- */
|
|
-struct sss_domain_info *new_subdomain(TALLOC_CTX *mem_ctx,
|
|
- struct sss_domain_info *parent,
|
|
- const char *name,
|
|
- const char *realm,
|
|
- const char *flat_name,
|
|
- const char *id,
|
|
- enum sss_domain_mpg_mode mpg_mode,
|
|
- bool enumerate,
|
|
- const char *forest,
|
|
- const char **upn_suffixes,
|
|
- uint32_t trust_direction,
|
|
- struct confdb_ctx *confdb,
|
|
- bool enabled);
|
|
-
|
|
/* Helper functions to deal with the timestamp cache should not be used
|
|
* outside the sysdb itself. The timestamp cache should be completely
|
|
* opaque to the sysdb consumers
|
|
diff --git a/src/tests/cmocka/test_negcache.c b/src/tests/cmocka/test_negcache.c
|
|
index 3ed1cb14a..b3a379227 100644
|
|
--- a/src/tests/cmocka/test_negcache.c
|
|
+++ b/src/tests/cmocka/test_negcache.c
|
|
@@ -38,7 +38,6 @@
|
|
#include "util/util_sss_idmap.h"
|
|
#include "lib/idmap/sss_idmap.h"
|
|
#include "util/util.h"
|
|
-#include "db/sysdb_private.h"
|
|
#include "responder/common/responder.h"
|
|
#include "responder/common/negcache.h"
|
|
|
|
diff --git a/src/tests/cmocka/test_nss_srv.c b/src/tests/cmocka/test_nss_srv.c
|
|
index 3cd7809cf..99ba02a80 100644
|
|
--- a/src/tests/cmocka/test_nss_srv.c
|
|
+++ b/src/tests/cmocka/test_nss_srv.c
|
|
@@ -36,7 +36,6 @@
|
|
#include "util/crypto/sss_crypto.h"
|
|
#include "util/crypto/nss/nss_util.h"
|
|
#include "util/sss_endian.h"
|
|
-#include "db/sysdb_private.h" /* new_subdomain() */
|
|
#include "db/sysdb_iphosts.h"
|
|
#include "db/sysdb_ipnetworks.h"
|
|
|
|
diff --git a/src/tests/cmocka/test_responder_cache_req.c b/src/tests/cmocka/test_responder_cache_req.c
|
|
index 2611c589b..68a651240 100644
|
|
--- a/src/tests/cmocka/test_responder_cache_req.c
|
|
+++ b/src/tests/cmocka/test_responder_cache_req.c
|
|
@@ -27,7 +27,6 @@
|
|
#include "tests/cmocka/common_mock_resp.h"
|
|
#include "db/sysdb.h"
|
|
#include "responder/common/cache_req/cache_req.h"
|
|
-#include "db/sysdb_private.h" /* new_subdomain() */
|
|
|
|
#define TESTS_PATH "tp_" BASE_FILE_STEM
|
|
#define TEST_CONF_DB "test_responder_cache_req_conf.ldb"
|
|
--
|
|
2.21.3
|
|
|