From 0f75bfc2ecc219884dcb37d7110a33cb19839a2c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 17 May 2000 02:16:44 +0000 Subject: minor parse updates (This used to be commit 2e0a39204ade323c52847ce9783a987a81c8013a) --- source3/aparser/parser.c | 4 ++-- source3/aparser/spool.struct | 1 - source3/aparser/srvsvc.struct | 10 +++++----- 3 files changed, 7 insertions(+), 8 deletions(-) (limited to 'source3/aparser') diff --git a/source3/aparser/parser.c b/source3/aparser/parser.c index d55a5eb7d3..bcd317b57e 100644 --- a/source3/aparser/parser.c +++ b/source3/aparser/parser.c @@ -311,9 +311,9 @@ BOOL io_pointer(char *desc, prs_struct *ps, int depth, void **p, unsigned flags) if (!(flags & PARSE_SCALARS)) return True; - v = (*p) ? 1 : 0; + v = (*p) ? 0xdeadbeef : 0; if (!io_uint32(desc, ps, depth, &v, flags)) return False; - *p = (void *) (v ? 1 : 0); + *p = (void *) (v ? 0xdeadbeef : 0); return True; } diff --git a/source3/aparser/spool.struct b/source3/aparser/spool.struct index 77f3226b5b..29bd9bc55f 100644 --- a/source3/aparser/spool.struct +++ b/source3/aparser/spool.struct @@ -1,5 +1,4 @@ module spool -test PRINTER_DRIVER_INFO_LEVEL_6 struct BUFFER5 { uint32 buf_len; diff --git a/source3/aparser/srvsvc.struct b/source3/aparser/srvsvc.struct index 3ba36836ad..e50fe11a82 100644 --- a/source3/aparser/srvsvc.struct +++ b/source3/aparser/srvsvc.struct @@ -41,7 +41,9 @@ struct CONN_INFO_1 { struct CONN_ENUM_CTR { uint32 level; + uint32 level2; uint32 num_entries; + uint32 num_entries2; union *info[level] { case 0 CONN_INFO_0 info0[num_entries]; case 1 CONN_INFO_1 info1[num_entries]; @@ -50,11 +52,9 @@ struct CONN_ENUM_CTR { struct SRV_R_NET_CONN_ENUM { .trailer; - uint32 level; CONN_ENUM_CTR ctr; - ENUM_HND handle; uint32 num_entries; - uint32 status; + ENUM_HND handle; uint32 status2; }; @@ -140,8 +140,8 @@ struct SRV_R_NET_SHARE_ENUM { } .trailer; uint32 count; - uint32 status1; - uint32 status2; + ENUM_HND handle; + uint32 status; }; -- cgit