Makefile :

	added srvparse.o and pipesrvsvc.o

smb.h :

	mods to the Net Share Enum stuff

srvparse.c :

	Net Share Enum parsing support.  more srvsvc pipe parsing to go here...

pipenetlog.c util.c:

	modified standard_sub_basic() so that you can set a global boolean
	and use a different string for the %U username substitution.

proto.h:

	the usual.
(This used to be commit 22b86b6499b2680d16cb4180a736b4e750147409)

2 files changed, 28 insertions, 9 deletions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index e0ddee8943..aee8a86d05 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -651,6 +651,9 @@ BOOL api_LsarpcTNP(int cnum,int uid, char *param,char *data,
 		     int mdrcnt,int mprcnt,
 		     char **rdata,char **rparam,
 		     int *rdata_len,int *rparam_len);
+
+/*The following definitions come from  pipesrvsvc.c  */
+
 BOOL api_srvsvcTNP(int cnum,int uid, char *param,char *data,
 		     int mdrcnt,int mprcnt,
 		     char **rdata,char **rparam,
@@ -884,6 +887,12 @@ struct smb_passwd *get_smbpwnam(char *name);
 /*The following definitions come from  smbrun.c  */
 
 
+/*The following definitions come from  srvparse.c  */
+
+char* srv_io_q_net_share_enum(BOOL io, SRV_Q_NET_SHARE_ENUM *q_n, char *q, char *base, int align, int depth);
+char* srv_io_r_net_share_enum(BOOL io, SRV_R_NET_SHARE_ENUM *r_n, char *q, char *base, int align, int depth);
+char* srv_io_q_net_share_enum(BOOL io, SRV_Q_NET_SHARE_ENUM *q_n, char *q, char *base, int align, int depth);
+
 /*The following definitions come from  status.c  */
 
 void Ucrit_addUsername(pstring username);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index facb059f36..d847c6f342 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -565,6 +565,7 @@ typedef struct lsa_r_query_info
     {
         DOM_QUERY_3 id3;
 		DOM_QUERY_5 id5;
+
     } dom;
 
   uint32 status; /* return code */
@@ -840,17 +841,17 @@ typedef struct lsa_r_sam_logoff_info
 /* SH_INFO_1 (pointers to level 1 share info strings) */
 typedef struct ptr_share_info1
 {
-	uint32 ptr_shi1_netname; /* pointer to net name. */
-	uint32 shi1_type;        /* type of share.  0 - undocumented. */
-	uint32 ptr_shi1_remark;  /* pointer to comment. */
+	uint32 ptr_netname; /* pointer to net name. */
+	uint32 type;        /* type of share.  0 - undocumented. */
+	uint32 ptr_remark;  /* pointer to comment. */
 
 } SH_INFO_1;
 
 /* SH_INFO_1_STR (level 1 share info strings) */
 typedef struct str_share_info1
 {
-	UNISTR2 uni_shi1_netname; /* unicode string of net name */
-	UNISTR2 uni_shi1_remark;  /* unicode string of comment. */
+	UNISTR2 uni_netname; /* unicode string of net name */
+	UNISTR2 uni_remark;  /* unicode string of comment. */
 
 } SH_INFO_1_STR;
 
@@ -879,8 +880,13 @@ typedef struct q_net_share_enum_info
 	uint32 share_level;          /* share level */
 	uint32 switch_value;         /* switch value */
 
-	uint32* ptr_share_info;      /* pointer to SHARE_INFO_1_CTR */
-	SHARE_INFO_1_CTR share_info; /* share info with 0 entries */
+	uint32 ptr_share_info;       /* pointer to SHARE_INFO_1_CTR */
+
+	union
+    {
+		SHARE_INFO_1_CTR info1; /* share info with 0 entries */
+
+    } share;
 
 	uint32 preferred_len;        /* preferred maximum length (0xffff ffff) */
 
@@ -893,8 +899,12 @@ typedef struct r_net_share_enum_info
 	uint32 share_level;          /* share level */
 	uint32 switch_value;         /* switch value */
 
-	uint32* ptr_share_info;      /* pointer to SHARE_INFO_1_CTR */
-	SHARE_INFO_1_CTR share_info; /* share info with 0 entries */
+	uint32 ptr_share_info;       /* pointer to SHARE_INFO_1_CTR */
+	union
+    {
+		SHARE_INFO_1_CTR info1; /* share info container */
+
+    } share;
 
 	uint32 status;               /* return status */