summaryrefslogtreecommitdiff
path: root/server
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:18 -0500
commit531316ddc26fcabedeb14f5bfe1d81a5ac2e0f79 (patch)
tree081e87234ab38fb035ed6f44538131ceca1c54e5 /server
parent9fbf84a98519a349198ee1a4c4d0786432de378e (diff)
downloadsssd-531316ddc26fcabedeb14f5bfe1d81a5ac2e0f79.tar.gz
sssd-531316ddc26fcabedeb14f5bfe1d81a5ac2e0f79.tar.bz2
sssd-531316ddc26fcabedeb14f5bfe1d81a5ac2e0f79.zip
Properly deny id_provider=files
Diffstat (limited to 'server')
-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 07d776c8..ad354e5b 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 f5909f67..d47b3a80 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