sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

CVE-2022-2031 tests/krb5: Add 'port' parameter to connect()

Browse Source 
This allows us to use the kpasswd port, 464.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15047
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15049
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15074

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Joseph Sutton 2022-05-24 19:21:37 +12:00 committed by Jule Anger
parent 695c662bdc
commit ae7dd875cd
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
python/samba/tests/krb5/raw_testcase.py
View File

@ -638,10 +638,11 @@ class RawKerberosTest(TestCaseInTempDir):
if self.do_hexdump:
sys.stderr.write("disconnect[%s]\n" % reason)
def _connect_tcp(self, host):
tcp_port = 88
def _connect_tcp(self, host, port=None):
if port is None:
port = 88
try:
self.a = socket.getaddrinfo(host, tcp_port, socket.AF_UNSPEC,
self.a = socket.getaddrinfo(host, port, socket.AF_UNSPEC,
socket.SOCK_STREAM, socket.SOL_TCP,
0)
self.s = socket.socket(self.a[0][0], self.a[0][1], self.a[0][2])
@ -654,9 +655,9 @@ class RawKerberosTest(TestCaseInTempDir):
self.s.close()
raise
def connect(self, host):
def connect(self, host, port=None):
self.assertNotConnected()
self._connect_tcp(host)
self._connect_tcp(host, port)
if self.do_hexdump:
sys.stderr.write("connected[%s]\n" % host)