Fixes

franc-pentest · Oct 29, 2023 · ffd2dd6 · ffd2dd6
1 parent af2bf98
commit ffd2dd6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.42
+1.0.43
diff --git a/ldeep/__main__.py b/ldeep/__main__.py
@@ -138,9 +138,8 @@ def default(o):
                                     if not sid:
                                         continue
                                     res = self.engine.resolve_sid(sid)
-                                    for item in res:
-                                        name = item['dNSHostName']
-                                        print(f"Primary/Secondary Site: {name}")
+                                    name = next(res)['dNSHostName']
+                                    print(f"Primary/Secondary Site: {name}")
                                 except:
                                     print(f"Primary/Secondary Site: {sid}")
                 # sccm distribution points
@@ -546,8 +545,8 @@ def list_sccm(self, kwargs):
         verbose = kwargs.get("verbose", False)
 
         # Primary/Secondary Sites
+        self.engine.set_controls(LDAP_SERVER_SD_FLAGS_OID_SEC_DESC)
         if verbose:
-            self.engine.set_controls(LDAP_SERVER_SD_FLAGS_OID_SEC_DESC)
             attributes = ['*', '+', 'ntSecurityDescriptor']
         else:
             attributes = ["objectClass", "ntSecurityDescriptor"]
@@ -561,19 +560,22 @@ def list_sccm(self, kwargs):
         )
 
         # Distribution points
+        self.engine.set_controls()
         if verbose:
-            self.engine.set_controls()
             attributes = self.engine.all_attributes()
         else:
             attributes = ["objectClass", "dNSHostName"]
 
-        results = self.display(
-            self.engine.query(
-                self.engine.DP_SCCM_FILTER(),
-                attributes,
-            ),
-            verbose
-        )
+        try:
+            results = self.display(
+                self.engine.query(
+                    self.engine.DP_SCCM_FILTER(),
+                    attributes,
+                ),
+                verbose
+            )
+        except Exception as e:
+            error(f"SCCM may not be installed: {e}")
 
     def list_subnets(self, kwargs):
         """
@@ -814,7 +816,7 @@ def list_delegations(self, kwargs):
                                 if not sid:
                                     continue
                                 res = self.engine.resolve_sid(sid)
-                                name = res[0]['sAMAccountName']
+                                name = next(res)['sAMAccountName']
                                 print(f"{name}:rbcd:{sam}")
                             except Exception:
                                 print(f"{sid}:rbcd:{sam}")