summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-11-10 21:24:09 +0000
committerJeremy Allison <jra@samba.org>2000-11-10 21:24:09 +0000
commit6cc6a4f3f36e9ee071dcb01f16ee2bd2eb7de4a0 (patch)
treecaa2a4f7e62f7c6b113d884e5fdfda82ed2fd6af
parentc1900772ce6fdedc5c380d88f3640107d52e2096 (diff)
downloadsamba-6cc6a4f3f36e9ee071dcb01f16ee2bd2eb7de4a0.tar.gz
samba-6cc6a4f3f36e9ee071dcb01f16ee2bd2eb7de4a0.tar.bz2
samba-6cc6a4f3f36e9ee071dcb01f16ee2bd2eb7de4a0.zip
rpc_parse/parse_spoolss.c: Updated comment for old version of W2K.
tdb/tdbutil.c: With varargs uint16 is cast to (int). Jeremy. (This used to be commit 98764c5df9f363780427a423ead0913f7b2a0905)
-rw-r--r--source3/rpc_parse/parse_spoolss.c3
-rw-r--r--source3/tdb/tdbutil.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index d77cd938a8..c4196b0334 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -4341,6 +4341,9 @@ BOOL spool_io_printer_driver_info_level_6(char *desc, SPOOL_PRINTER_DRIVER_INFO_
if(!prs_uint32("version", ps, depth, &il->version))
return False;
#if 0
+ /*
+ * Older build versions of W2K seem to need this. JRA.
+ */
if(!prs_uint32("dummy4", ps, depth, &il->dummy4))
return False;
#endif
diff --git a/source3/tdb/tdbutil.c b/source3/tdb/tdbutil.c
index ac7a5e2e90..92b8f9cbfb 100644
--- a/source3/tdb/tdbutil.c
+++ b/source3/tdb/tdbutil.c
@@ -140,7 +140,7 @@ size_t tdb_pack(char *buf, int bufsize, char *fmt, ...)
switch ((c = *fmt++)) {
case 'w':
len = 2;
- w = va_arg(ap, uint16);
+ w = (uint16)va_arg(ap, int);
if (bufsize >= len) {
SSVAL(buf, 0, w);
}