[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3007-g738729c

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  738729cad0b88a2f453d61d38e1088003afd0a9e (commit)
      from  df138f23b920757076917553fa4bbbe413918cf7 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 738729cad0b88a2f453d61d38e1088003afd0a9e
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Sep 10 10:16:42 2008 -0700

    Fix blocker bug 5745 kerberos authentication with (lib)smbclient is broken.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/libsmb/clikrb5.c |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/clikrb5.c b/source/libsmb/clikrb5.c
index a7ca24f..66dd5f6 100644
--- a/source/libsmb/clikrb5.c
+++ b/source/libsmb/clikrb5.c
@@ -743,16 +743,21 @@ static krb5_error_code ads_krb5_mk_req(krb5_context context,
 						ccache,
 						&in_data );
 		if (retval) {
-			DEBUG( 1, ("ads_krb5_get_fwd_ticket failed (%s)\n", error_message( retval ) ) );
-			goto cleanup_creds;
-		}
+			DEBUG( 3, ("ads_krb5_get_fwd_ticket failed (%s)\n", error_message( retval ) ) );
 
-		if (retval) {
-			DEBUG( 1, ("krb5_auth_con_set_req_cksumtype failed (%s)\n",
-				error_message( retval ) ) );
-			goto cleanup_creds;
-		}
+			/*
+			 * This is not fatal. Delete the *auth_context and continue
+			 * with krb5_mk_req_extended to get a non-forwardable ticket.
+			 */
 
+			if (in_data.data) {
+				free( in_data.data );
+				in_data.data = NULL;
+				in_data.length = 0;
+			}
+			krb5_auth_con_free(context, *auth_context);
+			*auth_context = NULL;
+		}
 	}
 #endif
 


-- 
Samba Shared Repository