[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Sun May 9 15:34:18 MDT 2010
The branch, master has been updated
via 3c1e9a8... s3-spoolss: Make spoolss_Time_to_time_t public.
from 1cdc46a... s4:samldb LDB module - make "samldb_member_check" synchronous again
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3c1e9a8c3367733724b7e89e930f9ac0b3348fff
Author: Simo Sorce <ssorce at redhat.com>
Date: Fri May 7 09:26:41 2010 -0400
s3-spoolss: Make spoolss_Time_to_time_t public.
Signed-off-by: Günther Deschner <gd at samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/include/proto.h | 1 +
source3/rpc_client/init_spoolss.c | 15 +++++++++++++++
source3/smbd/lanman.c | 15 ---------------
3 files changed, 16 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 10c3d14..9199703 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5612,6 +5612,7 @@ WERROR rpccli_spoolss_enumprinterdataex(struct rpc_pipe_client *cli,
bool init_systemtime(struct spoolss_Time *r,
struct tm *unixtime);
+time_t spoolss_Time_to_time_t(const struct spoolss_Time *r);
WERROR pull_spoolss_PrinterData(TALLOC_CTX *mem_ctx,
const DATA_BLOB *blob,
union spoolss_PrinterData *data,
diff --git a/source3/rpc_client/init_spoolss.c b/source3/rpc_client/init_spoolss.c
index 4c105ea..8320d14 100644
--- a/source3/rpc_client/init_spoolss.c
+++ b/source3/rpc_client/init_spoolss.c
@@ -41,6 +41,21 @@ bool init_systemtime(struct spoolss_Time *r,
return true;
}
+time_t spoolss_Time_to_time_t(const struct spoolss_Time *r)
+{
+ struct tm unixtime;
+
+ unixtime.tm_year = r->year - 1900;
+ unixtime.tm_mon = r->month - 1;
+ unixtime.tm_wday = r->day_of_week;
+ unixtime.tm_mday = r->day;
+ unixtime.tm_hour = r->hour;
+ unixtime.tm_min = r->minute;
+ unixtime.tm_sec = r->second;
+
+ return mktime(&unixtime);
+}
+
/*******************************************************************
********************************************************************/
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 101fad9..6fdad2c 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -533,21 +533,6 @@ static int printq_spoolss_status(int v)
return RAP_QUEUE_STATUS_ERROR;
}
-static time_t spoolss_Time_to_time_t(const struct spoolss_Time *r)
-{
- struct tm unixtime;
-
- unixtime.tm_year = r->year - 1900;
- unixtime.tm_mon = r->month - 1;
- unixtime.tm_wday = r->day_of_week;
- unixtime.tm_mday = r->day;
- unixtime.tm_hour = r->hour;
- unixtime.tm_min = r->minute;
- unixtime.tm_sec = r->second;
-
- return mktime(&unixtime);
-}
-
static void fill_spoolss_printjob_info(int uLevel,
struct pack_desc *desc,
struct spoolss_JobInfo2 *info2,
--
Samba Shared Repository
More information about the samba-cvs
mailing list