From 5cfc7e85646805cb8d0c1b70522636f052802799 Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 1 Sep 2016 03:34:23 +0000
Subject: [PATCH] Delay processing of -A until all --un/privileged options have
 been seen

---
 nmap.cc | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/nmap.cc b/nmap.cc
index 1d8f07779..10449773c 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -500,6 +500,7 @@ public:
     this->pre_max_retries       = -1;
     this->pre_host_timeout      = -1;
     this->iflist                = false;
+    this->advanced              = false;
     this->af                    = AF_UNSPEC;
     this->decoys                = false;
   }
@@ -513,7 +514,7 @@ public:
   int   pre_max_retries;
   long  pre_host_timeout;
   char  *machinefilename, *kiddiefilename, *normalfilename, *xmlfilename;
-  bool  iflist, decoys;
+  bool  iflist, decoys, advanced;
   char  *exclude_spec, *exclude_file;
   char  *spoofSource, *decoy_arguments;
   const char *spoofmac;
@@ -1057,14 +1058,7 @@ void parse_options(int argc, char **argv) {
 #endif /* !HAVE_IPV6 */
       break;
     case 'A':
-      o.servicescan = true;
-#ifndef NOLUA
-      o.script = 1;
-#endif
-      if (o.isr00t) {
-        o.osscan++;
-        o.traceroute = true;
-      }
+      delayed_options.advanced = true;
       break;
     case 'b':
       o.bouncescan++;
@@ -1437,6 +1431,16 @@ void  apply_delayed_options() {
   }
   delayed_options.verbose_out.clear();
 
+  if (delayed_options.advanced) {
+    o.servicescan = true;
+#ifndef NOLUA
+    o.script = 1;
+#endif
+    if (o.isr00t) {
+      o.osscan++;
+      o.traceroute = true;
+    }
+  }
   if (o.spoofsource) {
     int rc = resolve(delayed_options.spoofSource, 0, &ss, &sslen, o.af());
     if (rc != 0) {