[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  1bc9530... s3-time: fix build warnings after we moved to shared time functions.
       via  9bdd3d6... s3-docs: mention -K option in pdbedit manpage.
      from  8d87c0a... s4-drs: added two more SPNs in addentry

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


- Log -----------------------------------------------------------------
commit 1bc953088f2fa2772b1aababb2f3819f5c6de536
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 8 11:03:31 2010 +0100

    s3-time: fix build warnings after we moved to shared time functions.
    
    Bjoern, please check.
    
    Guenther

commit 9bdd3d6c1b1aec536d87fb2e2d4e8495b3c88ee6
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 8 10:38:46 2010 +0100

    s3-docs: mention -K option in pdbedit manpage.
    
    Guenther

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

Summary of changes:
 docs-xml/manpages-3/pdbedit.8.xml |    1 +
 source3/lib/time.c                |   12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/pdbedit.8.xml b/docs-xml/manpages-3/pdbedit.8.xml
index 2d074d9..2be49a1 100644
--- a/docs-xml/manpages-3/pdbedit.8.xml
+++ b/docs-xml/manpages-3/pdbedit.8.xml
@@ -32,6 +32,7 @@
 		<arg choice="opt">-h homedir</arg>
 		<arg choice="opt">-i passdb-backend</arg>
 		<arg choice="opt">-I domain</arg>
+		<arg choice="opt">-K</term>
 		<arg choice="opt">-L </arg>
 		<arg choice="opt">-m</arg>
 		<arg choice="opt">-M SID|RID</arg>
diff --git a/source3/lib/time.c b/source3/lib/time.c
index 5286af3..dffc03b 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -198,17 +198,17 @@ char *current_timestring(TALLOC_CTX *ctx, bool hires)
 
 void srv_put_dos_date(char *buf,int offset,time_t unixdate)
 {
-	push_dos_date(buf, offset, unixdate, server_zone_offset);
+	push_dos_date((uint8_t *)buf, offset, unixdate, server_zone_offset);
 }
 
 void srv_put_dos_date2(char *buf,int offset, time_t unixdate)
 {
-	push_dos_date2(buf, offset, unixdate, server_zone_offset);
+	push_dos_date2((uint8_t *)buf, offset, unixdate, server_zone_offset);
 }
 
 void srv_put_dos_date3(char *buf,int offset,time_t unixdate)
 {
-	push_dos_date3(buf, offset, unixdate, server_zone_offset);
+	push_dos_date3((uint8_t *)buf, offset, unixdate, server_zone_offset);
 }
 
 void round_timespec(enum timestamp_set_resolution res, struct timespec *ts)
@@ -439,17 +439,17 @@ struct timespec interpret_long_date(const char *p)
 
 void cli_put_dos_date(struct cli_state *cli, char *buf, int offset, time_t unixdate)
 {
-	push_dos_date(buf, offset, unixdate, cli->serverzone);
+	push_dos_date((uint8_t *)buf, offset, unixdate, cli->serverzone);
 }
 
 void cli_put_dos_date2(struct cli_state *cli, char *buf, int offset, time_t unixdate)
 {
-	push_dos_date2(buf, offset, unixdate, cli->serverzone);
+	push_dos_date2((uint8_t *)buf, offset, unixdate, cli->serverzone);
 }
 
 void cli_put_dos_date3(struct cli_state *cli, char *buf, int offset, time_t unixdate)
 {
-	push_dos_date3(buf, offset, unixdate, cli->serverzone);
+	push_dos_date3((uint8_t *)buf, offset, unixdate, cli->serverzone);
 }
 
 time_t cli_make_unix_date(struct cli_state *cli, const void *date_ptr)


-- 
Samba Shared Repository