[svn-upgrade] Integrating new upstream version, strongswan (4.3.2)

4 files changed, 1 insertions, 9 deletions

diff --git a/src/medsrv/controller/peer_controller.c b/src/medsrv/controller/peer_controller.c
index 22fc6df2f..0dec27698 100755
--- a/src/medsrv/controller/peer_controller.c
+++ b/src/medsrv/controller/peer_controller.c
@@ -12,8 +12,6 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
- *
- * $Id$
  */
 
 #define _GNU_SOURCE
@@ -72,7 +70,7 @@ static void list(private_peer_controller_t *this, request_t *request)
 		{
 			request->setf(request, "peers.%d.alias=%s", id, alias);
 			identifier = identification_create_from_encoding(ID_KEY_ID, keyid);
-			request->setf(request, "peers.%d.identifier=%D", id, identifier);
+			request->setf(request, "peers.%d.identifier=%Y", id, identifier);
 			identifier->destroy(identifier);
 		}
 		query->destroy(query);
diff --git a/src/medsrv/controller/peer_controller.h b/src/medsrv/controller/peer_controller.h
index 511265487..f25c30281 100755
--- a/src/medsrv/controller/peer_controller.h
+++ b/src/medsrv/controller/peer_controller.h
@@ -12,8 +12,6 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
- *
- * $Id$
  */
 
 /**
diff --git a/src/medsrv/controller/user_controller.c b/src/medsrv/controller/user_controller.c
index 9e6d12340..bc4717e32 100755
--- a/src/medsrv/controller/user_controller.c
+++ b/src/medsrv/controller/user_controller.c
@@ -12,8 +12,6 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
- *
- * $Id$
  */
 
 #define _GNU_SOURCE
diff --git a/src/medsrv/controller/user_controller.h b/src/medsrv/controller/user_controller.h
index 897e28362..9d23795d7 100755
--- a/src/medsrv/controller/user_controller.h
+++ b/src/medsrv/controller/user_controller.h
@@ -12,8 +12,6 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
- *
- * $Id$
  */
 
 /**