[SCM] Samba Shared Repository - branch v3-5-test updated

Björn Jacke bjacke at samba.org
Fri Nov 13 18:12:44 MST 2009


The branch, v3-5-test has been updated
       via  327e137... pam_winbind: fix a printf type mismatch warning
       via  8549fee... s3/pam: move variable declaration into belonging ifdef section
      from  1ace5f9... s3: Convert libsmb/cli_message to the async API (cherry picked from commit 2b759339601ad853588cb74e986a7a88301aea17)

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


- Log -----------------------------------------------------------------
commit 327e1377c96403e8a83b127470ae8464bf50347d
Author: Björn Jacke <bj at sernet.de>
Date:   Sat Nov 14 01:52:49 2009 +0100

    pam_winbind: fix a printf type mismatch warning

commit 8549feed3f343c3280173335f240b4e7be12328f
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Nov 13 23:32:04 2009 +0100

    s3/pam: move variable declaration into belonging ifdef section
    
    This fixes a unused variable 'addr' warning on some platforms

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

Summary of changes:
 nsswitch/pam_winbind.c |    4 ++--
 source3/auth/pampass.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 7694251..be9468c 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -1758,11 +1758,11 @@ static int winbind_auth_request(struct pwb_context *ctx,
 				       "Password has expired "
 				       "(Password was last set: %lld, "
 				       "the policy says it should expire here "
-				       "%lld (now it's: %lu))\n",
+				       "%lld (now it's: %ld))\n",
 				       (long long int)last_set,
 				       (long long int)last_set +
 				       policy->expire,
-				       time(NULL));
+				       (long)time(NULL));
 
 			return PAM_AUTHTOK_EXPIRED;
 		}
diff --git a/source3/auth/pampass.c b/source3/auth/pampass.c
index 4eec269..e08670f 100644
--- a/source3/auth/pampass.c
+++ b/source3/auth/pampass.c
@@ -464,8 +464,8 @@ static bool smb_pam_start(pam_handle_t **pamh, const char *user, const char *rho
 	int pam_error;
 #ifdef PAM_RHOST
 	const char *our_rhost;
-#endif
 	char addr[INET6_ADDRSTRLEN];
+#endif
 
 	*pamh = (pam_handle_t *)NULL;
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list