[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  079baa7 s3: use fine grained time in netprot response
      from  6598298 s4/heimdal_build: use GetTimeOfDay macro instead of gettimeofday

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


- Log -----------------------------------------------------------------
commit 079baa76884a90740051f8dd0408eea4404adce8
Author: Björn Jacke <bj at sernet.de>
Date:   Wed May 12 10:50:17 2010 +0200

    s3: use fine grained time in netprot response

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

Summary of changes:
 source3/smbd/negprot.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index 2908c26..463e1c8 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -267,7 +267,7 @@ static void reply_nt1(struct smb_request *req, uint16 choice)
 	int secword=0;
 	char *p, *q;
 	bool negotiate_spnego = False;
-	time_t t = time(NULL);
+	struct timespec ts;
 	ssize_t ret;
 	struct smbd_server_connection *sconn = req->sconn;
 
@@ -359,8 +359,9 @@ static void reply_nt1(struct smb_request *req, uint16 choice)
 	SIVAL(req->outbuf,smb_vwv5+1,0x10000); /* raw size. full 64k */
 	SIVAL(req->outbuf,smb_vwv7+1,sys_getpid()); /* session key */
 	SIVAL(req->outbuf,smb_vwv9+1,capabilities); /* capabilities */
-	put_long_date((char *)req->outbuf+smb_vwv11+1,t);
-	SSVALS(req->outbuf,smb_vwv15+1,set_server_zone_offset(t)/60);
+	clock_gettime(CLOCK_REALTIME,&ts);
+	put_long_date_timespec(TIMESTAMP_SET_NT_OR_BETTER,(char *)req->outbuf+smb_vwv11+1,ts);
+	SSVALS(req->outbuf,smb_vwv15+1,set_server_zone_offset(ts.tv_sec)/60);
 	
 	p = q = smb_buf(req->outbuf);
 	if (!negotiate_spnego) {


-- 
Samba Shared Repository