- 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

diff --git a/doc/Changelog b/doc/Changelog
index cecba52bbc96390b77d435b4d446af5567b63bfd..e3262993da34156e4507b2a230ff0b389abda32e 100644 (file)
--- 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 438bd770daacea500eb1f9bf9b8b2791217ffe0e..a6ce11a2aede7ba1a81f977eb1ffb384c151cf20 100644 (file)
--- 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 ea486f31835fb49c5072e405b914a07ade82c95a..2a285b09a2d1d22436147419eeaee7098edef2ac 100644 (file)
--- 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 560801440e489f108e43455203b6881d0c5e4727..32eb1d6aaa8661a7c0adb8b4a49d1722bbdb9b16 100644 (file)
--- 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>