From a2483ff6a8277815827842cda8ec63b3c568bcf2 Mon Sep 17 00:00:00 2001
From: Lars Karlslund <lars@karlslund.dk>
Date: Tue, 30 Nov 2021 21:03:59 +0100
Subject: [PATCH] Minor fix for datapath

---
 modules/analyze/html/adalanche.css                  | 13 +++++++++----
 modules/analyze/html/index.html                     |  2 +-
 modules/integrations/activedirectory/collect/cli.go |  7 +++++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/modules/analyze/html/adalanche.css b/modules/analyze/html/adalanche.css
index 342f8cc..cc8ef97 100644
--- a/modules/analyze/html/adalanche.css
+++ b/modules/analyze/html/adalanche.css
@@ -82,10 +82,15 @@ body {
   transform: translate(-50%, 0%);
 }
 
-#explore {
+#commandbuttons {
   position: absolute;
   left: 10px;
   bottom: 10px;
+  white-space: nowrap;
+}
+
+#commandbuttons .btn {
+  margin-right: 5px;
 }
 
 .checkbox-button input[type='checkbox'],
@@ -93,7 +98,7 @@ body {
   display: none;
 }
 
-.checkbox-button input[type='checkbox']:checked + label.btn,
-.checkbox-button input[type='radio']:checked + label.btn {
+.checkbox-button input[type='checkbox']:checked+label.btn,
+.checkbox-button input[type='radio']:checked+label.btn {
   background-color: var(--primary-color);
-}
+}
\ No newline at end of file
diff --git a/modules/analyze/html/index.html b/modules/analyze/html/index.html
index 2bbc23c..9da22d9 100644
--- a/modules/analyze/html/index.html
+++ b/modules/analyze/html/index.html
@@ -52,7 +52,7 @@
   <div id="cy" class="fullscreen z-10"></div>
 
   <div id="overlay" class="fullscreen z-40 pointer-events-none">
-    <button id="explore" class="btn btn-primary pointer-events-auto">Explore</button>
+    <div id="commandbuttons" class="pointer-events-auto"><button id="explore" class="btn btn-primary">Explore</button></div>
     <!-- <div id="infobar" class="float-left">
       <div id="infowrap" class="fw-250 h-full pointer-events-auto">
         <div id="infocontent" class="fw-250 bg-dark h-full overflow-y-auto">
diff --git a/modules/integrations/activedirectory/collect/cli.go b/modules/integrations/activedirectory/collect/cli.go
index 0c5c960..30b2690 100644
--- a/modules/integrations/activedirectory/collect/cli.go
+++ b/modules/integrations/activedirectory/collect/cli.go
@@ -72,7 +72,7 @@ func init() {
 	if runtime.GOOS == "windows" {
 		defaultmode = "ntlmsspi"
 	}
-	authmodeString = Command.Flags().String("authmode", defaultmode, "Bind mode: unauth, simple, md5, ntlm, ntlmpth (password is hash), ntlmsspi (current user, default)")
+	authmodeString = Command.Flags().String("authmode", defaultmode, "Bind mode: unauth, simple, md5, ntlm, ntlmpth (password is hash), ntlmsspi (integrated Windows)")
 
 	clicollect.Collect.AddCommand(Command)
 	Command.PreRunE = PreRun
@@ -209,7 +209,10 @@ func Execute(cmd *cobra.Command, args []string) error {
 		attributes = strings.Split(*attributesparam, ",")
 	}
 
-	datapath := cmd.Flag("datapath").Value.String()
+	datapath := "data"
+	if idp := cmd.InheritedFlags().Lookup("datapath"); idp != nil {
+		datapath = idp.Value.String()
+	}
 
 	log.Info().Msg("Probing RootDSE ...")
 	rootdse, err := ad.Dump(DumpOptions{