mirror of
https://github.com/samba-team/samba.git
synced 2025-11-22 16:23:49 +03:00
r6014: rather large change set....
pulling back all recent rpc changes from trunk into 3.0. I've tested a compile and so don't think I've missed any files. But if so, just mail me and I'll clean backup in a couple of hours. Changes include \winreg, \eventlog, \svcctl, and general parse_misc.c updates. I am planning on bracketing the event code with an #ifdef ENABLE_EVENTLOG until I finish merging Marcin's changes (very soon).
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
51beba71d4
commit
4e0ac63c36
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
Unix SMB/CIFS implementation.
|
||||
SMB parameters and setup
|
||||
|
||||
Copyright (C) Andrew Tridgell 1992-1997
|
||||
Copyright (C) Luke Kenneth Casson Leighton 1996-1997
|
||||
Copyright (C) Paul Ashton 1997
|
||||
@@ -28,6 +28,9 @@
|
||||
|
||||
#define SMB_RPC_INTERFACE_VERSION 1
|
||||
|
||||
#define PRS_POINTER_CAST BOOL (*)(const char*, prs_struct*, int, void*)
|
||||
|
||||
|
||||
/* well-known RIDs - Relative IDs */
|
||||
|
||||
/* RIDs - Well-known users ... */
|
||||
@@ -88,12 +91,6 @@ typedef struct enum_hnd_info
|
||||
uint32 handle; /* enumeration handle */
|
||||
} ENUM_HND;
|
||||
|
||||
/* LOOKUP_LEVEL - switch value */
|
||||
typedef struct lookup_level_info
|
||||
{
|
||||
uint16 value;
|
||||
} LOOKUP_LEVEL;
|
||||
|
||||
/* DOM_SID2 - security id */
|
||||
typedef struct sid_info_2
|
||||
{
|
||||
@@ -138,17 +135,25 @@ typedef struct bufhdr_info
|
||||
uint32 buf_len;
|
||||
} BUFHDR;
|
||||
|
||||
/* BUFFER2 - unicode string, size (in uint8 ascii chars) and buffer */
|
||||
/* pathetic. some stupid team of \PIPE\winreg writers got the concept */
|
||||
/* of a unicode string different from the other \PIPE\ writers */
|
||||
typedef struct buffer2_info
|
||||
{
|
||||
/*
|
||||
OLD COMMENT:
|
||||
BUFFER2 - unicode string, size (in uint8 ascii chars) and buffer
|
||||
pathetic. some stupid team of \PIPE\winreg writers got the concept
|
||||
of a unicode string different from the other \PIPE\ writers
|
||||
|
||||
NEW COMMENT:
|
||||
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
|
||||
*/
|
||||
|
||||
typedef struct {
|
||||
uint32 buf_max_len;
|
||||
uint32 offset;
|
||||
uint32 buf_len;
|
||||
/* unicode characters. ***MUST*** be little-endian. **NOT** necessarily null-terminated */
|
||||
uint16 *buffer;
|
||||
} BUFFER2;
|
||||
} REGVAL_BUFFER;
|
||||
|
||||
/* BUFFER3 */
|
||||
typedef struct buffer3_info
|
||||
@@ -177,6 +182,13 @@ typedef struct unistr2_info
|
||||
uint16 *buffer;
|
||||
} UNISTR2;
|
||||
|
||||
/* UNIHDR + UNISTR2* */
|
||||
typedef struct {
|
||||
uint16 length; /* number of bytes not counting NULL terminatation */
|
||||
uint16 size; /* number of bytes including NULL terminatation */
|
||||
UNISTR2 *string;
|
||||
} UNISTR4;
|
||||
|
||||
/* STRING2 - string size (in uint8 chars) and buffer */
|
||||
typedef struct string2_info
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user