rooty/yubikey-val
1
0
Fork 0
mirror of https://github.com/Yubico/yubikey-val.git synced 2025-02-20 12:54:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into feature/oracle_support

Browse Source
This commit is contained in:
Klas Lindfors 2012-06-13 09:55:59 +02:00
commit 40b5949f44
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,4 +1,4 @@
VERSION = 2.16 VERSION = 2.17
PACKAGE = yubikey-val PACKAGE = yubikey-val
CODE = COPYING Makefile NEWS ykval-checksum-clients.php \ CODE = COPYING Makefile NEWS ykval-checksum-clients.php \
ykval-common.php ykval-config.php ykval-db.php ykval-db.sql \ ykval-common.php ykval-config.php ykval-db.php ykval-db.sql \
@ -89,7 +89,7 @@ release: dist
echo " make release USER=simon@josefsson.org KEYID=2117364A"; \ echo " make release USER=simon@josefsson.org KEYID=2117364A"; \
exit 1; \ exit 1; \
fi fi
@head -3 NEWS | grep -q "Version $(VERSION) .released `date -I`" || \ @head -1 NEWS | grep -q "Version $(VERSION) released `date -I`" || \
(echo 'error: You need to update date/version in NEWS'; exit 1) (echo 'error: You need to update date/version in NEWS'; exit 1)
gpg --detach-sign --default-key $(KEYID) $(PACKAGE)-$(VERSION).tgz gpg --detach-sign --default-key $(KEYID) $(PACKAGE)-$(VERSION).tgz
gpg --verify $(PACKAGE)-$(VERSION).tgz.sig gpg --verify $(PACKAGE)-$(VERSION).tgz.sig

8
NEWS
View File

@ -1,4 +1,10 @@
* Version 2.16 unreleased * Version 2.17 unreleased
* Version 2.16 released 2012-06-13
* Improved logging.
* Improved performance of large sync queues.
* Version 2.15 released 2012-05-24 * Version 2.15 released 2012-05-24

5
ykval-sync.php
View File

@ -7,6 +7,11 @@ $apiKey = '';
header("content-type: text/plain"); header("content-type: text/plain");
if(empty($_SERVER['QUERY_STRING'])) {
sendResp(S_MISSING_PARAMETER, $apiKey);
exit;
}
$myLog = new Log('ykval-sync'); $myLog = new Log('ykval-sync');
$myLog->addField('ip', $_SERVER['REMOTE_ADDR']); $myLog->addField('ip', $_SERVER['REMOTE_ADDR']);

4
ykval-synclib.php
View File

@ -435,13 +435,13 @@ class SyncLib
$this->log(LOG_NOTICE, "Local server out of sync"); $this->log(LOG_NOTICE, "Local server out of sync");
} }
if ($this->CountersEqual($resParams, $localParams) && if ($this->countersEqual($resParams, $localParams) &&
$resParams['nonce']!=$localParams['nonce']) { $resParams['nonce']!=$localParams['nonce']) {
$this->log(LOG_NOTICE, "Servers out of sync. Nonce differs. "); $this->log(LOG_NOTICE, "Servers out of sync. Nonce differs. ");
} }
if ($this->CountersEqual($resParams, $localParams) && if ($this->countersEqual($resParams, $localParams) &&
$resParams['modified']!=$localParams['modified']) { $resParams['modified']!=$localParams['modified']) {
$this->log(LOG_NOTICE, "Servers out of sync. Modified differs. "); $this->log(LOG_NOTICE, "Servers out of sync. Modified differs. ");
} }