[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  009cf6e s3:auth: wbcAuthenticateEx gives unix times (bug #9625)
      from  cf27c2f selftest: skip smb2.ioctl tests on ntvfs

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


- Log -----------------------------------------------------------------
commit 009cf6e9ceaef91805a8a7573090d051f8f74a92
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jan 31 13:39:42 2013 +0100

    s3:auth: wbcAuthenticateEx gives unix times (bug #9625)
    
    We also need to convert last_logon, last_logoff and acct_expiry
    from unix time to nt time.
    
    Otherwise a windows member server will reject clients
    using CAP_DYNAMIC_REAUTH or smb2) with STATUS_NETWORK_SESSION_EXPIRED,
    if the logoff and kickoff time is expired.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Fri Feb  1 18:42:42 CET 2013 on sn-devel-104

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

Summary of changes:
 source3/auth/server_info.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c
index 3f4f708..d2b7d6e 100644
--- a/source3/auth/server_info.c
+++ b/source3/auth/server_info.c
@@ -568,9 +568,9 @@ struct netr_SamInfo3 *wbcAuthUserInfo_to_netr_SamInfo3(TALLOC_CTX *mem_ctx,
 	info3 = talloc_zero(mem_ctx, struct netr_SamInfo3);
 	if (!info3) return NULL;
 
-	info3->base.logon_time = info->logon_time;
-	info3->base.logoff_time = info->logoff_time;
-	info3->base.kickoff_time = info->kickoff_time;
+	unix_to_nt_time(&info3->base.logon_time, info->logon_time);
+	unix_to_nt_time(&info3->base.logoff_time, info->logoff_time);
+	unix_to_nt_time(&info3->base.kickoff_time, info->kickoff_time);
 	unix_to_nt_time(&info3->base.last_password_change, info->pass_last_set_time);
 	unix_to_nt_time(&info3->base.allow_password_change,
 			info->pass_can_change_time);


-- 
Samba Shared Repository