diff --git a/Makefile b/Makefile index e74d2f9..eb7cd62 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION = 2.16 +VERSION = 2.17 PACKAGE = yubikey-val CODE = COPYING Makefile NEWS ykval-checksum-clients.php \ 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"; \ exit 1; \ 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) gpg --detach-sign --default-key $(KEYID) $(PACKAGE)-$(VERSION).tgz gpg --verify $(PACKAGE)-$(VERSION).tgz.sig diff --git a/NEWS b/NEWS index 172fc7a..bbe4390 100644 --- a/NEWS +++ b/NEWS @@ -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 diff --git a/ykval-sync.php b/ykval-sync.php index 7f81983..12c81af 100644 --- a/ykval-sync.php +++ b/ykval-sync.php @@ -7,6 +7,11 @@ $apiKey = ''; header("content-type: text/plain"); +if(empty($_SERVER['QUERY_STRING'])) { + sendResp(S_MISSING_PARAMETER, $apiKey); + exit; +} + $myLog = new Log('ykval-sync'); $myLog->addField('ip', $_SERVER['REMOTE_ADDR']); diff --git a/ykval-synclib.php b/ykval-synclib.php index 4d3d3fd..0c87dca 100644 --- a/ykval-synclib.php +++ b/ykval-synclib.php @@ -435,13 +435,13 @@ class SyncLib $this->log(LOG_NOTICE, "Local server out of sync"); } - if ($this->CountersEqual($resParams, $localParams) && + if ($this->countersEqual($resParams, $localParams) && $resParams['nonce']!=$localParams['nonce']) { $this->log(LOG_NOTICE, "Servers out of sync. Nonce differs. "); } - if ($this->CountersEqual($resParams, $localParams) && + if ($this->countersEqual($resParams, $localParams) && $resParams['modified']!=$localParams['modified']) { $this->log(LOG_NOTICE, "Servers out of sync. Modified differs. "); }