[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  cd56e40 s3/printing: avoid a possible race condition in the cache timeout
      from  447d968 Fix all sid_parse returns to be checked. Tidy up some checks and error messages.

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


- Log -----------------------------------------------------------------
commit cd56e40117c542fd90362abe8130f7f8d8ee02e3
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Sep 16 00:57:39 2010 +0200

    s3/printing: avoid a possible race condition in the cache timeout

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

Summary of changes:
 source3/printing/printer_list.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/printing/printer_list.c b/source3/printing/printer_list.c
index d02ab88..f52dfcf 100644
--- a/source3/printing/printer_list.c
+++ b/source3/printing/printer_list.c
@@ -218,7 +218,6 @@ done:
 bool printer_list_need_refresh(void)
 {
 	NTSTATUS status;
-	time_t now = time_mono(NULL);
 	time_t last_refresh;
 	int timediff;
 
@@ -226,7 +225,7 @@ bool printer_list_need_refresh(void)
 	if (!NT_STATUS_IS_OK(status)) {
 		return true;
 	}
-	timediff = now - last_refresh;
+	timediff = time_mono(NULL) - last_refresh;
 
 	if (timediff > 1 ) {
 		/* if refresh occurred more than 1s (TODO:use lp_printcap_cache_time) ago,


-- 
Samba Shared Repository