r10656: BIG merge from trunk. Features not copied over

* \PIPE\unixinfo
* winbindd's {group,alias}membership new functions
* winbindd's lookupsids() functionality
* swat (trunk changes to be reverted as per discussion with Deryck)
(This used to be commit 939c3cb5d78e3a2236209b296aa8aba8bdce32d3)

1 files changed, 117 insertions, 150 deletions

diff --git a/source3/include/rpc_dfs.h b/source3/include/rpc_dfs.h
index 39316a5d54..7aee208c14 100644
--- a/source3/include/rpc_dfs.h
+++ b/source3/include/rpc_dfs.h
@@ -34,164 +34,131 @@
 #define DFSFLAG_ADD_VOLUME           0x00000001
 #define DFSFLAG_RESTORE_VOLUME       0x00000002
 
-typedef struct dfs_q_dfs_exist
-{
-  uint32 dummy;
-}
-DFS_Q_DFS_EXIST;
+typedef struct dfs_q_dfs_exist {
+	uint32 dummy;
+} DFS_Q_DFS_EXIST;
 
 /* status == 1 if dfs exists. */
-typedef struct dfs_r_dfs_exist
-{
+typedef struct dfs_r_dfs_exist {
 	uint32 status;          /* Not a WERROR or NTSTATUS code */
-}
-DFS_R_DFS_EXIST;
-
-typedef struct dfs_q_dfs_add
-{
-  uint32 ptr_DfsEntryPath;
-  UNISTR2 DfsEntryPath;
-  uint32 ptr_ServerName;
-  UNISTR2 ServerName;
-  uint32 ptr_ShareName;
-  UNISTR2 ShareName;
-  uint32 ptr_Comment;
-  UNISTR2 Comment;
-  uint32 Flags;
-}
-DFS_Q_DFS_ADD;
-
-typedef struct dfs_r_dfs_add
-{
-  WERROR status;
-}
-DFS_R_DFS_ADD;
+} DFS_R_DFS_EXIST;
+
+typedef struct dfs_q_dfs_add {
+	uint32 ptr_DfsEntryPath;
+	UNISTR2 DfsEntryPath;
+	uint32 ptr_ServerName;
+	UNISTR2 ServerName;
+	uint32 ptr_ShareName;
+	UNISTR2 ShareName;
+	uint32 ptr_Comment;
+	UNISTR2 Comment;
+	uint32 Flags;
+} DFS_Q_DFS_ADD;
+
+typedef struct dfs_r_dfs_add {
+	WERROR status;
+} DFS_R_DFS_ADD;
 
 /********************************************/
-typedef struct dfs_q_dfs_remove
-{
-  UNISTR2 DfsEntryPath;
-  uint32 ptr_ServerName;
-  UNISTR2 ServerName;
-  uint32 ptr_ShareName;
-  UNISTR2 ShareName;
-}
-DFS_Q_DFS_REMOVE;
-
-typedef struct dfs_r_dfs_remove
-{
-  WERROR status;
-}
-DFS_R_DFS_REMOVE;
+typedef struct dfs_q_dfs_remove {
+	UNISTR2 DfsEntryPath;
+	uint32 ptr_ServerName;
+	UNISTR2 ServerName;
+	uint32 ptr_ShareName;
+	UNISTR2 ShareName;
+} DFS_Q_DFS_REMOVE;
+
+typedef struct dfs_r_dfs_remove {
+	WERROR status;
+} DFS_R_DFS_REMOVE;
 
 /********************************************/
-typedef struct dfs_info_1
-{
-  uint32 ptr_entrypath;
-  UNISTR2 entrypath;
-}
-DFS_INFO_1;
-
-typedef struct dfs_info_2
-{
-  uint32 ptr_entrypath;
-  UNISTR2 entrypath;
-  uint32 ptr_comment;
-  UNISTR2 comment;
-  uint32 state;
-  uint32 num_storages;
-}
-DFS_INFO_2;
-
-typedef struct dfs_storage_info
-{
-  uint32 state;
-  uint32 ptr_servername;
-  UNISTR2 servername;
-  uint32 ptr_sharename;
-  UNISTR2 sharename;
-}
-DFS_STORAGE_INFO;
-
-typedef struct dfs_info_3
-{
-  uint32 ptr_entrypath;
-  UNISTR2 entrypath;
-  uint32 ptr_comment;
-  UNISTR2 comment;
-  uint32 state;
-  uint32 num_storages;
-  uint32 ptr_storages;
-  uint32 num_storage_infos;
-  DFS_STORAGE_INFO* storages;
-}
-DFS_INFO_3;
-
-typedef struct dfs_info_ctr
-{
+typedef struct dfs_info_1 {
+	uint32 ptr_entrypath;
+	UNISTR2 entrypath;
+} DFS_INFO_1;
+
+typedef struct dfs_info_2 {
+	uint32 ptr_entrypath;
+	UNISTR2 entrypath;
+	uint32 ptr_comment;
+	UNISTR2 comment;
+	uint32 state;
+	uint32 num_storages;
+} DFS_INFO_2;
+
+typedef struct dfs_storage_info {
+	uint32 state;
+	uint32 ptr_servername;
+	UNISTR2 servername;
+	uint32 ptr_sharename;
+	UNISTR2 sharename;
+} DFS_STORAGE_INFO;
+
+typedef struct dfs_info_3 {
+	uint32 ptr_entrypath;
+	UNISTR2 entrypath;
+	uint32 ptr_comment;
+	UNISTR2 comment;
+	uint32 state;
+	uint32 num_storages;
+	uint32 ptr_storages;
+	uint32 num_storage_infos;
+	DFS_STORAGE_INFO* storages;
+} DFS_INFO_3;
+
+typedef struct dfs_info_ctr {
+	uint32 switch_value;
+	uint32 num_entries;
+	uint32 ptr_dfs_ctr; /* pointer to dfs info union */
+	union {
+		DFS_INFO_1 *info1;
+		DFS_INFO_2 *info2;
+		DFS_INFO_3 *info3;
+	} dfs;
+} DFS_INFO_CTR;
+
+typedef struct dfs_q_dfs_get_info {
+	UNISTR2 uni_path;
   
-  uint32 switch_value;
-  uint32 num_entries;
-  uint32 ptr_dfs_ctr; /* pointer to dfs info union */
-  union
-  {
-    DFS_INFO_1 *info1;
-    DFS_INFO_2 *info2;
-    DFS_INFO_3 *info3;
-  } dfs;
-}
-DFS_INFO_CTR;
-
-typedef struct dfs_q_dfs_get_info
-{
-  UNISTR2 uni_path;
-  
-  uint32 ptr_server;
-  UNISTR2 uni_server;
+	uint32 ptr_server;
+	UNISTR2 uni_server;
 
-  uint32 ptr_share;
-  UNISTR2 uni_share;
+	uint32 ptr_share;
+	UNISTR2 uni_share;
   
-  uint32 level;
-}
-DFS_Q_DFS_GET_INFO;
-
-typedef struct dfs_r_dfs_get_info
-{
-  uint32 level;
-  uint32 ptr_ctr;
-  DFS_INFO_CTR ctr;
-  WERROR status;
-}
-DFS_R_DFS_GET_INFO;
-
-typedef struct dfs_q_dfs_enum
-{
-  uint32 level;
-  uint32 maxpreflen;
-  uint32 ptr_buffer;
-  uint32 level2;
-  uint32 ptr_num_entries;
-  uint32 num_entries;
-  uint32 ptr_num_entries2;
-  uint32 num_entries2;
-  ENUM_HND reshnd;
-}
-DFS_Q_DFS_ENUM;
-
-typedef struct dfs_r_dfs_enum
-{
-  DFS_INFO_CTR *ctr;
-  uint32 ptr_buffer;
-  uint32 level;
-  uint32 level2;
-  uint32 ptr_num_entries;
-  uint32 num_entries;
-  uint32 ptr_num_entries2;
-  uint32 num_entries2;
-  ENUM_HND reshnd;
-  WERROR status;
-}
-DFS_R_DFS_ENUM;
-
+	uint32 level;
+} DFS_Q_DFS_GET_INFO;
+
+typedef struct dfs_r_dfs_get_info {
+	uint32 level;
+	uint32 ptr_ctr;
+	DFS_INFO_CTR ctr;
+	WERROR status;
+} DFS_R_DFS_GET_INFO;
+
+typedef struct dfs_q_dfs_enum {
+	uint32 level;
+	uint32 maxpreflen;
+	uint32 ptr_buffer;
+	uint32 level2;
+	uint32 ptr_num_entries;
+	uint32 num_entries;
+	uint32 ptr_num_entries2;
+	uint32 num_entries2;
+	ENUM_HND reshnd;
+} DFS_Q_DFS_ENUM;
+
+typedef struct dfs_r_dfs_enum {
+	DFS_INFO_CTR *ctr;
+	uint32 ptr_buffer;
+	uint32 level;
+	uint32 level2;
+	uint32 ptr_num_entries;
+	uint32 num_entries;
+	uint32 ptr_num_entries2;
+	uint32 num_entries2;
+	ENUM_HND reshnd;
+	WERROR status;
+} DFS_R_DFS_ENUM;
 #endif