svn commit: samba r10985 - in branches/SAMBA_4_0/source/auth/kerberos: .

abartlet at samba.org abartlet at samba.org
Fri Oct 14 06:06:18 GMT 2005


Author: abartlet
Date: 2005-10-14 06:06:18 +0000 (Fri, 14 Oct 2005)
New Revision: 10985

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10985

Log:
To aid in testing, this allows us to easily force kerberos to use UDP or TCP.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c	2005-10-14 05:52:03 UTC (rev 10984)
+++ branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c	2005-10-14 06:06:18 UTC (rev 10985)
@@ -187,7 +187,7 @@
 				  void *private)
 {
 	struct smb_krb5_socket *smb_krb5 = talloc_get_type(private, struct smb_krb5_socket);
-	DEBUG(2,("Timed out smb_krb5 packet\n"));
+	DEBUG(5,("Timed out smb_krb5 packet\n"));
 	smb_krb5->timeout = True;
 }
 
@@ -273,11 +273,15 @@
 		status = NT_STATUS_INVALID_PARAMETER;
 		switch (hi->proto) {
 		case KRB5_KRBHST_UDP:
-			status = socket_create(name, SOCKET_TYPE_DGRAM, &smb_krb5->sock, 0);
-			break;
+			if (lp_parm_bool(-1, "krb5", "udp", True)) {
+				status = socket_create(name, SOCKET_TYPE_DGRAM, &smb_krb5->sock, 0);
+				break;
+			}
 		case KRB5_KRBHST_TCP:
-			status = socket_create(name, SOCKET_TYPE_STREAM, &smb_krb5->sock, 0);
-			break;
+			if (lp_parm_bool(-1, "krb5", "tcp", True)) {
+				status = socket_create(name, SOCKET_TYPE_STREAM, &smb_krb5->sock, 0);
+				break;
+			}
 		case KRB5_KRBHST_HTTP:
 			talloc_free(smb_krb5);
 			return EINVAL;



More information about the samba-cvs mailing list