From 531316ddc26fcabedeb14f5bfe1d81a5ac2e0f79 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 9 Dec 2009 09:13:24 -0500 Subject: Properly deny id_provider=files --- server/confdb/confdb.c | 7 +++++++ server/monitor/monitor.c | 6 ------ 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 -- cgit