X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/d742bb4728447bd3b23f43de586343b319c03da0..28dc2d220aee492d34c35e3e0756248a16d55b5a:/lib/configuration.c diff --git a/lib/configuration.c b/lib/configuration.c index 67f4f89..869f895 100644 --- a/lib/configuration.c +++ b/lib/configuration.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * Portions copyright (C) 2007 Mark Wooding * * This program is free software; you can redistribute it and/or modify @@ -958,6 +958,7 @@ static const struct conf conf[] = { { C(prefsync), &type_integer, validate_positive }, { C(queue_pad), &type_integer, validate_positive }, { C(refresh), &type_integer, validate_positive }, + { C(reminder_interval), &type_integer, validate_positive }, { C2(restrict, restrictions), &type_restrict, validate_any }, { C(sample_format), &type_sample_format, validate_sample_format }, { C(scratch), &type_string_accum, validate_isreg }, @@ -1190,6 +1191,7 @@ static struct config *config_default(void) { c->cookie_key_lifetime = 86400 * 7; c->smtp_server = xstrdup("127.0.0.1"); c->new_max = 100; + c->reminder_interval = 600; /* 10m */ /* Default stopwords */ if(config_set(&cs, (int)NDEFAULT_STOPWORDS, (char **)default_stopwords)) exit(1); @@ -1359,7 +1361,7 @@ int config_read(int server) { return -1; xfree(privconf); /* if we have a password file, read it */ - if((privconf = config_userconf(getenv("HOME"), pw)) + if((privconf = config_userconf(0, pw)) && access(privconf, F_OK) == 0 && config_include(c, privconf)) return -1;