[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28-21-gdc80d52

[Jeremy Allison]

The branch, v3-0-test has been updated
       via  dc80d5264949da4e9c91035851a6f8c19e546ed2 (commit)
       via  f652ce4ab63ba24b298142099efd751d270d1e07 (commit)
      from  821de8a047eea10fefb0851792a9e4633c16d871 (commit)

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


- Log -----------------------------------------------------------------
commit dc80d5264949da4e9c91035851a6f8c19e546ed2
Merge: f652ce4ab63ba24b298142099efd751d270d1e07 821de8a047eea10fefb0851792a9e4633c16d871
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Dec 12 09:49:26 2007 -0800

    Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test

commit f652ce4ab63ba24b298142099efd751d270d1e07
Author: Guenther Deschner <gd at samba.org>
Date:   Wed Dec 12 13:38:28 2007 +0100

    Vista SP1-rc1 appears to break against Samba-3.0.27a
    
    -----BEGIN PGP SIGNED MESSAGE-----
    Hash: SHA1
    
    Hi Jason,
    
    Jason Haar wrote:
    > Patched 3.0.28, compiled, installed and here's the log file.
    >
    > Hope it helps. BTW I don't think it matters, but this is on 32bit
    > CentOS4.5 systems.
    
    yes, it helps. Thanks for that.
    
    Very interesting, there are two auth data structures where the first one
    is a PAC and the second something unknown (yet).
    
    Can you please try the attached fix ? It should make it work again.
    
    Guenther
    - --
    Günther Deschner                    GPG-ID: 8EE11688
    Red Hat                         gdeschner at redhat.com
    Samba Team                              gd at samba.org
    -----BEGIN PGP SIGNATURE-----
    Version: GnuPG v1.4.7 (GNU/Linux)
    Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
    
    iD8DBQFHX9ZESOk3aI7hFogRAivSAJ9bMcD+PcsIzjYYLtAUoLNfVVEl1QCfV/Qd
    MPsZW4G31VOVu64SPjgnJiI=
    =Co+H
    -----END PGP SIGNATURE-----

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

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


Changeset truncated at 500 lines:

diff --git a/source/libsmb/clikrb5.c b/source/libsmb/clikrb5.c
index 6337b50..a4aeba8 100644
--- a/source/libsmb/clikrb5.c
+++ b/source/libsmb/clikrb5.c
@@ -363,9 +363,9 @@ BOOL unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_
 			/* check if it is a PAC */
 			got_auth_data_pac = unwrap_pac(mem_ctx, &auth_data_wrapped, auth_data);
 			data_blob_free(&auth_data_wrapped);
-			
-			if (!got_auth_data_pac) {
-				continue;
+
+			if (got_auth_data_pac) {
+				return true;
 			}
 		}
 


-- 
Samba Shared Repository