Skip to content

Commit 8b4e374

Browse files
committed
Renamed "_ldap3_kerberos_login" to "ldap3_kerberos_login" (as it is called from outside)
1 parent ef4813a commit 8b4e374

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

examples/addcomputer.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
from impacket.dcerpc.v5 import samr, epm, transport
3636
from impacket.spnego import SPNEGO_NegTokenInit, TypesMech
3737

38-
from impacket.examples.utils import _ldap3_kerberos_login
38+
from impacket.examples.utils import ldap3_kerberos_login
3939

4040
import ldap3
4141
import argparse
@@ -157,7 +157,7 @@ def run_ldaps(self):
157157
ldapServer = ldap3.Server(connectTo, use_ssl=True, port=self.__port, get_info=ldap3.ALL, tls=tls)
158158
if self.__doKerberos:
159159
ldapConn = ldap3.Connection(ldapServer)
160-
_ldap3_kerberos_login(ldapConn, connectTo, self.__username, self.__password, self.__domain, self.__lmhash, self.__nthash,
160+
ldap3_kerberos_login(ldapConn, connectTo, self.__username, self.__password, self.__domain, self.__lmhash, self.__nthash,
161161
self.__aesKey, kdcHost=self.__kdcHost)
162162
elif self.__hashes is not None:
163163
ldapConn = ldap3.Connection(ldapServer, user=user, password=self.__hashes, authentication=ldap3.NTLM)
@@ -172,7 +172,7 @@ def run_ldaps(self):
172172
ldapServer = ldap3.Server(connectTo, use_ssl=True, port=self.__port, get_info=ldap3.ALL, tls=tls)
173173
if self.__doKerberos:
174174
ldapConn = ldap3.Connection(ldapServer)
175-
_ldap3_kerberos_login(ldapConn, connectTo, self.__username, self.__password, self.__domain, self.__lmhash, self.__nthash,
175+
ldap3_kerberos_login(ldapConn, connectTo, self.__username, self.__password, self.__domain, self.__lmhash, self.__nthash,
176176
self.__aesKey, kdcHost=self.__kdcHost)
177177
elif self.__hashes is not None:
178178
ldapConn = ldap3.Connection(ldapServer, user=user, password=self.__hashes, authentication=ldap3.NTLM)

impacket/examples/utils.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def _get_machine_name(dc_ip, domain):
8383
s.logoff()
8484
return s.getServerName()
8585

86-
def _ldap3_kerberos_login(connection, target, user, password, domain='', lmhash='', nthash='', aesKey='', kdcHost=None, TGT=None, TGS=None, useCache=True):
86+
def ldap3_kerberos_login(connection, target, user, password, domain='', lmhash='', nthash='', aesKey='', kdcHost=None, TGT=None, TGS=None, useCache=True):
8787
from pyasn1.codec.ber import encoder, decoder
8888
from pyasn1.type.univ import noValue
8989
"""
@@ -222,7 +222,7 @@ def _init_ldap_connection(target, tls_version, args, domain, username, password,
222222
if k:
223223
ldap_session = ldap3.Connection(ldap_server)
224224
ldap_session.bind()
225-
_ldap3_kerberos_login(ldap_session, target, username, password, domain, lmhash, nthash, aesKey, kdcHost=dc_ip)
225+
ldap3_kerberos_login(ldap_session, target, username, password, domain, lmhash, nthash, aesKey, kdcHost=dc_ip)
226226
elif lmhash == '' and nthash == '':
227227
ldap_session = ldap3.Connection(ldap_server, user=user, password=password, authentication=ldap3.NTLM, auto_bind=True)
228228
else:

0 commit comments

Comments
 (0)