@@ -168,7 +168,7 @@ def create_conn_obj(self):
168168 target_domain = ""
169169 base_dn = ""
170170 try :
171- proto = "ldaps" if ( self .args . gmsa or self . port == 636 ) else "ldap"
171+ proto = "ldaps" if self .port == 636 else "ldap"
172172 ldap_url = f"{ proto } ://{ self .host } "
173173 self .logger .info (f"Connecting to { ldap_url } with no baseDN" )
174174 try :
@@ -309,9 +309,9 @@ def kerberos_login(self, domain, username, password="", ntlm_hash="", aesKey="",
309309
310310 try :
311311 # Connect to LDAP
312- self .logger .extra ["protocol" ] = "LDAPS" if ( self .args . gmsa or self . port == 636 ) else "LDAP"
313- self .logger .extra ["port" ] = "636" if ( self .args . gmsa or self . port == 636 ) else "389"
314- proto = "ldaps" if ( self .args . gmsa or self . port == 636 ) else "ldap"
312+ self .logger .extra ["protocol" ] = "LDAPS" if self .port == 636 else "LDAP"
313+ self .logger .extra ["port" ] = "636" if self .port == 636 else "389"
314+ proto = "ldaps" if self .port == 636 else "ldap"
315315 ldap_url = f"{ proto } ://{ self .target } "
316316 self .logger .info (f"Connecting to { ldap_url } - { self .baseDN } - { self .host } [1]" )
317317 self .ldap_connection = ldap_impacket .LDAPConnection (url = ldap_url , baseDN = self .baseDN , dstIp = self .host )
@@ -425,9 +425,9 @@ def plaintext_login(self, domain, username, password):
425425
426426 try :
427427 # Connect to LDAP
428- self .logger .extra ["protocol" ] = "LDAPS" if ( self .args . gmsa or self . port == 636 ) else "LDAP"
429- self .logger .extra ["port" ] = "636" if ( self .args . gmsa or self . port == 636 ) else "389"
430- proto = "ldaps" if ( self .args . gmsa or self . port == 636 ) else "ldap"
428+ self .logger .extra ["protocol" ] = "LDAPS" if self .port == 636 else "LDAP"
429+ self .logger .extra ["port" ] = "636" if self .port == 636 else "389"
430+ proto = "ldaps" if self .port == 636 else "ldap"
431431 ldap_url = f"{ proto } ://{ self .target } "
432432 self .logger .info (f"Connecting to { ldap_url } - { self .baseDN } - { self .host } [3]" )
433433 self .ldap_connection = ldap_impacket .LDAPConnection (url = ldap_url , baseDN = self .baseDN , dstIp = self .host )
@@ -515,9 +515,9 @@ def hash_login(self, domain, username, ntlm_hash):
515515
516516 try :
517517 # Connect to LDAP
518- self .logger .extra ["protocol" ] = "LDAPS" if ( self .args . gmsa or self . port == 636 ) else "LDAP"
519- self .logger .extra ["port" ] = "636" if ( self .args . gmsa or self . port == 636 ) else "389"
520- proto = "ldaps" if ( self .args . gmsa or self . port == 636 ) else "ldap"
518+ self .logger .extra ["protocol" ] = "LDAPS" if self .port == 636 else "LDAP"
519+ self .logger .extra ["port" ] = "636" if self .port == 636 else "389"
520+ proto = "ldaps" if self .port == 636 else "ldap"
521521 ldaps_url = f"{ proto } ://{ self .target } "
522522 self .logger .info (f"Connecting to { ldaps_url } - { self .baseDN } - { self .host } " )
523523 self .ldap_connection = ldap_impacket .LDAPConnection (url = ldaps_url , baseDN = self .baseDN , dstIp = self .host )
0 commit comments