vw_small

commit 5352321fe19252c5aa0451cf734e33fc58052333
parent 632d55265b6931c3091a9dc61c594c005d264f71
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Wed, 29 Jan 2020 13:28:07 +0100

Merge pull request #831 from mprasil/whitelist-fix

SIGNUPS_ALLOWED with no whitelist [fixes #830]
Diffstat:
M
src/config.rs
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/config.rs b/src/config.rs
@@ -515,7 +515,7 @@ impl Config {
         // (it doesn't contain any domains), or if it matches at least
         // one domain.
         let whitelist_str = self.signups_domains_whitelist();
-        whitelist_str.is_empty() || whitelist_str.split(',').filter(|s| !s.is_empty()).any(|d| d == e[0])
+        ( whitelist_str.is_empty() && CONFIG.signups_allowed() )|| whitelist_str.split(',').filter(|s| !s.is_empty()).any(|d| d == e[0])
     }
 
     pub fn delete_user_config(&self) -> Result<(), Error> {