From dfaa9a89aa4a38f1a305d57839508e6434a2406a Mon Sep 17 00:00:00 2001
From: Fredrik Thulin <fredrik@yubico.com>
Date: Tue, 12 Jun 2012 17:56:01 +0200
Subject: [PATCH 1/5] Use consistent camel-casing of function countersEqual().

Reduces confusion, even though PHP apparently has case insensitive
function names.
---
 ykval-synclib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ykval-synclib.php b/ykval-synclib.php
index 7e8645d..1bf5ef2 100644
--- a/ykval-synclib.php
+++ b/ykval-synclib.php
@@ -440,13 +440,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. ");
       }

From d2bceb62b1f665621d422aa6b073811112407772 Mon Sep 17 00:00:00 2001
From: Klas Lindfors <klas@yubico.com>
Date: Wed, 13 Jun 2012 09:32:38 +0200
Subject: [PATCH 2/5] if the sync request is empty, drop it as early as
 possible.

---
 ykval-sync.php | 5 +++++
 1 file changed, 5 insertions(+)

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']);
 

From 80a2d3c8052af0567e1912bf9abd15ad8b4c812c Mon Sep 17 00:00:00 2001
From: Klas Lindfors <klas@yubico.com>
Date: Wed, 13 Jun 2012 09:37:34 +0200
Subject: [PATCH 3/5] NEWS for 2.16

---
 NEWS | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 172fc7a..0c881e3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,8 @@
-* Version 2.16 unreleased
+* Version 2.16 released 2012-06-13
+
+  * Improved logging.
+
+  * Improved performance of large sync queues.
 
 * Version 2.15 released 2012-05-24
 

From 9dd6715cc522e29a2765ef69d7691414496d0fbe Mon Sep 17 00:00:00 2001
From: Klas Lindfors <klas@yubico.com>
Date: Wed, 13 Jun 2012 09:39:44 +0200
Subject: [PATCH 4/5] fix version check for this NEWS format.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d816720..53ea90c 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,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

From a41b7476ac780f7b10609221c6c4e6b171410da3 Mon Sep 17 00:00:00 2001
From: Klas Lindfors <klas@yubico.com>
Date: Wed, 13 Jun 2012 09:55:42 +0200
Subject: [PATCH 5/5] bump versions post release

---
 Makefile | 2 +-
 NEWS     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 53ea90c..70257ee 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	\
diff --git a/NEWS b/NEWS
index 0c881e3..bbe4390 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+* Version 2.17 unreleased
+
 * Version 2.16 released 2012-06-13
 
   * Improved logging.