[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  668e28b... s3: Unify DEBUG_KRB5_TKT_REGAIN and DEBUG_KRB5_TKT_RENEWAL
       via  ef0adbff.. s3: Fix a typo
       via  685b462... s3: Fix the code order in append_auth_data
      from  44e7ea6... s4:credentials Make the CCACHE in credentials depend on the things that built it

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 668e28b80e47876bf32ac49abcb1e8f5e0c2cef0
Author: Volker Lendecke <vl at samba.org>
Date:   Sat May 1 14:51:15 2010 +0200

    s3: Unify DEBUG_KRB5_TKT_REGAIN and DEBUG_KRB5_TKT_RENEWAL
    
    I don't think it makes sense to #ifdef this one case separately.
    
    Metze, Bo Yang, please check!

commit ef0adbff93d0fd2aa05bd73da8774db47903c74d
Author: Volker Lendecke <vl at samba.org>
Date:   Sat May 1 14:39:01 2010 +0200

    s3: Fix a typo

commit 685b4625bcbae46b332a8c3dbb02d59812084519
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Apr 25 15:36:02 2010 +0200

    s3: Fix the code order in append_auth_data
    
    This is to comply with the comment
    
    "currently, anything from here on potentially overwrites extra_data."
    
    Günther, please check!

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

Summary of changes:
 source3/winbindd/winbindd_cred_cache.c |    4 ++--
 source3/winbindd/winbindd_pam.c        |   14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cred_cache.c b/source3/winbindd/winbindd_cred_cache.c
index 25f14f4..9201372 100644
--- a/source3/winbindd/winbindd_cred_cache.c
+++ b/source3/winbindd/winbindd_cred_cache.c
@@ -269,7 +269,7 @@ done:
 	 * but try to regain ticket if it is possible */
 	if (entry->renew_until && expire_time
 	     && (entry->renew_until <= expire_time)) {
-		/* try to regain ticket 10 seconds beforre expiration */
+		/* try to regain ticket 10 seconds before expiration */
 		expire_time -= 10;
 		add_krb5_ticket_gain_handler_event(entry,
 					timeval_set(expire_time, 0));
@@ -359,7 +359,7 @@ static void krb5_ticket_gain_handler(struct event_context *event_ctx,
 
   retry_later:
  
-#if defined(DEBUG_KRB5_TKT_REGAIN)
+#if defined(DEBUG_KRB5_TKT_RENEWAL)
  	t = timeval_set(time(NULL) + 30, 0);
 #else
 	t = timeval_current_ofs(MAX(30, lp_winbind_cache_time()), 0);
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index aea2a2a..b062fd1 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -757,10 +757,11 @@ static NTSTATUS append_auth_data(struct winbindd_cli_state *state,
 		       /* 8 */);
 	}
 
-	if (flags & WBFLAG_PAM_INFO3_TEXT) {
-		result = append_info3_as_txt(state->mem_ctx, state, info3);
+	if (flags & WBFLAG_PAM_UNIX_NAME) {
+		result = append_unix_username(state->mem_ctx, state, info3,
+					      name_domain, name_user);
 		if (!NT_STATUS_IS_OK(result)) {
-			DEBUG(10,("Failed to append INFO3 (TXT): %s\n",
+			DEBUG(10,("Failed to append Unix Username: %s\n",
 				nt_errstr(result)));
 			return result;
 		}
@@ -777,11 +778,10 @@ static NTSTATUS append_auth_data(struct winbindd_cli_state *state,
 		}
 	}
 
-	if (flags & WBFLAG_PAM_UNIX_NAME) {
-		result = append_unix_username(state->mem_ctx, state, info3,
-					      name_domain, name_user);
+	if (flags & WBFLAG_PAM_INFO3_TEXT) {
+		result = append_info3_as_txt(state->mem_ctx, state, info3);
 		if (!NT_STATUS_IS_OK(result)) {
-			DEBUG(10,("Failed to append Unix Username: %s\n",
+			DEBUG(10,("Failed to append INFO3 (TXT): %s\n",
 				nt_errstr(result)));
 			return result;
 		}


-- 
Samba Shared Repository