diff options
| author | jkar8572 <jkar8572> | 2004-01-09 11:27:45 +0000 |
|---|---|---|
| committer | jkar8572 <jkar8572> | 2004-01-09 11:27:45 +0000 |
| commit | 4a83cdf5b56528dddef46773d2540cc51ed45102 (patch) | |
| tree | 27ca6f04383311fbe18a784066fdb1b7fae41d79 /warnquota.c | |
| parent | de63cc7548b8f9a53b17ebbdd6a5c077de926517 (diff) | |
| download | linuxquota-4a83cdf5b56528dddef46773d2540cc51ed45102.tar.gz | |
Fixed bug in warnquota.conf parsing. (Jan Kara)
Reverted change in kernel detection via sysctl() - sysctl() obsoleted in 2.6 (Jan Kara)
Diffstat (limited to 'warnquota.c')
| -rw-r--r-- | warnquota.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/warnquota.c b/warnquota.c index 6a39ce1..b1a4eb7 100644 --- a/warnquota.c +++ b/warnquota.c @@ -10,7 +10,7 @@ * * Author: Marco van Wieringen <mvw@planets.elm.net> * - * Version: $Id: warnquota.c,v 1.18 2004/01/07 12:37:48 jkar8572 Exp $ + * Version: $Id: warnquota.c,v 1.19 2004/01/09 11:27:45 jkar8572 Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -244,12 +244,17 @@ int deliverable(struct dquot *dquot) || ((dquot->dq_dqb.dqb_bsoftlimit && toqb(dquot->dq_dqb.dqb_curspace) >= dquot->dq_dqb.dqb_bsoftlimit) && (dquot->dq_dqb.dqb_btime && dquot->dq_dqb.dqb_btime <= now)))) return 0; + if (!maildev_handle) + return 1; mdquot = maildev_handle->qh_ops->read_dquot(maildev_handle, dquot->dq_id); if (mdquot && ((mdquot->dq_dqb.dqb_bhardlimit && toqb(mdquot->dq_dqb.dqb_curspace) >= mdquot->dq_dqb.dqb_bhardlimit) || ((mdquot->dq_dqb.dqb_bsoftlimit && toqb(mdquot->dq_dqb.dqb_curspace) >= mdquot->dq_dqb.dqb_bsoftlimit) - && (mdquot->dq_dqb.dqb_btime && mdquot->dq_dqb.dqb_btime <= now)))) + && (mdquot->dq_dqb.dqb_btime && mdquot->dq_dqb.dqb_btime <= now)))) { + free(mdquot); return 0; + } + free(mdquot); return 1; } @@ -659,7 +664,7 @@ int readconfigfile(const char *filename, struct configparams *config) sstrncpy(config->support, value, CNF_BUFFER); else if (!strcmp(var, "PHONE")) sstrncpy(config->phone, value, CNF_BUFFER); - else if (!strcmp(var, "MAILSERV")) { + else if (!strcmp(var, "MAILDEV")) { /* set the global */ sstrncpy(maildev, value, CNF_BUFFER); } else if (!strcmp(var, "MESSAGE")) { |