summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-François Micouleau <jfm@samba.org>2000-07-12 16:11:33 +0000
committerJean-François Micouleau <jfm@samba.org>2000-07-12 16:11:33 +0000
commit6c2242eadee7b9e69d3a868426807e525a4f5b0e (patch)
treef6ede9d5a6d8aae874162acaa924330f4e011c22
parent5813ecff99431c3529cd45f3b579ef16e72a46f0 (diff)
downloadsamba-6c2242eadee7b9e69d3a868426807e525a4f5b0e.tar.gz
samba-6c2242eadee7b9e69d3a868426807e525a4f5b0e.tar.bz2
samba-6c2242eadee7b9e69d3a868426807e525a4f5b0e.zip
we are now sure the printer_info_2 timestamp is updated everytime
required. J.F. (This used to be commit 08b41bab177affac088c981d7c620728e8e6e9b0)
-rw-r--r--source3/printing/nt_printing.c5
-rw-r--r--source3/rpc_parse/parse_spoolss.c5
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 4e250d43c0..23764f81b5 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -611,6 +611,8 @@ static uint32 add_a_printer_2(NT_PRINTER_INFO_LEVEL_2 *info)
char *buf;
int buflen, len, ret;
TDB_DATA kbuf, dbuf;
+ NTTIME time_nt;
+ time_t time_unix;
/*
* in addprinter: no servername and the printer is the name
@@ -637,6 +639,9 @@ static uint32 add_a_printer_2(NT_PRINTER_INFO_LEVEL_2 *info)
* behind a SAMBA share.
*/
+ unix_to_nt_time(&time_nt, time_unix);
+ info->changeid=time_nt.low;
+ info->c_setprinter++;
buf = NULL;
buflen = 0;
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 74a93b5776..c0c6e36ae1 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -4162,7 +4162,6 @@ BOOL uni_2_asc_printer_info_2(const SPOOL_PRINTER_INFO_LEVEL_2 *uni,
NT_PRINTER_INFO_LEVEL_2 **asc)
{
NT_PRINTER_INFO_LEVEL_2 *d;
- NTTIME time_nt;
time_t time_unix;
DEBUG(7,("Converting from UNICODE to ASCII\n"));
@@ -4194,10 +4193,6 @@ BOOL uni_2_asc_printer_info_2(const SPOOL_PRINTER_INFO_LEVEL_2 *uni,
d->untiltime=uni->untiltime;
d->status=uni->status;
d->cjobs=uni->cjobs;
-
- unix_to_nt_time(&time_nt, time_unix);
- d->changeid=time_nt.low;
- d->c_setprinter++;
unistr2_to_ascii(d->servername, &uni->servername, sizeof(d->servername)-1);
unistr2_to_ascii(d->printername, &uni->printername, sizeof(d->printername)-1);