[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  d7214a8 spoolss: Fix caching of printername->sharename
      from  7accec7 Update smbrun to allow for settings environment variables.

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


- Log -----------------------------------------------------------------
commit d7214a82169e777a6432347ad3dbab8013b83194
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Oct 12 11:06:51 2016 +0200

    spoolss: Fix caching of printername->sharename
    
    time_mono() gives seconds since boot, gencache expects seconds since epoch.
    With time_mono(), the values are always expired immediately.
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=12374
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    
    Autobuild-User(master): Günther Deschner <gd at samba.org>
    Autobuild-Date(master): Thu Oct 13 13:48:52 CEST 2016 on sn-devel-144

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

Summary of changes:
 source3/rpc_server/spoolss/srv_spoolss_nt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index c8ff449..9f1d44f 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -705,13 +705,13 @@ static WERROR set_printer_hnd_name(TALLOC_CTX *mem_ctx,
 
 	if (!found) {
 		gencache_set(cache_key, printer_not_found,
-			     time_mono(NULL) + 300);
+			     time(NULL) + 300);
 		TALLOC_FREE(cache_key);
 		DEBUGADD(4,("Printer not found\n"));
 		return WERR_INVALID_PRINTER_NAME;
 	}
 
-	gencache_set(cache_key, sname, time_mono(NULL) + 300);
+	gencache_set(cache_key, sname, time(NULL) + 300);
 	TALLOC_FREE(cache_key);
 
 	DEBUGADD(4,("set_printer_hnd_name: Printer found: %s -> %s\n", aprinter, sname));


-- 
Samba Shared Repository