Added the NETDFS pipe to allow remote administration of the msdfs symlinks

on the samba server.
(This used to be commit 15e7d8f6c5cddf6ce409ee2505744250d181ec34)

2 files changed, 439 insertions, 0 deletions

diff --git a/source3/rpc_parse/parse_dfs.c b/source3/rpc_parse/parse_dfs.c
new file mode 100644
index 0000000000..71e866e59a
--- /dev/null
+++ b/source3/rpc_parse/parse_dfs.c
@@ -0,0 +1,429 @@
+/* 
+ *  Unix SMB/Netbios implementation.
+ *  Version 1.9.
+ *  MSDfs RPC Pipe client / server routines
+ *  Copyright (C) Andrew Tridgell              1992-2000,
+ *  Copyright (C) Luke Kenneth Casson Leighton 1996-2000,
+ *  Copyright (C) Shirish Kalele               2000.
+ *  
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "includes.h"
+#include "nterr.h"
+#include "rpc_parse.h"   
+
+extern int DEBUGLEVEL;
+
+/*************************************************************
+ Read/write a DFS_R_DFS_EXIST structure
+ ************************************************************/
+BOOL dfs_io_r_dfs_exist(char *desc, DFS_R_DFS_EXIST *q_d, prs_struct *ps,
+			int depth)
+{
+  if(q_d == NULL) return False;
+  
+  prs_debug(ps, depth, desc, "dfs_io_r_dfs_exist");
+  depth++;
+
+  prs_align(ps);
+
+  prs_uint32("exist flag", ps, 0, &(q_d->dfs_exist_flag));
+  return True;
+}
+  
+/******************************************************************* 
+Make a DFS_Q_DFS_REMOVE structure
+*******************************************************************/
+BOOL make_dfs_q_dfs_remove(DFS_Q_DFS_REMOVE *q_d, char *entrypath, 
+			   char *servername, char *sharename)
+{
+  DEBUG(5,("make_dfs_q_dfs_remove\n"));
+  init_unistr2(&(q_d->DfsEntryPath), entrypath,  strlen(entrypath)+1);
+  init_unistr2(&(q_d->ServerName),   servername, strlen(servername)+1);
+  init_unistr2(&(q_d->ShareName),    sharename,  strlen(sharename)+1);
+  q_d->ptr_ServerName = q_d->ptr_ShareName = 1;
+  return True;
+}
+
+/******************************************************************* 
+Read/write a DFS_Q_DFS_REMOVE structure
+*******************************************************************/
+BOOL dfs_io_q_dfs_remove(char *desc, DFS_Q_DFS_REMOVE *q_d, prs_struct *ps,
+			 int depth)
+{
+  if(q_d == NULL) return False;
+
+  prs_debug(ps, depth, desc, "dfs_io_q_dfs_remove");
+  depth++;
+  
+  prs_align(ps);
+  
+  smb_io_unistr2("DfsEntryPath",&(q_d->DfsEntryPath), 1, ps, depth);
+  prs_align(ps);
+
+  prs_uint32("ptr_ServerName", ps, depth, &(q_d->ptr_ServerName));
+  if(q_d->ptr_ServerName)
+    smb_io_unistr2("ServerName",&(q_d->ServerName), q_d->ptr_ServerName,
+		   ps, depth);
+  prs_align(ps);
+
+  prs_uint32("ptr_ShareName", ps, depth, &(q_d->ptr_ShareName));
+  if(q_d->ptr_ShareName)
+    smb_io_unistr2("ShareName",&(q_d->ShareName),  q_d->ptr_ShareName, 
+		   ps, depth);
+  prs_align(ps);
+
+  return True;
+}
+
+/******************************************************************* 
+Read/write a DFS_R_DFS_REMOVE structure
+*******************************************************************/
+BOOL dfs_io_r_dfs_remove(char *desc, DFS_R_DFS_REMOVE *r_d, prs_struct *ps,
+		      int depth)
+{
+  if(r_d == NULL) return False;
+
+  prs_debug(ps, depth, desc, "dfs_io_r_dfs_remove");
+  depth++;
+
+  prs_uint32("status", ps, depth, &(r_d->status));
+
+  return True;
+}
+
+/******************************************************************* 
+Make a DFS_Q_DFS_ADD structure
+*******************************************************************/
+BOOL make_dfs_q_dfs_add(DFS_Q_DFS_ADD *q_d, char *entrypath, char *servername,
+			char *sharename, char *comment, uint32 flags)
+{
+  DEBUG(5,("make_dfs_q_dfs_add\n"));
+  q_d->ptr_DfsEntryPath = q_d->ptr_ServerName = q_d->ptr_ShareName = 1;
+  init_unistr2(&(q_d->DfsEntryPath), entrypath,  strlen(entrypath)+1);
+  init_unistr2(&(q_d->ServerName),   servername, strlen(servername)+1);
+  init_unistr2(&(q_d->ShareName),    sharename,  strlen(sharename)+1);
+  if(comment != NULL)
+    {
+      init_unistr2(&(q_d->Comment),      comment,    strlen(comment)+1);
+      q_d->ptr_Comment = 1;
+    }
+  else
+    {
+      q_d->ptr_Comment = 0;
+    }
+
+  q_d->Flags = flags;
+  return True;
+}
+
+/************************************************************
+ Read/write a DFS_Q_DFS_ADD structure
+ ************************************************************/
+BOOL dfs_io_q_dfs_add(char *desc, DFS_Q_DFS_ADD *q_d, prs_struct *ps,
+		      int depth)
+{
+  if(q_d == NULL) return False;
+
+  prs_debug(ps, depth, desc, "dfs_io_q_dfs_add");
+  depth++;
+  
+  prs_align(ps);
+  
+  smb_io_unistr2("DfsEntryPath",&(q_d->DfsEntryPath), 1, ps, depth);
+  prs_align(ps);
+
+  smb_io_unistr2("ServerName",&(q_d->ServerName), 1, ps, depth);
+  prs_align(ps);
+
+  prs_uint32("ptr_ShareName", ps, depth, &(q_d->ptr_ShareName));
+  smb_io_unistr2("ShareName",&(q_d->ShareName),  1, ps, depth);
+  prs_align(ps);
+
+  prs_uint32("ptr_Comment", ps, depth, &(q_d->ptr_Comment));
+  smb_io_unistr2("",&(q_d->Comment), q_d->ptr_Comment , ps, depth);
+  prs_align(ps);
+
+  prs_uint32("Flags", ps, depth, &(q_d->Flags));
+  return True;
+}
+
+/************************************************************
+ Read/write a DFS_R_DFS_ADD structure 
+ ************************************************************/
+BOOL dfs_io_r_dfs_add(char *desc, DFS_R_DFS_ADD *r_d, prs_struct *ps,
+		      int depth)
+{
+  if(r_d == NULL) return False;
+
+  prs_debug(ps, depth, desc, "dfs_io_r_dfs_add");
+  depth++;
+
+  prs_uint32("status", ps, depth, &(r_d->status));
+
+  return True;
+}
+
+/************************************************************
+ Read/write a DFS_Q_GET_INFO structure
+ ************************************************************/
+BOOL dfs_io_q_dfs_get_info(char* desc, DFS_Q_DFS_GET_INFO* q_i, 
+			   prs_struct* ps, int depth)
+{
+  if(q_i == NULL) return False;
+
+  prs_debug(ps, depth, desc, "dfs_io_q_dfs_get_info");
+  depth++;
+
+  smb_io_unistr2("",&(q_i->uni_path), 1, ps, depth);
+  prs_align(ps);
+
+  prs_uint32("ptr_server", ps, depth, &(q_i->ptr_server));
+  if(q_i->ptr_server)
+    smb_io_unistr2("",&(q_i->uni_server), q_i->ptr_server, ps, depth);
+  prs_align(ps);
+
+  prs_uint32("ptr_share", ps, depth, &(q_i->ptr_share));
+  if(q_i->ptr_share)
+    smb_io_unistr2("", &(q_i->uni_share), q_i->ptr_share, ps, depth);
+  prs_align(ps);
+
+  prs_uint32("level", ps, depth, &(q_i->level));
+  return True;
+}
+
+/************************************************************
+ Read/write a DFS_R_GET_INFO structure
+ ************************************************************/
+BOOL dfs_io_r_dfs_get_info(char* desc, DFS_R_DFS_GET_INFO* r_i,
+			   prs_struct* ps, int depth)
+{
+  if(r_i == NULL) return False;
+  
+  prs_uint32("level", ps, depth, &(r_i->level));
+  prs_uint32("ptr_ctr", ps, depth, &(r_i->ptr_ctr));
+
+  dfs_io_dfs_info_ctr("", &(r_i->ctr), 1, r_i->level, ps, depth);
+  prs_uint32("status", ps, depth, &(r_i->status));
+  return True;
+}
+			   
+/************************************************************
+ Make a DFS_Q_DFS_ENUM structure
+ ************************************************************/
+BOOL make_dfs_q_dfs_enum(DFS_Q_DFS_ENUM *q_d, uint32 level, DFS_INFO_CTR *ctr)
+{
+  q_d->level = level;
+  q_d->maxpreflen = -1;
+  q_d->ptr_buffer = 1;
+  q_d->level2 = level;
+  
+  q_d->ptr_num_entries = 1;
+  q_d->num_entries = 0;
+  q_d->num_entries2 = 0;
+  q_d->reshnd.ptr_hnd = 1;
+  q_d->reshnd.handle = 0;
+  return True;
+}
+  
+/************************************************************
+ Read or write the DFS_Q_DFS_ENUM structure 
+ ************************************************************/
+BOOL dfs_io_q_dfs_enum(char *desc, DFS_Q_DFS_ENUM *q_d, prs_struct *ps,
+		      int depth)
+{
+  if(q_d == NULL) return False;
+
+  prs_debug(ps, depth, desc, "dfs_io_q_dfs_enum");
+  depth++;
+  
+  prs_align(ps);
+  
+  prs_uint32("level", ps, depth, &(q_d->level));
+  prs_uint32("maxpreflen", ps, depth, &(q_d->maxpreflen));
+  prs_uint32("ptr_buffer", ps, depth, &(q_d->ptr_buffer));
+  prs_uint32("level2", ps, depth, &(q_d->level2));
+  prs_uint32("level3", ps, depth, &(q_d->level2));
+  
+  prs_uint32("ptr_num_entries", ps, depth, &(q_d->ptr_num_entries));
+  prs_uint32("num_entries", ps, depth, &(q_d->num_entries));
+  prs_uint32("num_entries2", ps, depth, &(q_d->num_entries2));
+  smb_io_enum_hnd("resume_hnd",&(q_d->reshnd), ps, depth);
+  return True;
+}
+
+/************************************************************
+ Read/write a DFS_INFO_CTR structure
+ ************************************************************/
+BOOL dfs_io_dfs_info_ctr(char* desc, DFS_INFO_CTR* ctr, uint32 num_entries,
+			 uint32 level,
+			 prs_struct* ps, int depth)
+{
+  switch(level)
+    {
+    case 1:
+      {
+	int i=0;
+	
+	depth++;
+	/* should depend on whether marshalling or unmarshalling! */
+	if(UNMARSHALLING(ps))
+	  ctr->dfs.info1 = g_new0(DFS_INFO_1, num_entries);
+
+	for(i=0;i<num_entries;i++)
+	  {
+	    prs_uint32("ptr_entrypath",ps, depth, &(ctr->dfs.info1[i].ptr_entrypath));
+	  }
+	for(i=0;i<num_entries;i++)
+	  {
+	    smb_io_unistr2("", &(ctr->dfs.info1[i].entrypath), 
+			   ctr->dfs.info1[i].ptr_entrypath,
+			   ps, depth);
+	    prs_align(ps);
+	  }
+	depth--;
+	break;
+      }
+    case 2:
+      {
+	int i=0;
+	depth++;
+	if(UNMARSHALLING(ps))
+	  ctr->dfs.info2 = g_new0(DFS_INFO_2, num_entries);
+
+	for(i=0;i<num_entries;i++)
+	  {
+	    prs_uint32("ptr_entrypath", ps, depth, 
+		       &(ctr->dfs.info2[i].ptr_entrypath));
+	    prs_uint32("ptr_comment", ps, depth, 
+		       &(ctr->dfs.info2[i].ptr_comment));
+	    prs_uint32("state", ps, depth, &(ctr->dfs.info2[i].state));
+	    prs_uint32("num_storages", ps, depth, 
+		       &(ctr->dfs.info2[i].num_storages));
+	  }
+	for(i=0;i<num_entries;i++)
+	  {
+	    smb_io_unistr2("", &(ctr->dfs.info2[i].entrypath),
+			   ctr->dfs.info2[i].ptr_entrypath, ps, depth);
+	    prs_align(ps);
+	    smb_io_unistr2("",&(ctr->dfs.info2[i].comment),
+			   ctr->dfs.info2[i].ptr_comment, ps, depth);
+	    prs_align(ps);
+	  }
+	depth--;
+	break;
+      }
+    case 3:
+      {
+	int i=0;
+	depth++;
+	if(UNMARSHALLING(ps))
+	  ctr->dfs.info3 = g_new0(DFS_INFO_3, num_entries);
+
+	for(i=0;i<num_entries;i++)
+	  {
+	    prs_uint32("ptr_entrypath", ps, depth, 
+		       &(ctr->dfs.info3[i].ptr_entrypath));
+	    prs_uint32("ptr_comment", ps, depth,
+		       &(ctr->dfs.info3[i].ptr_comment));
+	    prs_uint32("state", ps, depth, &(ctr->dfs.info3[i].state));
+	    prs_uint32("num_storages", ps, depth,
+		       &(ctr->dfs.info3[i].num_storages));
+	    prs_uint32("ptr_storages", ps, depth,
+		       &(ctr->dfs.info3[i].ptr_storages));
+	  }
+	for(i=0;i<num_entries;i++)
+	  {
+	    smb_io_unistr2("", &(ctr->dfs.info3[i].entrypath),
+			   ctr->dfs.info3[i].ptr_entrypath, ps, depth);
+	    prs_align(ps);
+	    smb_io_unistr2("", &(ctr->dfs.info3[i].comment),
+			   ctr->dfs.info3[i].ptr_comment, ps, depth);
+	    prs_align(ps);
+	    prs_uint32("num_storage_infos", ps, depth, 
+		       &(ctr->dfs.info3[i].num_storage_infos));
+	    if(!dfs_io_dfs_storage_info("storage_info",
+					&(ctr->dfs.info3[i]), 
+					ps, depth))
+	      return False;
+	  }
+      }
+    }
+  return True;
+}
+/************************************************************
+ Read/write a DFS_R_DFS_ENUM structure
+ ************************************************************/
+BOOL dfs_io_r_dfs_enum(char *desc, DFS_R_DFS_ENUM *q_d, prs_struct *ps, int depth)
+{
+  DFS_INFO_CTR *ctr;
+  if(q_d == NULL) return False;
+  ctr = q_d->ctr;
+  if(ctr == NULL) return False;
+
+  prs_debug(ps, depth, desc, "dfs_io_r_dfs_enum");
+  depth++;
+
+  prs_align(ps);
+
+  prs_uint32("ptr_buffer", ps, depth, &(q_d->ptr_buffer));
+  prs_uint32("level", ps, depth, &(q_d->level));
+  prs_uint32("level2", ps, depth, &(ctr->switch_value));
+  prs_uint32("ptr_num_entries", ps, depth, &(q_d->ptr_num_entries));
+  if(q_d->ptr_num_entries)
+    prs_uint32("num_entries", ps, depth, &(q_d->num_entries));
+  prs_uint32("ptr_num_entries2", ps, depth, &(q_d->ptr_num_entries2));
+  if(q_d->ptr_num_entries2)
+    prs_uint32("num_entries2", ps, depth, &(ctr->num_entries));
+
+  dfs_io_dfs_info_ctr("", ctr, q_d->num_entries, q_d->level, ps, depth);
+
+  smb_io_enum_hnd("resume_hnd", &(q_d->reshnd), ps, depth);
+  prs_uint32("status", ps, depth, &(q_d->status));
+  return True;
+}
+
+BOOL dfs_io_dfs_storage_info(char *desc, DFS_INFO_3* info3,
+			     prs_struct *ps, int depth)
+{
+  int i=0;
+  if(info3 == NULL) return False;
+  
+  prs_debug(ps, depth, desc, "smb_io_dfs_storage_info");
+  depth++;
+
+  if(UNMARSHALLING(ps))
+    info3->storages = g_new0(DFS_STORAGE_INFO, info3->num_storage_infos);
+
+  for(i=0;i<info3->num_storage_infos;i++)
+    {
+      prs_uint32("storage_state", ps, depth, &(info3->storages[i].state));
+      prs_uint32("ptr_servername", ps, depth, 
+		 &(info3->storages[i].ptr_servername));
+      prs_uint32("ptr_sharename", ps, depth,
+		 &(info3->storages[i].ptr_sharename));
+    }
+  for(i=0;i<info3->num_storage_infos;i++)
+    {
+      smb_io_unistr2("servername", &(info3->storages[i].servername),
+		     info3->storages[i].ptr_servername, ps, depth);
+      prs_align(ps);
+      smb_io_unistr2("sharename", &(info3->storages[i].sharename),
+		     info3->storages[i].ptr_sharename, ps, depth);
+      prs_align(ps);
+    }
+  return True;
+}
diff --git a/source3/rpc_parse/parse_rpc.c b/source3/rpc_parse/parse_rpc.c
index 8d39b6e7c0..af0569fd61 100644
--- a/source3/rpc_parse/parse_rpc.c
+++ b/source3/rpc_parse/parse_rpc.c
@@ -123,6 +123,15 @@ interface/version dce/rpc pipe identification
 	}, 0x00                             \
 }
 
+#define SYNT_NETDFS_V3                      \
+{                                           \
+        {                                   \
+                0x4fc742e0, 0x4a10, 0x11cf, \
+                { 0x82, 0x73, 0x00, 0xaa,   \
+                  0x00, 0x4a, 0xe6, 0x73 }  \
+        }, 0x03                             \
+}
+
 struct pipe_id_info pipe_names [] =
 {
 	/* client pipe , abstract syntax , server pipe   , transfer syntax */
@@ -133,6 +142,7 @@ struct pipe_id_info pipe_names [] =
 	{ PIPE_WKSSVC  , SYNT_WKSSVC_V1  , PIPE_NTSVCS   , TRANS_SYNT_V2 },
 	{ PIPE_WINREG  , SYNT_WINREG_V1  , PIPE_WINREG   , TRANS_SYNT_V2 },
 	{ PIPE_SPOOLSS , SYNT_SPOOLSS_V1 , PIPE_SPOOLSS  , TRANS_SYNT_V2 },
+	{ PIPE_NETDFS  , SYNT_NETDFS_V3  , PIPE_NETDFS   , TRANS_SYNT_V2 },
 	{ NULL         , SYNT_NONE_V0    , NULL          , SYNT_NONE_V0  }
 };