summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2009-12-09 09:13:24 -0500
committerStephen Gallagher <sgallagh@redhat.com>2009-12-09 10:05:11 -0500
commitf38c4b39bad55cd416a72ae0ea864f34b85cbdc3 (patch)
tree68bd4f743753876e2be361e181d496bff209b767
parent04e89aefae5748ec3eca2718c5d37c95e8ff6abd (diff)
downloadsssd-f38c4b39bad55cd416a72ae0ea864f34b85cbdc3.tar.gz
sssd-f38c4b39bad55cd416a72ae0ea864f34b85cbdc3.tar.xz
sssd-f38c4b39bad55cd416a72ae0ea864f34b85cbdc3.zip
Properly deny id_provider=files
-rw-r--r--server/confdb/confdb.c7
-rw-r--r--server/monitor/monitor.c6
2 files changed, 7 insertions, 6 deletions
diff --git a/server/confdb/confdb.c b/server/confdb/confdb.c
index 07d776c88..ad354e5bb 100644
--- a/server/confdb/confdb.c
+++ b/server/confdb/confdb.c
@@ -810,6 +810,13 @@ static int confdb_get_domain_internal(struct confdb_ctx *cdb,
goto done;
}
+ if (strcasecmp(domain->provider, "files") == 0) {
+ /* The files provider is not valid anymore */
+ DEBUG(0, ("The \"files\" provider is invalid\n"));
+ ret = EINVAL;
+ goto done;
+ }
+
if (strcasecmp(domain->provider, "local") == 0) {
/* If this is the local provider, we need to ensure that
* no other provider was specified for other types, since
diff --git a/server/monitor/monitor.c b/server/monitor/monitor.c
index f5909f67c..d47b3a80a 100644
--- a/server/monitor/monitor.c
+++ b/server/monitor/monitor.c
@@ -1182,12 +1182,6 @@ static int add_new_provider(struct mt_ctx *ctx, const char *name)
return ret;
}
- if (strcasecmp(svc->provider, "files") == 0) {
- /* The files provider is not valid anymore */
- DEBUG(0, ("The \"files\" provider is invalid\n"));
- return EINVAL;
- }
-
if (strcasecmp(svc->provider, "local") == 0) {
/* The LOCAL provider requires no back-end currently
* We'll add it to the service list, but we don't need