r7139: trying to reduce the number of diffs between trunk and 3.0; changing version to 3.0.20pre1

(This used to be commit 9727d05241574042dd3aa8844ae5c701d22e2da1)

1 files changed, 8 insertions, 2 deletions

diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h
index dcc0ecc554..9f35450d95 100644
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -129,17 +129,20 @@ typedef struct {
  * Buffer Headers -- use by SEC_DESC_BUF in winreg and netlogon code
  **********************************************************************/
  
+/* TODO: replace this with an encompassing buffer structure */
 typedef struct {
 	uint32 buf_max_len;
 	uint32 buf_len;
 } BUFHDR;
 
+/* this is a BUFHDR + a pointer to a buffer */
 typedef struct {
 	uint32 info_level;
 	uint32 length;		/* uint8 chars */
 	uint32 buffer;
 } BUFHDR2;
 
+/* generic buffer ?  wrapped around void*? */
 typedef struct {
 	uint32 size;
 	uint32 buffer;
@@ -152,7 +155,8 @@ typedef struct {
 
 /* buffer used by \winreg\ calls to fill in arbitrary REG_XXX values.
    It *may* look like a UNISTR2 but it is *not*.  This is not a goof
-   by the winreg developers.  It is a generic buffer */
+   by the winreg developers.  It is a generic buffer.  buffer length
+   is stored in bytes (not # of uint16's) */
 
 typedef struct {
 	uint32 buf_max_len;
@@ -215,10 +219,12 @@ typedef struct {		/* UNISTR2 - unicode string size (in
 				  should include the NULL character */
 } UNISTR2;
 
+/* i think this is the same as a BUFFER5 used in the spoolss code --jerry */
+/* not sure about how the termination matches between the uint16 buffers thought */
+
 typedef struct {		/* UNISTR3 - XXXX not sure about this structure */
 	uint32 uni_str_len;
 	UNISTR str;
-
 } UNISTR3;
 
 typedef struct {		/* Buffer wrapped around a UNISTR2 */