diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-07-06 09:41:50 -0300 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-07-06 09:41:50 -0300 |
| commit | 1623ed9700dd89ee871313add2c4947c1227cc39 (patch) | |
| tree | f1809bd8552dd406bcef2cad32b982516c0262fb /etc/inc/voucher.inc | |
| parent | 4842755397c92f1c16b50b16e01b28768f8b43c1 (diff) | |
| parent | f49c41c538e718d06b44e9c2d279ba9b9580b5ff (diff) | |
| download | pfsense-1623ed9700dd89ee871313add2c4947c1227cc39.zip pfsense-1623ed9700dd89ee871313add2c4947c1227cc39.tar.gz | |
Merge remote-tracking branch 'mainline/master' into inc
Conflicts:
etc/inc/priv.defs.inc
Diffstat (limited to 'etc/inc/voucher.inc')
| -rw-r--r-- | etc/inc/voucher.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/etc/inc/voucher.inc b/etc/inc/voucher.inc index d50269f..dc95092 100644 --- a/etc/inc/voucher.inc +++ b/etc/inc/voucher.inc @@ -301,6 +301,9 @@ function voucher_expire($voucher_received) { function voucher_auth($voucher_received, $test = 0) { global $g, $config; + if (!isset($config['voucher']['enable'])) + return 0; + $voucherlck = lock('voucher', LOCK_EX); // XMLRPC Call over to the master Voucher node |
