From f40f5559884d7ab325d94486475e711a75ee2107 Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 2 Dec 2015 09:40:05 +0000
Subject: [PATCH] - Fixup 724: Fix PCA prompt for unbound-service-install.exe. 
  re-enable stdout printout.

git-svn-id: file:///svn/unbound/trunk@3565 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 doc/Changelog                   |  4 ++++
 winrc/unbound-service-install.c |  2 +-
 winrc/unbound-service-remove.c  |  2 +-
 winrc/vista_admin.manifest      | 19 +++++++++++++++++++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index cecba52bb..e3262993d 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+2 December 2015: Wouter
+	- Fixup 724: Fix PCA prompt for unbound-service-install.exe.
+	  re-enable stdout printout.
+
 1 December 2015: Ralph
 	- Qname minimisation review fixes
 
diff --git a/winrc/unbound-service-install.c b/winrc/unbound-service-install.c
index 438bd770d..a6ce11a2a 100644
--- a/winrc/unbound-service-install.c
+++ b/winrc/unbound-service-install.c
@@ -49,7 +49,7 @@
 /** Install service main */
 int main(int argc, char** argv)
 {
-	FILE* out = NULL; /* set stdout for debug output to stdout */
+	FILE* out = stdout;
 	/* out = fopen("unbound-service-install.log", "w");*/
 	if(argc == 2 && strcmp(argv[1], "start")==0) {
 		wsvc_rc_start(out);
diff --git a/winrc/unbound-service-remove.c b/winrc/unbound-service-remove.c
index ea486f318..2a285b09a 100644
--- a/winrc/unbound-service-remove.c
+++ b/winrc/unbound-service-remove.c
@@ -49,7 +49,7 @@
 /** Remove service main */
 int main(int argc, char** argv)
 {
-	FILE* out = NULL; /* stdout for debug output */
+	FILE* out = stdout;
 	/* out = fopen("unbound-service-remove.log", "w");*/
 	if(argc == 2 && strcmp(argv[1], "stop")==0) {
 		wsvc_rc_stop(out);
diff --git a/winrc/vista_admin.manifest b/winrc/vista_admin.manifest
index 560801440..32eb1d6aa 100644
--- a/winrc/vista_admin.manifest
+++ b/winrc/vista_admin.manifest
@@ -13,4 +13,23 @@
         </ms_asmv2:requestedPrivileges>
        </ms_asmv2:security>
   </ms_asmv2:trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application> 
+      <!--This Id value indicates the application supports Windows Vista/Server
+	   2008 functionality -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> 
+      <!--This Id value indicates the application supports Windows 7/Server 2008
+	   R2 functionality-->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!--This Id value indicates the application supports Windows 8/Server 2012
+	   functionality-->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- This Id value indicates the application supports Windows Blue/Server
+	   2012 R2 functionality-->            
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- This Id value indicates the application supports Windows Threshold
+	   functionality ; Windows 10 -->            
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+    </application>
+  </compatibility>
 </assembly>