summaryrefslogtreecommitdiff
path: root/source3/rpc_parse
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-06-26 22:08:20 +0000
committerJeremy Allison <jra@samba.org>2000-06-26 22:08:20 +0000
commit36fd3866efa89b5a537d4cb312e6a0d77ca9b89a (patch)
treea0957704d81dcc40f6ebd537eb4a0047497e2abc /source3/rpc_parse
parent990b8e5f7fbf965e9905514ac4e96ecb4539d38e (diff)
downloadsamba-36fd3866efa89b5a537d4cb312e6a0d77ca9b89a.tar.gz
samba-36fd3866efa89b5a537d4cb312e6a0d77ca9b89a.tar.bz2
samba-36fd3866efa89b5a537d4cb312e6a0d77ca9b89a.zip
Changing drivers using the properties page works - but only if getting/setting
security descriptors is disabled (as it is in this code). If get/set sd's is enabled spooler.exe crashes on NT. I'll investigate and fix that issue next. Jeremy. (This used to be commit 8c9ed874363e6a710bc0fe521bb8c4f7ee219587)
Diffstat (limited to 'source3/rpc_parse')
-rw-r--r--source3/rpc_parse/parse_prs.c3
-rw-r--r--source3/rpc_parse/parse_spoolss.c5
2 files changed, 2 insertions, 6 deletions
diff --git a/source3/rpc_parse/parse_prs.c b/source3/rpc_parse/parse_prs.c
index b6bedac536..94a6100aa1 100644
--- a/source3/rpc_parse/parse_prs.c
+++ b/source3/rpc_parse/parse_prs.c
@@ -201,9 +201,6 @@ BOOL prs_grow(prs_struct *ps, uint32 extra_space)
if(UNMARSHALLING(ps) || !ps->is_dynamic) {
DEBUG(0,("prs_grow: Buffer overflow - unable to expand buffer by %u bytes.\n",
(unsigned int)extra_space));
- /* JRATEST */
- smb_panic("prs_grow");
- /* JRATEST */
return False;
}
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 86fee3017f..7e01a379db 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -1420,8 +1420,7 @@ static BOOL new_smb_io_relarraystr(char *desc, NEW_BUFFER *buffer, int depth, ui
if(!prs_uint16("leading zero", ps, depth, &zero))
return False;
- do
- {
+ while (p && (*p!=0)) {
while (*q!=0)
q++;
@@ -1437,7 +1436,7 @@ static BOOL new_smb_io_relarraystr(char *desc, NEW_BUFFER *buffer, int depth, ui
q++;
p=q;
- } while (*p!=0); /* end on the last leading 0 */
+ }
prs_set_offset(ps, struct_offset);