diff --git a/scapy/autorun.py b/scapy/autorun.py index 1e5d4b10d26..df2794cee5b 100644 --- a/scapy/autorun.py +++ b/scapy/autorun.py @@ -84,10 +84,15 @@ def autorun_commands(_cmds, my_globals=None, verb=None): if interp.runsource(cmd): continue if sys.last_value: # An error occurred - traceback.print_exception(sys.last_type, - sys.last_value, - sys.last_traceback.tb_next, - file=sys.stdout) + traceback.print_exception( + sys.last_type, + sys.last_value, + ( + sys.last_traceback.tb_next + if sys.last_traceback is not None else None + ), + file=sys.stdout, + ) sys.last_value = None return False cmd = "" diff --git a/scapy/modules/ldaphero.py b/scapy/modules/ldaphero.py index ac739b4a5b1..cd4bd4fb658 100644 --- a/scapy/modules/ldaphero.py +++ b/scapy/modules/ldaphero.py @@ -144,6 +144,10 @@ class LDAPHero: :param HashNt: if provided, used for auth (NTLM) :param HashAes256Sha96: if provided, used for auth (Kerberos) :param HashAes128Sha96: if provided, used for auth (Kerberos) + :param use_krb5ccname: (bool) if true, the KRB5CCNAME environment variable will + be used if available. + :param use_winssp: (bool) (only works on Windows). Use implicit authentication + through WinSSP. """ def __init__(