r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need
[samba.git] / source3 / include / rpc_srvsvc.h
index d6fe7617b250a046c9f1bad2dfdbd1432c0fd3fc..31032f64a4debb2af9dfcbd364094072f09e2717 100644 (file)
@@ -1,10 +1,12 @@
 /*
-   Unix SMB/Netbios implementation.
-   Version 1.9.
+   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
+   Copyright (C) Nigel Williams 2001
+   Copyright (C) Gerald (Jerry) Carter 2006.
+
    
    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
 #ifndef _RPC_SRVSVC_H /* _RPC_SRVSVC_H */
 #define _RPC_SRVSVC_H 
 
-
 /* srvsvc pipe */
-#define SRV_NETCONNENUM        0x08
-#define SRV_NETFILEENUM        0x09
-#define SRV_NETSESSENUM        0x0c
-#define SRV_NET_SHARE_ADD      0x0e
-#define SRV_NETSHAREENUM_ALL   0x0f
-#define SRV_NET_SHARE_GET_INFO 0x10
-#define SRV_NET_SHARE_SET_INFO 0x11
-#define SRV_NET_SHARE_DEL      0x12
-#define SRV_NET_SRV_GET_INFO   0x15
-#define SRV_NET_SRV_SET_INFO   0x16
-#define SRV_NET_DISK_ENUM      0x17
-#define SRV_NET_REMOTE_TOD     0x1c
-#define SRV_NET_NAME_VALIDATE  0x21
-#define SRV_NETSHAREENUM       0x24
-#define SRV_NETFILEQUERYSECDESC 0x27
-#define SRV_NETFILESETSECDESC  0x28
+#define SRV_NET_CONN_ENUM          0x08
+#define SRV_NET_FILE_ENUM          0x09
+#define SRV_NET_FILE_CLOSE         0x0b
+#define SRV_NET_SESS_ENUM          0x0c
+#define SRV_NET_SESS_DEL           0x0d
+#define SRV_NET_SHARE_ADD          0x0e
+#define SRV_NET_SHARE_ENUM_ALL     0x0f
+#define SRV_NET_SHARE_GET_INFO     0x10
+#define SRV_NET_SHARE_SET_INFO     0x11
+#define SRV_NET_SHARE_DEL          0x12
+#define SRV_NET_SHARE_DEL_STICKY   0x13
+#define SRV_NET_SRV_GET_INFO       0x15
+#define SRV_NET_SRV_SET_INFO       0x16
+#define SRV_NET_DISK_ENUM          0x17
+#define SRV_NET_REMOTE_TOD         0x1c
+#define SRV_NET_NAME_VALIDATE      0x21
+#define SRV_NET_SHARE_ENUM         0x24
+#define SRV_NET_FILE_QUERY_SECDESC 0x27
+#define SRV_NET_FILE_SET_SECDESC   0x28
 
 #define MAX_SERVER_DISK_ENTRIES 15
 
@@ -55,7 +59,7 @@ typedef struct disk_enum_container {
        uint32 entries_read;
        uint32 unknown;
        uint32 disk_info_ptr;
-       DISK_INFO disk_info[MAX_SERVER_DISK_ENTRIES];
+       DISK_INFO *disk_info;
 } DISK_ENUM_CONTAINER;
 
 typedef struct net_srv_disk_enum {
@@ -67,127 +71,107 @@ typedef struct net_srv_disk_enum {
        uint32 preferred_len;        /* preferred maximum length (0xffff ffff) */
        uint32 total_entries;        /* total number of entries */
        ENUM_HND enum_hnd;
-       uint32 status;               /* return status */
+       WERROR status;               /* return status */
 } SRV_Q_NET_DISK_ENUM, SRV_R_NET_DISK_ENUM;
 
-typedef struct net_name_validate {
-       uint32 ptr_srv_name;
-       UNISTR2 uni_srv_name;
-       UNISTR2 uni_name; /*name to validate*/
+/***************************/
+
+typedef struct  {
+       UNISTR2 *servername;
+       UNISTR2 sharename;
        uint32 type;
        uint32 flags;
-       uint32 status;
-} SRV_Q_NET_NAME_VALIDATE, SRV_R_NET_NAME_VALIDATE;
+       WERROR status;
+} SRV_Q_NET_NAME_VALIDATE;
 
-/* SESS_INFO_0 (pointers to level 0 session info strings) */
-typedef struct ptr_sess_info0
-{
-       uint32 ptr_name; /* pointer to name. */
-
-} SESS_INFO_0;
-
-/* SESS_INFO_0_STR (level 0 session info strings) */
-typedef struct str_sess_info0
-{
-       UNISTR2 uni_name; /* unicode string of name */
+typedef struct  {
+       WERROR status;
+} SRV_R_NET_NAME_VALIDATE;
 
-} SESS_INFO_0_STR;
+/***************************/
 
 /* oops - this is going to take up a *massive* amount of stack. */
 /* the UNISTR2s already have 1024 uint16 chars in them... */
-#define MAX_SESS_ENTRIES 32
 
-/* SRV_SESS_INFO_0 */
-typedef struct srv_sess_info_0_info
-{
-       uint32 num_entries_read;                     /* EntriesRead */
-       uint32 ptr_sess_info;                       /* Buffer */
-       uint32 num_entries_read2;                    /* EntriesRead */
+#define MAX_SESS_ENTRIES 32
 
-       SESS_INFO_0     info_0    [MAX_SESS_ENTRIES]; /* session entry pointers */
-       SESS_INFO_0_STR info_0_str[MAX_SESS_ENTRIES]; /* session entry strings */
+typedef struct {
+       UNISTR2 *sharename;
+} SESS_INFO_0;
 
+typedef struct {
+       uint32 num_entries_read;
+       uint32 ptr_sess_info;
+       uint32 num_entries_read2;
+       SESS_INFO_0 info_0[MAX_SESS_ENTRIES];
 } SRV_SESS_INFO_0;
 
-/* SESS_INFO_1 (pointers to level 1 session info strings) */
-typedef struct ptr_sess_info1
-{
-       uint32 ptr_name; /* pointer to name. */
-       uint32 ptr_user; /* pointer to user name. */
-
+typedef struct {
+       UNISTR2 *sharename;
+       UNISTR2 *username;
        uint32 num_opens;
        uint32 open_time;
        uint32 idle_time;
        uint32 user_flags;
-
 } SESS_INFO_1;
 
-/* SESS_INFO_1_STR (level 1 session info strings) */
-typedef struct str_sess_info1
-{
-       UNISTR2 uni_name; /* unicode string of name */
-       UNISTR2 uni_user; /* unicode string of user */
-
-} SESS_INFO_1_STR;
-
-/* SRV_SESS_INFO_1 */
-typedef struct srv_sess_info_1_info
-{
-       uint32 num_entries_read;                     /* EntriesRead */
-       uint32 ptr_sess_info;                       /* Buffer */
-       uint32 num_entries_read2;                    /* EntriesRead */
-
-       SESS_INFO_1     info_1    [MAX_SESS_ENTRIES]; /* session entry pointers */
-       SESS_INFO_1_STR info_1_str[MAX_SESS_ENTRIES]; /* session entry strings */
-
+typedef struct {
+       uint32 num_entries_read;
+       uint32 ptr_sess_info;
+       uint32 num_entries_read2;
+       SESS_INFO_1 info_1[MAX_SESS_ENTRIES];
 } SRV_SESS_INFO_1;
 
-/* SRV_SESS_INFO_CTR */
-typedef struct srv_sess_info_ctr_info
-{
-       uint32 switch_value;         /* switch value */
-       uint32 ptr_sess_ctr;       /* pointer to sess info union */
-       union
-    {
-               SRV_SESS_INFO_0 info0; /* session info level 0 */
-               SRV_SESS_INFO_1 info1; /* session info level 1 */
-
-    } sess;
+typedef struct {
+       uint32 switch_value;
+       uint32 ptr_sess_ctr;
+       union {
+               SRV_SESS_INFO_0 info0; 
+               SRV_SESS_INFO_1 info1; 
+       } sess;
 
 } SRV_SESS_INFO_CTR;
 
-
-/* SRV_Q_NET_SESS_ENUM */
-typedef struct q_net_sess_enum_info
-{
-       uint32 ptr_srv_name;         /* pointer (to server name?) */
-       UNISTR2 uni_srv_name;        /* server name */
-
-       uint32 ptr_qual_name;         /* pointer (to qualifier name) */
-       UNISTR2 uni_qual_name;        /* qualifier name "\\qualifier" */
-
-       uint32 sess_level;          /* session level */
-
+typedef struct {
+       UNISTR2 *servername;
+       UNISTR2 *qualifier;
+       UNISTR2 *username;
+       uint32 sess_level;
        SRV_SESS_INFO_CTR *ctr;
+       uint32 preferred_len;
+       ENUM_HND enum_hnd;
+} SRV_Q_NET_SESS_ENUM;
 
-       uint32 preferred_len;        /* preferred maximum length (0xffff ffff) */
+typedef struct {
+       uint32 sess_level; 
+       SRV_SESS_INFO_CTR *ctr;
+       uint32 total_entries;
        ENUM_HND enum_hnd;
+       WERROR status;
+} SRV_R_NET_SESS_ENUM;
 
-} SRV_Q_NET_SESS_ENUM;
+/***************************/
 
-/* SRV_R_NET_SESS_ENUM */
-typedef struct r_net_sess_enum_info
+/* SRV_Q_NET_SESS_DEL */
+typedef struct q_net_sess_del
 {
-       uint32 sess_level;          /* share level */
+       uint32 ptr_srv_name;         /* pointer (to server name?) */
+       UNISTR2 uni_srv_name;        /* server name */
 
-       SRV_SESS_INFO_CTR *ctr;
+       uint32 ptr_cli_name;         /* pointer (to qualifier name) */
+       UNISTR2 uni_cli_name;        /* qualifier name "\\qualifier" */
 
-       uint32 total_entries;                    /* total number of entries */
-       ENUM_HND enum_hnd;
+       uint32 ptr_user_name;         /* pointer (to user name */
+       UNISTR2 uni_user_name;        /* user name */
 
-       uint32 status;               /* return status */
+} SRV_Q_NET_SESS_DEL;
 
-} SRV_R_NET_SESS_ENUM;
+/* SRV_R_NET_SESS_DEL */
+typedef struct r_net_sess_del
+{
+       WERROR status;               /* return status */
+
+} SRV_R_NET_SESS_DEL;
 
 /* CONN_INFO_0 (pointers to level 0 connection info strings) */
 typedef struct ptr_conn_info0
@@ -288,10 +272,33 @@ typedef struct r_net_conn_enum_info
        uint32 total_entries;                    /* total number of entries */
        ENUM_HND enum_hnd;
 
-       uint32 status;               /* return status */
+       WERROR status;               /* return status */
 
 } SRV_R_NET_CONN_ENUM;
 
+/* SH_INFO_0 */
+typedef struct ptr_share_info0
+{
+       uint32 ptr_netname; /* pointer to net name. */
+} SH_INFO_0;
+
+/* SH_INFO_0_STR (level 0 share info strings) */
+typedef struct str_share_info0
+{
+        SH_INFO_0 *ptrs;
+
+       UNISTR2 uni_netname; /* unicode string of net name */
+
+} SH_INFO_0_STR;
+
+/* SRV_SHARE_INFO_0 */
+typedef struct share_info_0_info
+{
+       SH_INFO_0 info_0;
+       SH_INFO_0_STR info_0_str;
+
+} SRV_SHARE_INFO_0;
+
 /* SH_INFO_1 (pointers to level 1 share info strings) */
 typedef struct ptr_share_info1
 {
@@ -304,6 +311,8 @@ typedef struct ptr_share_info1
 /* SH_INFO_1_STR (level 1 share info strings) */
 typedef struct str_share_info1
 {
+        SH_INFO_1 *ptrs;
+
        UNISTR2 uni_netname; /* unicode string of net name */
        UNISTR2 uni_remark; /* unicode string of comment */
 
@@ -334,6 +343,8 @@ typedef struct ptr_share_info2
 /* SH_INFO_2_STR (level 2 share info strings) */
 typedef struct str_share_info2
 {
+       SH_INFO_2 *ptrs;
+
        UNISTR2 uni_netname; /* unicode string of net name (e.g NETLOGON) */
        UNISTR2 uni_remark;  /* unicode string of comment (e.g "Logon server share") */
        UNISTR2 uni_path;    /* unicode string of local path (e.g c:\winnt\system32\repl\import\scripts) */
@@ -349,6 +360,27 @@ typedef struct share_info_2_info
 
 } SRV_SHARE_INFO_2;
 
+typedef struct ptr_share_info501
+{
+       uint32 ptr_netname; /* pointer to net name */
+       uint32 type;     /* ipc, print, disk */
+       uint32 ptr_remark;  /* pointer to comment */
+       uint32 csc_policy;  /* client-side offline caching policy << 4 */
+} SH_INFO_501;
+
+typedef struct str_share_info501
+{
+       UNISTR2 uni_netname; /* unicode string of net name */
+       UNISTR2 uni_remark;  /* unicode string of comment */
+} SH_INFO_501_STR;
+
+/* SRV_SHARE_INFO_501 */
+typedef struct share_info_501_info
+{
+       SH_INFO_501 info_501;
+       SH_INFO_501_STR info_501_str;
+} SRV_SHARE_INFO_501;
+
 /* SH_INFO_502 (pointers to level 502 share info strings) */
 typedef struct ptr_share_info502
 {
@@ -360,6 +392,8 @@ typedef struct ptr_share_info502
        uint32 num_uses;   /* current uses */
        uint32 ptr_path;   /* pointer to path name */
        uint32 ptr_passwd; /* pointer to password */
+        uint32 reserved;    /* this holds the space taken by the sd in the rpc packet */
+        uint32 reserved_offset;   /* required for _post operation when marshalling */
        uint32 sd_size;    /* size of security descriptor */
        uint32 ptr_sd;     /* pointer to security descriptor */
 
@@ -375,6 +409,7 @@ typedef struct str_share_info502
        UNISTR2 uni_path;    /* unicode string of local path (e.g c:\winnt\system32\repl\import\scripts) */
        UNISTR2 uni_passwd;  /* unicode string of password - presumably for share level security (e.g NULL) */
 
+        uint32 reserved;
        uint32 sd_size;
        SEC_DESC *sd;
 
@@ -388,12 +423,63 @@ typedef struct share_info_502_info
 
 } SRV_SHARE_INFO_502;
 
-/* SRV_SHARE_INFO_1005 */
+typedef struct ptr_share_info1004
+{
+       uint32 ptr_remark;
+
+} SH_INFO_1004;
+
+typedef struct str_share_info1004
+{
+       SH_INFO_1004 *ptrs;
+
+       UNISTR2 uni_remark;
+
+} SH_INFO_1004_STR;
+
+typedef struct ptr_info_1004_info
+{
+       SH_INFO_1004     info_1004; 
+       SH_INFO_1004_STR info_1004_str; 
+} SRV_SHARE_INFO_1004;
+
+#define SHARE_1005_IN_DFS               0x00000001
+#define SHARE_1005_DFS_ROOT             0x00000002
+/* use the CSC policy mask and shift to match up with the smb.conf parm */
+#define SHARE_1005_CSC_POLICY_MASK      0x00000030
+#define SHARE_1005_CSC_POLICY_SHIFT     4
+
 typedef struct share_info_1005_info
 {
-  uint32 dfs_root_flag
+  uint32 share_info_flags
 } SRV_SHARE_INFO_1005;
 
+typedef struct share_info_1006_info
+{
+       uint32 max_uses; 
+} SRV_SHARE_INFO_1006;
+
+typedef struct ptr_share_info1007
+{
+       uint32 flags;
+       uint32 ptr_AlternateDirectoryName;
+
+} SH_INFO_1007;
+
+typedef struct str_share_info1007
+{
+       SH_INFO_1007 *ptrs;
+
+       UNISTR2 uni_AlternateDirectoryName;
+
+} SH_INFO_1007_STR;
+
+typedef struct ptr_info_1007_info
+{
+       SH_INFO_1007     info_1007; 
+       SH_INFO_1007_STR info_1007_str; 
+} SRV_SHARE_INFO_1007;
+
 /* SRV_SHARE_INFO_1501 */
 typedef struct share_info_1501_info
 {
@@ -412,9 +498,16 @@ typedef struct srv_share_info_ctr_info
        uint32 num_entries2;
 
        union {
-               SRV_SHARE_INFO_1 *info1; /* share info level 1 */
-               SRV_SHARE_INFO_2 *info2; /* share info level 2 */
-               SRV_SHARE_INFO_502 *info502; /* share info level 502 */
+               SRV_SHARE_INFO_0    *info0;
+               SRV_SHARE_INFO_1    *info1;    /* share info level 1 */
+               SRV_SHARE_INFO_2    *info2;    /* share info level 2 */
+               SRV_SHARE_INFO_501  *info501;  /* share info level 501 */
+               SRV_SHARE_INFO_502  *info502;  /* share info level 502 */
+               SRV_SHARE_INFO_1004 *info1004;
+               SRV_SHARE_INFO_1005 *info1005;
+               SRV_SHARE_INFO_1006 *info1006;
+               SRV_SHARE_INFO_1007 *info1007;
+               SRV_SHARE_INFO_1501 *info1501;
                void *info;
 
        } share;
@@ -444,7 +537,7 @@ typedef struct r_net_share_enum_info
        uint32 total_entries;                    /* total number of entries */
        ENUM_HND enum_hnd;
 
-       uint32 status;               /* return status */
+       WERROR status;               /* return status */
 
 } SRV_R_NET_SHARE_ENUM;
 
@@ -460,19 +553,22 @@ typedef struct q_net_share_get_info_info
 
 } SRV_Q_NET_SHARE_GET_INFO;
 
-/* JRA. NB. We also need level 1004 and 1006 here. */
-
 /* SRV_SHARE_INFO */
 typedef struct srv_share_info {
        uint32 switch_value;
        uint32 ptr_share_ctr;
 
        union {
+               SRV_SHARE_INFO_0    info0;
                SRV_SHARE_INFO_1 info1;
                SRV_SHARE_INFO_2 info2;
+               SRV_SHARE_INFO_501 info501;
                SRV_SHARE_INFO_502 info502;
-        SRV_SHARE_INFO_1005 info1005;
-        SRV_SHARE_INFO_1501 info1501;
+               SRV_SHARE_INFO_1004 info1004;
+               SRV_SHARE_INFO_1005 info1005;
+               SRV_SHARE_INFO_1006 info1006;
+               SRV_SHARE_INFO_1007 info1007;
+               SRV_SHARE_INFO_1501 info1501;
        } share;
 } SRV_SHARE_INFO;
 
@@ -480,7 +576,7 @@ typedef struct srv_share_info {
 typedef struct r_net_share_get_info_info
 {
        SRV_SHARE_INFO info;
-       uint32 status;
+       WERROR status;
 
 } SRV_R_NET_SHARE_GET_INFO;
 
@@ -495,14 +591,18 @@ typedef struct q_net_share_set_info_info
 
        SRV_SHARE_INFO info;
 
+        uint32 ptr_parm_error;
+        uint32 parm_error;
+
 } SRV_Q_NET_SHARE_SET_INFO;
 
 /* SRV_R_NET_SHARE_SET_INFO */
 typedef struct r_net_share_set_info
 {
-       uint32 switch_value;         /* switch value */
+        uint32 ptr_parm_error;
+        uint32 parm_error;
 
-       uint32 status;               /* return status */
+       WERROR status;               /* return status */
 
 } SRV_R_NET_SHARE_SET_INFO;
 
@@ -516,14 +616,19 @@ typedef struct q_net_share_add
 
        SRV_SHARE_INFO info;
 
+       uint32 ptr_err_index; /* pointer to error index */
+       uint32 err_index;     /* index in info to field in error */
+
 } SRV_Q_NET_SHARE_ADD;
 
 /* SRV_R_NET_SHARE_ADD */
 typedef struct r_net_share_add
 {
-       uint32 switch_value;         /* switch value */
 
-       uint32 status;               /* return status */
+        uint32 ptr_parm_error;
+        uint32 parm_error;
+
+       WERROR status;               /* return status */
 
 } SRV_R_NET_SHARE_ADD;
 
@@ -533,97 +638,56 @@ typedef struct q_net_share_del
        uint32 ptr_srv_name;
        UNISTR2 uni_srv_name;
        UNISTR2 uni_share_name;
+       uint32 reserved;
 
 } SRV_Q_NET_SHARE_DEL;
 
 /* SRV_R_NET_SHARE_DEL */
 typedef struct r_net_share_del
 {
-       uint32 status;               /* return status */
+       WERROR status;               /* return status */
 
 } SRV_R_NET_SHARE_DEL;
 
-/* FILE_INFO_3 (level 3 file info strings) */
-typedef struct file_info3_info
-{
+/***************************/
+
+typedef struct {
        uint32 id;            /* file index */
        uint32 perms;         /* file permissions. don't know what format */
        uint32 num_locks;     /* file locks */
-       uint32 ptr_path_name; /* file name */
-       uint32 ptr_user_name; /* file owner */
-
+       UNISTR2 *path;        /* file name */
+       UNISTR2 *user;        /* file owner */
 } FILE_INFO_3;
 
-/* FILE_INFO_3_STR (level 3 file info strings) */
-typedef struct str_file_info3_info
-{
-       UNISTR2 uni_path_name; /* unicode string of file name */
-       UNISTR2 uni_user_name; /* unicode string of file owner. */
-
-} FILE_INFO_3_STR;
-
-/* oops - this is going to take up a *massive* amount of stack. */
-/* the UNISTR2s already have 1024 uint16 chars in them... */
-#define MAX_FILE_ENTRIES 32
-
-/* SRV_FILE_INFO_3 */
-typedef struct srv_file_info_3
-{
-       uint32 num_entries_read;                     /* EntriesRead */
-       uint32 ptr_file_info;                        /* Buffer */
-
-       uint32 num_entries_read2;                    /* EntriesRead */
-
-       FILE_INFO_3     info_3    [MAX_FILE_ENTRIES]; /* file entry details */
-       FILE_INFO_3_STR info_3_str[MAX_FILE_ENTRIES]; /* file entry strings */
+typedef struct {
+       uint32 level;                /* switch value */
+       uint32 ptr_file_info;        /* pointer to file info union */
 
-} SRV_FILE_INFO_3;
-
-/* SRV_FILE_INFO_CTR */
-typedef struct srv_file_info_3_info
-{
-       uint32 switch_value;         /* switch value */
-       uint32 ptr_file_ctr;       /* pointer to file info union */
-       union
-    {
-               SRV_FILE_INFO_3 info3; /* file info with 0 entries */
-
-    } file;
+       uint32 num_entries;
+       uint32 ptr_entries;
+       uint32 num_entries2;
+       union {
+               FILE_INFO_3 *info3;
+       } file;
 
 } SRV_FILE_INFO_CTR;
 
-
-/* SRV_Q_NET_FILE_ENUM */
-typedef struct q_net_file_enum_info
-{
-       uint32 ptr_srv_name;         /* pointer (to server name?) */
-       UNISTR2 uni_srv_name;        /* server name */
-
-       uint32 ptr_qual_name;         /* pointer (to qualifier name) */
-       UNISTR2 uni_qual_name;        /* qualifier name "\\qualifier" */
-
-       uint32 file_level;          /* file level */
-
-       SRV_FILE_INFO_CTR *ctr;
-
-       uint32 preferred_len; /* preferred maximum length (0xffff ffff) */
+typedef struct {
+       UNISTR2 *servername;
+       UNISTR2 *qualifier;
+       UNISTR2 *username;
+       uint32 level;
+       SRV_FILE_INFO_CTR ctr;
+       uint32 preferred_len;     /* preferred maximum length (0xffff ffff) */
        ENUM_HND enum_hnd;
-
 } SRV_Q_NET_FILE_ENUM;
 
-
-/* SRV_R_NET_FILE_ENUM */
-typedef struct r_net_file_enum_info
-{
-       uint32 file_level;          /* file level */
-
-       SRV_FILE_INFO_CTR *ctr;
-
-       uint32 total_entries;                    /* total number of files */
+typedef struct {
+       uint32 level;   
+       SRV_FILE_INFO_CTR ctr;
+       uint32 total_entries;
        ENUM_HND enum_hnd;
-
-       uint32 status;        /* return status */
-
+       WERROR status;      
 } SRV_R_NET_FILE_ENUM;
 
 /* SRV_INFO_100 */
@@ -704,7 +768,7 @@ typedef struct r_net_srv_get_info
 {
        SRV_INFO_CTR *ctr;
 
-       uint32 status;               /* return status */
+       WERROR status;               /* return status */
 
 } SRV_R_NET_SRV_GET_INFO;
 
@@ -725,7 +789,7 @@ typedef struct r_net_srv_set_info
 {
        uint32 switch_value;         /* switch value */
 
-       uint32 status;               /* return status */
+       WERROR status;               /* return status */
 
 } SRV_R_NET_SRV_SET_INFO;
 
@@ -761,7 +825,7 @@ typedef struct r_net_remote_tod
        uint32 ptr_srv_tod;         /* pointer to TOD */
        TIME_OF_DAY_INFO *tod;
        
-       uint32 status;               /* return status */
+       WERROR status;               /* return status */
 
 } SRV_R_NET_REMOTE_TOD;
 
@@ -786,7 +850,7 @@ typedef struct r_net_file_query_secdesc
        uint32 ptr_secdesc;
        uint32 size_secdesc;
        SEC_DESC *sec_desc;
-       uint32 status;
+       WERROR status;
 } SRV_R_NET_FILE_QUERY_SECDESC;
 
 /* SRV_Q_NET_FILE_SET_SECDESC */
@@ -807,6 +871,20 @@ typedef struct q_net_file_set_secdesc
 /* SRV_R_NET_FILE_SET_SECDESC */
 typedef struct r_net_file_set_secdesc
 {
-       uint32 status;
+       WERROR status;
 } SRV_R_NET_FILE_SET_SECDESC;
+
+/***************************/
+
+typedef struct {
+       UNISTR2 *servername;
+       uint32 file_id;
+} SRV_Q_NET_FILE_CLOSE;
+
+typedef struct {
+       WERROR status;
+} SRV_R_NET_FILE_CLOSE;
+
+/***************************/
+
 #endif /* _RPC_SRVSVC_H */