summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-02-21 00:55:01 +0000
committerGerald Carter <jerry@samba.org>2002-02-21 00:55:01 +0000
commit84b18178a99b4eeb081f09ce4bd09428ad57b5a2 (patch)
tree1a051170c5498a9dd38cfccb9abaa333f3f2143b
parentcef4f9215f752243d1c429e3b056344af3fe50f8 (diff)
downloadsamba-84b18178a99b4eeb081f09ce4bd09428ad57b5a2.tar.gz
samba-84b18178a99b4eeb081f09ce4bd09428ad57b5a2.tar.bz2
samba-84b18178a99b4eeb081f09ce4bd09428ad57b5a2.zip
merge from 2.2
(This used to be commit 63ab947fd9dd17a4c370402e74b389458bbd3a60)
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 86efc2fb94..b2de688b74 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -7280,6 +7280,10 @@ WERROR _spoolss_enumprinterdataex(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATAEX *q_
enum_values[num_entries].value_len = (strlen(value)+1) * 2;
enum_values[num_entries].type = type;
+#if 0 /* JERRY - I think think was a bad assumption based on bad
+ offset values when I first implemented it. Commented out.
+ We should not be adding an extra NULL to the end of a string
+ just send what the client set in the first place. */
/*
* NULL terminate REG_SZ
* FIXME!!! We should not be correctly problems in the way
@@ -7295,6 +7299,7 @@ WERROR _spoolss_enumprinterdataex(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATAEX *q_
else
add_len = data_len % 2;
}
+#endif
if (!(enum_values[num_entries].data=talloc_zero(p->mem_ctx, data_len+add_len))) {
DEBUG(0,("talloc_realloc failed to allocate more memory for data!\n"));