summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-09-08 02:13:38 +0000
committerTim Potter <tpot@samba.org>2003-09-08 02:13:38 +0000
commitb42500299cf0ead3a9cc42ac02c18cab2fdbd1f9 (patch)
tree6be674944bb9934e61031dc607cf598728867371
parent5660c449efd83231b9b965a24663ecc7aafa25e9 (diff)
downloadsamba-b42500299cf0ead3a9cc42ac02c18cab2fdbd1f9.tar.gz
samba-b42500299cf0ead3a9cc42ac02c18cab2fdbd1f9.tar.bz2
samba-b42500299cf0ead3a9cc42ac02c18cab2fdbd1f9.zip
Fix for bug #334. We don't unmarshall the trusted domain or secrets
info delta correctly and thus crash when doing a net rpc samdump. The easiest thing at the moment it to comment out these functions as they seriously don't correspond with reality (netmon/ethereal) and the data in the containers aren't used anyway. (This used to be commit 695aa39c5d798b112f0a06281b499fcac8a5bf31)
-rw-r--r--source3/rpc_parse/parse_net.c20
1 files changed, 14 insertions, 6 deletions
diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c
index 252e690723..dd319df5a0 100644
--- a/source3/rpc_parse/parse_net.c
+++ b/source3/rpc_parse/parse_net.c
@@ -2447,6 +2447,10 @@ static BOOL net_io_sam_policy_info(const char *desc, SAM_DELTA_POLICY *info,
return True;
}
+#if 0
+
+/* This function is pretty broken - see bug #334 */
+
/*******************************************************************
reads or writes a structure.
********************************************************************/
@@ -2495,6 +2499,12 @@ static BOOL net_io_sam_trustdoms_info(const char *desc, SAM_DELTA_TRUSTDOMS *inf
return True;
}
+#endif
+
+#if 0
+
+/* This function doesn't work - see bug #334 */
+
/*******************************************************************
reads or writes a structure.
********************************************************************/
@@ -2582,6 +2592,8 @@ static BOOL net_io_sam_secret_info(const char *desc, SAM_DELTA_SECRET *info,
return True;
}
+#endif
+
/*******************************************************************
reads or writes a structure.
********************************************************************/
@@ -2726,14 +2738,10 @@ static BOOL net_io_sam_delta_ctr(const char *desc, uint8 sess_key[16],
return False;
break;
- case SAM_DELTA_TRUST_DOMS:
- if (!net_io_sam_trustdoms_info("", &delta->trustdoms_info, ps, depth))
- return False;
- break;
+ /* These guys are implemented but broken */
+ case SAM_DELTA_TRUST_DOMS:
case SAM_DELTA_SECRET_INFO:
- if (!net_io_sam_secret_info("", &delta->secret_info, ps, depth))
- return False;
break;
/* These guys are not implemented yet */