Author: abartlet
Date: 2007-05-21 11:57:56 +0000 (Mon, 21 May 2007)
New Revision: 23034

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

Log:
Thanks to metze for providing some vital clues in the 'kerberos ccache
on credentials don't do anything' bug.

The problem was simple, we didn't set the ccache as having been
initialised, so we always created a new one.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c
===================================================================
--- branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c       
2007-05-21 09:15:27 UTC (rev 23033)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c       
2007-05-21 11:57:56 UTC (rev 23034)
@@ -247,6 +247,9 @@
                *_ccc = ccc;
        }
 
+       cred->ccache_obtained = (MAX(MAX(cred->principal_obtained, 
+                                        cred->username_obtained), 
+                                    cred->password_obtained));
        return ret;
 }
 
@@ -259,8 +262,9 @@
                cli_credentials_set_machine_account(cred);
        }
 
-       if (cred->ccache_obtained >= (MAX(cred->principal_obtained, 
-                                         cred->username_obtained))) {
+       if (cred->ccache_obtained >=(MAX(MAX(cred->principal_obtained, 
+                                            cred->username_obtained), 
+                                        cred->password_obtained))) {
                *ccc = cred->ccache;
                return 0;
        }

Reply via email to