[SCM] Samba Shared Repository - branch master updated - 7a0e5de08d487108c604b4bab8a2c8e689808d9f

[Andrew Bartlett]

On Sat, 2008-11-01 at 23:50 -0500, Jelmer Vernooij wrote:
> commit a76adc539788337a4a3aa77f7e6ef8f4defd3141
> Author: Jelmer Vernooij <jelmer at samba.org>
> Date:   Sun Nov 2 01:03:46 2008 +0100
> 
>     Remove two debug parameters, not used anywhere.
>     
>     Andrew, I was pretty sure these could be removed but if not,
> please let
>     me know.

The purpose of this code was to allow testing of both the UDP and TCP
codepaths in the send_to_kdc code.   Otherwise, it was not possible to
easily verify that both paths operated correctly.  You are correct to
note that these were not used in the testsuite at this time. 

------------------ source4/auth/kerberos/krb5_init_context.c ------------------
index 90b542c..06db904 100644
@@ -250,14 +250,10 @@ krb5_error_code smb_krb5_send_and_recv_func(krb5_context context,
 		status = NT_STATUS_INVALID_PARAMETER;
 		switch (hi->proto) {
 		case KRB5_KRBHST_UDP:
-			if (lp_parm_bool(global_loadparm, NULL, "krb5", "udp", true)) {
-				status = socket_create(name, SOCKET_TYPE_DGRAM, &smb_krb5->sock, 0);
-			}
+			status = socket_create(name, SOCKET_TYPE_DGRAM, &smb_krb5->sock, 0);
 			break;
 		case KRB5_KRBHST_TCP:
-			if (lp_parm_bool(global_loadparm, NULL, "krb5", "tcp", true)) {
-				status = socket_create(name, SOCKET_TYPE_STREAM, &smb_krb5->sock, 0);
-			}
+			status = socket_create(name, SOCKET_TYPE_STREAM, &smb_krb5->sock, 0);
 			break;
 		case KRB5_KRBHST_HTTP:
 			talloc_free(smb_krb5);


-- 
Andrew Bartlett
http://samba.org/~abartlet/
Authentication Developer, Samba Team           http://samba.org
Samba Developer, Red Hat Inc.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : http://lists.samba.org/archive/samba-technical/attachments/20081103/f3b0c5b9/attachment.bin