From 26016007a293c5e8e80746356ce96230620acc67 Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Fri, 15 Jan 2010 20:06:15 +0000
Subject: [PATCH] o Fixed a bug in the WinPcap installer: If the "Start the
 WinPcap   service 'NPF' at startup" box was unchecked and the "Start the  
 WinPcap service 'NPF' now" box was checked, the second checkbox   would be
 ignored (the service would not be started now). [Rob   Nicholls]

---
 CHANGELOG                        | 6 ++++++
 mswin32/winpcap/winpcap-nmap.nsi | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index e30d65897..77d56cba9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -108,6 +108,12 @@ o [NSE] Our http library no longer allows cached responses from a GET
   request to be returned for a HEAD request. This could cause problems
   with at least the http-enum script. [David]
 
+o Fixed a bug in the WinPcap installer: If the "Start the WinPcap
+  service 'NPF' at startup" box was unchecked and the "Start the
+  WinPcap service 'NPF' now" box was checked, the second checkbox
+  would be ignored (the service would not be started now). [Rob
+  Nicholls]
+
 Nmap 5.10BETA2 [2009-12-24]
 
 o Added 7 new NSE scripts for a grand total of 79! You can learn about
diff --git a/mswin32/winpcap/winpcap-nmap.nsi b/mswin32/winpcap/winpcap-nmap.nsi
index 29afe75a8..3b655816d 100644
--- a/mswin32/winpcap/winpcap-nmap.nsi
+++ b/mswin32/winpcap/winpcap-nmap.nsi
@@ -266,8 +266,9 @@ FunctionEnd
 
 Function doOptions
   ReadINIStr $0 "$PLUGINSDIR\options.ini" "Field 1" "State"
-  StrCmp $0 "0" do_options_end
+  StrCmp $0 "0" do_options_next
   WriteRegDWORD HKLM "SYSTEM\CurrentControlSet\Services\NPF" "Start" 2
+  do_options_next:
   ReadINIStr $0 "$PLUGINSDIR\options.ini" "Field 2" "State"
   StrCmp $0 "0" do_options_end
   nsExec::Exec "net start npf"