r26296: Store loadparm context in DCE/RPC server context.
[jelmer/samba4-debian.git] / source / rpc_server / srvsvc / dcesrv_srvsvc.c
index b8da68e920e7e0033cb82fa14cccd2577bb8403f..d76e83ba17adae1bdc62894739865ee5d09fafa7 100644 (file)
@@ -7,7 +7,7 @@
    
    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
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -29,6 +28,7 @@
 #include "libcli/security/security.h"
 #include "system/time.h"
 #include "rpc_server/srvsvc/proto.h"
+#include "param/param.h"
 
 #define SRVSVC_CHECK_ADMIN_ACCESS do { \
        struct security_token *t = dce_call->conn->auth_state.session_info->security_token; \
@@ -41,7 +41,7 @@
 /* 
   srvsvc_NetCharDevEnum 
 */
-static WERROR srvsvc_NetCharDevEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetCharDevEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                                      struct srvsvc_NetCharDevEnum *r)
 {
        r->out.level = r->in.level;
@@ -78,7 +78,7 @@ static WERROR srvsvc_NetCharDevEnum(struct dcesrv_call_state *dce_call, TALLOC_C
 /* 
   srvsvc_NetCharDevGetInfo 
 */
-static WERROR srvsvc_NetCharDevGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetCharDevGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetCharDevGetInfo *r)
 {
        ZERO_STRUCT(r->out);
@@ -103,7 +103,7 @@ static WERROR srvsvc_NetCharDevGetInfo(struct dcesrv_call_state *dce_call, TALLO
 /* 
   srvsvc_NetCharDevControl 
 */
-static WERROR srvsvc_NetCharDevControl(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetCharDevControl(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetCharDevControl *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -113,7 +113,7 @@ static WERROR srvsvc_NetCharDevControl(struct dcesrv_call_state *dce_call, TALLO
 /* 
   srvsvc_NetCharDevQEnum 
 */
-static WERROR srvsvc_NetCharDevQEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetCharDevQEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                                     struct srvsvc_NetCharDevQEnum *r)
 {
        r->out.level = r->in.level;
@@ -152,7 +152,7 @@ static WERROR srvsvc_NetCharDevQEnum(struct dcesrv_call_state *dce_call, TALLOC_
 /* 
   srvsvc_NetCharDevQGetInfo 
 */
-static WERROR srvsvc_NetCharDevQGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetCharDevQGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                                        struct srvsvc_NetCharDevQGetInfo *r)
 {
        ZERO_STRUCT(r->out);
@@ -177,7 +177,7 @@ static WERROR srvsvc_NetCharDevQGetInfo(struct dcesrv_call_state *dce_call, TALL
 /* 
   srvsvc_NetCharDevQSetInfo 
 */
-static WERROR srvsvc_NetCharDevQSetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetCharDevQSetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetCharDevQSetInfo *r)
 {
        switch (r->in.level) {
@@ -206,7 +206,7 @@ static WERROR srvsvc_NetCharDevQSetInfo(struct dcesrv_call_state *dce_call, TALL
 /* 
   srvsvc_NetCharDevQPurge 
 */
-static WERROR srvsvc_NetCharDevQPurge(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetCharDevQPurge(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetCharDevQPurge *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -216,7 +216,7 @@ static WERROR srvsvc_NetCharDevQPurge(struct dcesrv_call_state *dce_call, TALLOC
 /* 
   srvsvc_NetCharDevQPurgeSelf 
 */
-static WERROR srvsvc_NetCharDevQPurgeSelf(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetCharDevQPurgeSelf(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                                          struct srvsvc_NetCharDevQPurgeSelf *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);        
@@ -226,7 +226,7 @@ static WERROR srvsvc_NetCharDevQPurgeSelf(struct dcesrv_call_state *dce_call, TA
 /* 
   srvsvc_NetConnEnum 
 */
-static WERROR srvsvc_NetConnEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetConnEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetConnEnum *r)
 {
        r->out.level = r->in.level;
@@ -265,7 +265,7 @@ static WERROR srvsvc_NetConnEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX
 /* 
   srvsvc_NetFileEnum 
 */
-static WERROR srvsvc_NetFileEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetFileEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                                 struct srvsvc_NetFileEnum *r)
 {
        r->out.level = r->in.level;
@@ -304,7 +304,7 @@ static WERROR srvsvc_NetFileEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX
 /* 
   srvsvc_NetFileGetInfo 
 */
-static WERROR srvsvc_NetFileGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetFileGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                                    struct srvsvc_NetFileGetInfo *r)
 {
        ZERO_STRUCT(r->out);
@@ -329,7 +329,7 @@ static WERROR srvsvc_NetFileGetInfo(struct dcesrv_call_state *dce_call, TALLOC_C
 /* 
   srvsvc_NetFileClose 
 */
-static WERROR srvsvc_NetFileClose(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetFileClose(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetFileClose *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -339,7 +339,7 @@ static WERROR srvsvc_NetFileClose(struct dcesrv_call_state *dce_call, TALLOC_CTX
 /* 
   srvsvc_NetSessEnum 
 */
-static WERROR srvsvc_NetSessEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetSessEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetSessEnum *r)
 {
        r->out.level = r->in.level;
@@ -408,7 +408,7 @@ static WERROR srvsvc_NetSessEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX
 /* 
   srvsvc_NetSessDel 
 */
-static WERROR srvsvc_NetSessDel(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetSessDel(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetSessDel *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -418,7 +418,7 @@ static WERROR srvsvc_NetSessDel(struct dcesrv_call_state *dce_call, TALLOC_CTX *
 /* 
   srvsvc_NetShareAdd 
 */
-static WERROR srvsvc_NetShareAdd(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetShareAdd(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetShareAdd *r)
 {
        switch (r->in.level) {
@@ -632,7 +632,7 @@ static WERROR srvsvc_NetShareAdd(struct dcesrv_call_state *dce_call, TALLOC_CTX
        return WERR_UNKNOWN_LEVEL;
 }
 
-static WERROR srvsvc_fiel_ShareInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_fiel_ShareInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                                    struct share_config *scfg, uint32_t level,
                                    union srvsvc_NetShareInfo *info)
 {
@@ -717,7 +717,7 @@ static WERROR srvsvc_fiel_ShareInfo(struct dcesrv_call_state *dce_call, TALLOC_C
 /* 
   srvsvc_NetShareEnumAll
 */
-static WERROR srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                                     struct srvsvc_NetShareEnumAll *r)
 {
        NTSTATUS nterr;
@@ -774,7 +774,7 @@ static WERROR srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_
                                return WERR_GENERAL_FAILURE;
                        }
                        info.info0 = &ctr0->array[i];
-                       status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
+                       status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
                        if (!W_ERROR_IS_OK(status)) {
                                return status;
                        }
@@ -815,7 +815,7 @@ static WERROR srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_
                                return WERR_GENERAL_FAILURE;
                        }
                        info.info1 = &ctr1->array[i];
-                       status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
+                       status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
                        if (!W_ERROR_IS_OK(status)) {
                                return status;
                        }
@@ -858,7 +858,7 @@ static WERROR srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_
                                return WERR_GENERAL_FAILURE;
                        }
                        info.info2 = &ctr2->array[i];
-                       status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
+                       status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
                        if (!W_ERROR_IS_OK(status)) {
                                return status;
                        }
@@ -901,7 +901,7 @@ static WERROR srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_
                                return WERR_GENERAL_FAILURE;
                        }
                        info.info501 = &ctr501->array[i];
-                       status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
+                       status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
                        if (!W_ERROR_IS_OK(status)) {
                                return status;
                        }
@@ -944,7 +944,7 @@ static WERROR srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_
                                return WERR_GENERAL_FAILURE;
                        }
                        info.info502 = &ctr502->array[i];
-                       status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
+                       status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
                        if (!W_ERROR_IS_OK(status)) {
                                return status;
                        }
@@ -967,7 +967,7 @@ static WERROR srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_
 /* 
   srvsvc_NetShareGetInfo 
 */
-static WERROR srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                                     struct srvsvc_NetShareGetInfo *r)
 {
        NTSTATUS nterr;
@@ -1002,7 +1002,7 @@ static WERROR srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call, TALLOC_
                info.info0 = talloc(mem_ctx, struct srvsvc_NetShareInfo0);
                W_ERROR_HAVE_NO_MEMORY(info.info0);
 
-               status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
+               status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
                if (!W_ERROR_IS_OK(status)) {
                        return status;
                }
@@ -1018,7 +1018,7 @@ static WERROR srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call, TALLOC_
                info.info1 = talloc(mem_ctx, struct srvsvc_NetShareInfo1);
                W_ERROR_HAVE_NO_MEMORY(info.info1);
 
-               status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
+               status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
                if (!W_ERROR_IS_OK(status)) {
                        return status;
                }
@@ -1036,7 +1036,7 @@ static WERROR srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call, TALLOC_
                info.info2 = talloc(mem_ctx, struct srvsvc_NetShareInfo2);
                W_ERROR_HAVE_NO_MEMORY(info.info2);
 
-               status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
+               status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
                if (!W_ERROR_IS_OK(status)) {
                        return status;
                }
@@ -1052,7 +1052,7 @@ static WERROR srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call, TALLOC_
                info.info501 = talloc(mem_ctx, struct srvsvc_NetShareInfo501);
                W_ERROR_HAVE_NO_MEMORY(info.info501);
 
-               status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
+               status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
                if (!W_ERROR_IS_OK(status)) {
                        return status;
                }
@@ -1070,7 +1070,7 @@ static WERROR srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call, TALLOC_
                info.info502 = talloc(mem_ctx, struct srvsvc_NetShareInfo502);
                W_ERROR_HAVE_NO_MEMORY(info.info502);
 
-               status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
+               status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
                if (!W_ERROR_IS_OK(status)) {
                        return status;
                }
@@ -1086,7 +1086,7 @@ static WERROR srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call, TALLOC_
                info.info1005 = talloc(mem_ctx, struct srvsvc_NetShareInfo1005);
                W_ERROR_HAVE_NO_MEMORY(info.info1005);
 
-               status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
+               status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
                if (!W_ERROR_IS_OK(status)) {
                        return status;
                }
@@ -1101,88 +1101,45 @@ static WERROR srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call, TALLOC_
        return WERR_UNKNOWN_LEVEL;
 }
 
-
-/* 
-  srvsvc_NetShareSetInfo 
-*/
-static WERROR srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct srvsvc_NetShareSetInfo *r)
+static WERROR dcesrv_srvsvc_fill_share_info(struct share_info *info, int *count,
+                                       const char *share_name, int level,
+                                       const char *name,
+                                       const char *path,
+                                       const char *comment,
+                                       const char *password,
+                                       enum srvsvc_ShareType type,
+                                       int32_t max_users,
+                                       uint32_t csc_policy,
+                                       struct security_descriptor *sd)
 {
-       NTSTATUS nterr;
-       struct share_context *sctx = NULL;
-       struct share_config *scfg = NULL;
+       int i = 0;
 
-       ZERO_STRUCT(r->out);
-
-       /* TODO: - access check
-        */
-
-       if (strcmp("", r->in.share_name) == 0) {
-               return WERR_INVALID_PARAM;
-       }
-
-       nterr = share_get_context(mem_ctx, &sctx);
-       if (!NT_STATUS_IS_OK(nterr)) {
-               return ntstatus_to_werror(nterr);
-       }
-
-       switch (r->in.level) {
-       case 0:
-       {
-               return WERR_NOT_SUPPORTED;
-       }
-       case 1:
-       {
-               return WERR_NOT_SUPPORTED;
+       if (level == 501) {
+               info[i].name = SHARE_CSC_POLICY;
+               info[i].type = SHARE_INFO_INT;
+               info[i].value = talloc(info, int);
+               *((int *)info[i].value) = csc_policy;
+               i++;
        }
-       case 2:
-       {
-               struct share_info *info;
-               int count = 8;
-               int i;
-
-               /* there are no more than 8 options in struct srvsvc_NetShareInfo2 */
-               info = talloc_array(mem_ctx, struct share_info, count);
-               W_ERROR_HAVE_NO_MEMORY(info);
-
-               i = 0;
+       
+       switch(level) {
 
-               if (strcasecmp(r->in.share_name, r->in.info.info2->name) != 0) {
-                       info[i].name = SHARE_NAME;
-                       info[i].type = SHARE_INFO_STRING;
-                       info[i].value = talloc_strdup(info, r->in.info.info2->name);
-                       W_ERROR_HAVE_NO_MEMORY(info[i].value);
-                       i++;
-               }
+       case 502:
+               /* TODO: check if unknown is csc_policy */
 
-               info[i].name = SHARE_TYPE;
-               info[i].type = SHARE_INFO_STRING;
-               switch (r->in.info.info2->type) {
-               case 0x00:
-                       info[i].value = talloc_strdup(info, "DISK");
-                       break;
-               case 0x01:
-                       info[i].value = talloc_strdup(info, "PRINTER");
-                       break;
-               case 0x03:
-                       info[i].value = talloc_strdup(info, "IPC");
-                       break;
-               default:
-                       return WERR_INVALID_PARAM;
-               }
-               W_ERROR_HAVE_NO_MEMORY(info[i].value);
-               i++;
+               /* TODO: security descriptor */
 
-               if (r->in.info.info2->path && r->in.info.info2->path[0]) {
+       case 2:
+               if (path && path[0]) {
                        info[i].name = SHARE_PATH;
                        info[i].type = SHARE_INFO_STRING;
 
                        /* Windows will send a path in a form of C:\example\path */
-                       if (r->in.info.info2->path[1] == ':') {
-                               info[i].value = talloc_strdup(info, &r->in.info.info2->path[2]);
+                       if (path[1] == ':') {
+                               info[i].value = talloc_strdup(info, &path[2]);
                        } else {
                                /* very strange let's try to set as is */
-                               info[i].value = talloc_strdup(info, r->in.info.info2->path);
+                               info[i].value = talloc_strdup(info, path);
                        }
                        W_ERROR_HAVE_NO_MEMORY(info[i].value);
                        all_string_sub((char *)info[i].value, "\\", "/", 0);
@@ -1190,19 +1147,10 @@ static WERROR srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_
                        i++;
                }
 
-               if (r->in.info.info2->comment && r->in.info.info2->comment[0]) {
-                       info[i].name = SHARE_COMMENT;
-                       info[i].type = SHARE_INFO_STRING;
-                       info[i].value = talloc_strdup(info, r->in.info.info2->comment);
-                       W_ERROR_HAVE_NO_MEMORY(info[i].value);
-
-                       i++;
-               }
-
-               if (r->in.info.info2->password && r->in.info.info2->password[0]) {
+               if (password && password[0]) {
                        info[i].name = SHARE_PASSWORD;
                        info[i].type = SHARE_INFO_STRING;
-                       info[i].value = talloc_strdup(info, r->in.info.info502->password);
+                       info[i].value = talloc_strdup(info, password);
                        W_ERROR_HAVE_NO_MEMORY(info[i].value);
 
                        i++;
@@ -1211,49 +1159,14 @@ static WERROR srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_
                info[i].name = SHARE_MAX_CONNECTIONS;
                info[i].type = SHARE_INFO_INT;
                info[i].value = talloc(info, int);
-               *((int *)info[i].value) = r->in.info.info2->max_users;
+               *((int *)info[i].value) = max_users;
                i++;
 
-               /* TODO: security descriptor */
-
-               nterr = share_set(sctx, r->in.share_name, info, i);
-               if (!NT_STATUS_IS_OK(nterr)) {
-                       return ntstatus_to_werror(nterr);
-               }
-
-               if (r->in.parm_error) {
-                       r->out.parm_error = r->in.parm_error;
-               }
-               
-               return WERR_OK;
-       }
        case 501:
-       {
-               return WERR_NOT_SUPPORTED;
-       }
-       case 502:
-       {
-               struct share_info *info;
-               int count = 8;
-               int i;
-
-               /* there are no more than 8 options in struct srvsvc_NetShareInfo502 */
-               info = talloc_array(mem_ctx, struct share_info, count);
-               W_ERROR_HAVE_NO_MEMORY(info);
-
-               i = 0;
-
-               if (strcasecmp(r->in.share_name, r->in.info.info502->name) != 0) {
-                       info[i].name = SHARE_NAME;
-                       info[i].type = SHARE_INFO_STRING;
-                       info[i].value = talloc_strdup(info, r->in.info.info502->name);
-                       W_ERROR_HAVE_NO_MEMORY(info[i].value);
-                       i++;
-               }
-
+       case 1:
                info[i].name = SHARE_TYPE;
                info[i].type = SHARE_INFO_STRING;
-               switch (r->in.info.info502->type) {
+               switch (type) {
                case 0x00:
                        info[i].value = talloc_strdup(info, "DISK");
                        break;
@@ -1269,74 +1182,171 @@ static WERROR srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_
                W_ERROR_HAVE_NO_MEMORY(info[i].value);
                i++;
 
-               if (r->in.info.info502->path && r->in.info.info502->path[0]) {
-                       info[i].name = SHARE_PATH;
+       case 1004:
+               if (comment) {
+                       info[i].name = SHARE_COMMENT;
                        info[i].type = SHARE_INFO_STRING;
-
-                       /* Windows will send a path in a form of C:\example\path */
-                       if (r->in.info.info2->path[1] == ':') {
-                               info[i].value = talloc_strdup(info, &r->in.info.info502->path[2]);
-                       } else {
-                               /* very strange let's try to set as is */
-                               info[i].value = talloc_strdup(info, r->in.info.info502->path);
-                       }
+                       info[i].value = talloc_strdup(info, comment);
                        W_ERROR_HAVE_NO_MEMORY(info[i].value);
-                       all_string_sub((char *)info[i].value, "\\", "/", 0);
 
                        i++;
                }
-
-               if (r->in.info.info502->comment && r->in.info.info502->comment[0]) {
-                       info[i].name = SHARE_COMMENT;
+       case 0:
+               if (name &&
+                   strcasecmp(share_name, name) != 0) {
+                       info[i].name = SHARE_NAME;
                        info[i].type = SHARE_INFO_STRING;
-                       info[i].value = talloc_strdup(info, r->in.info.info502->comment);
+                       info[i].value = talloc_strdup(info, name);
                        W_ERROR_HAVE_NO_MEMORY(info[i].value);
-
                        i++;
                }
 
-               if (r->in.info.info502->password && r->in.info.info502->password[0]) {
-                       info[i].name = SHARE_PASSWORD;
-                       info[i].type = SHARE_INFO_STRING;
-                       info[i].value = talloc_strdup(info, r->in.info.info502->password);
-                       W_ERROR_HAVE_NO_MEMORY(info[i].value);
+               break;
 
-                       i++;
-               }
+       default:
+               return WERR_UNKNOWN_LEVEL;
+       }
 
-               info[i].name = SHARE_MAX_CONNECTIONS;
-               info[i].type = SHARE_INFO_INT;
-               info[i].value = talloc(info, int);
-               *((int *)info[i].value) = r->in.info.info502->max_users;
-               i++;
+       *count = i;
 
-               /* TODO: security descriptor */
+       return WERR_OK;
+}
 
-               nterr = share_set(sctx, r->in.share_name, info, i);
-               if (!NT_STATUS_IS_OK(nterr)) {
-                       return ntstatus_to_werror(nterr);
-               }
+/* 
+  srvsvc_NetShareSetInfo 
+*/
+static WERROR dcesrv_srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                      struct srvsvc_NetShareSetInfo *r)
+{
+       NTSTATUS nterr;
+       WERROR status;
+       struct share_context *sctx = NULL;
+       struct share_info *info;
+       int count;
 
-               if (r->in.parm_error) {
-                       r->out.parm_error = r->in.parm_error;
+       /* TODO: - access check
+        */
+
+       /* there are no more than 10 options in all struct srvsvc_NetShareInfoXXX */
+       info = talloc_array(mem_ctx, struct share_info, 10);
+       W_ERROR_HAVE_NO_MEMORY(info);
+
+       ZERO_STRUCT(r->out);
+
+       if (strcmp("", r->in.share_name) == 0) {
+               return WERR_INVALID_PARAM;
+       }
+
+       nterr = share_get_context(mem_ctx, &sctx);
+       if (!NT_STATUS_IS_OK(nterr)) {
+               return ntstatus_to_werror(nterr);
+       }
+
+       switch (r->in.level) {
+       case 0:
+       {
+               status = dcesrv_srvsvc_fill_share_info(info, &count,
+                                       r->in.share_name, r->in.level,
+                                       r->in.info.info0->name,
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       0,
+                                       0,
+                                       0,
+                                       NULL);
+               if (W_ERROR_EQUAL(status, WERR_OK)) {
+                       return status;
                }
-               
-               return WERR_OK;
+               break;
+       }
+       case 1:
+       {
+               status = dcesrv_srvsvc_fill_share_info(info, &count,
+                                       r->in.share_name, r->in.level,
+                                       r->in.info.info1->name,
+                                       NULL,
+                                       r->in.info.info1->comment,
+                                       NULL,
+                                       r->in.info.info1->type,
+                                       0,
+                                       0,
+                                       NULL);
+               if (W_ERROR_EQUAL(status, WERR_OK)) {
+                       return status;
+               }
+               break;
+       }
+       case 2:
+       {
+               status = dcesrv_srvsvc_fill_share_info(info, &count,
+                                       r->in.share_name, r->in.level,
+                                       r->in.info.info2->name,
+                                       r->in.info.info2->path,
+                                       r->in.info.info2->comment,
+                                       r->in.info.info2->password,
+                                       r->in.info.info2->type,
+                                       r->in.info.info2->max_users,
+                                       0,
+                                       NULL);
+               if (W_ERROR_EQUAL(status, WERR_OK)) {
+                       return status;
+               }
+               break;
+       }
+       case 501:
+       {
+               status = dcesrv_srvsvc_fill_share_info(info, &count,
+                                       r->in.share_name, r->in.level,
+                                       r->in.info.info501->name,
+                                       NULL,
+                                       r->in.info.info501->comment,
+                                       NULL,
+                                       r->in.info.info501->type,
+                                       0,
+                                       r->in.info.info501->csc_policy,
+                                       NULL);
+               if (W_ERROR_EQUAL(status, WERR_OK)) {
+                       return status;
+               }
+               break;
+       }
+       case 502:
+       {
+               status = dcesrv_srvsvc_fill_share_info(info, &count,
+                                       r->in.share_name, r->in.level,
+                                       r->in.info.info502->name,
+                                       r->in.info.info502->path,
+                                       r->in.info.info502->comment,
+                                       r->in.info.info502->password,
+                                       r->in.info.info502->type,
+                                       r->in.info.info502->max_users,
+                                       0,
+                                       r->in.info.info502->sd);
+               if (W_ERROR_EQUAL(status, WERR_OK)) {
+                       return status;
+               }
+               break;
        }
        case 1004:
        {
-               WERROR status;
-               union srvsvc_NetShareInfo info;
-
-               /* r->in.info.comment; */
-
-               return WERR_NOT_SUPPORTED;
+               status = dcesrv_srvsvc_fill_share_info(info, &count,
+                                       r->in.share_name, r->in.level,
+                                       NULL,
+                                       NULL,
+                                       r->in.info.info1004->comment,
+                                       NULL,
+                                       0,
+                                       0,
+                                       0,
+                                       NULL);
+               if (W_ERROR_EQUAL(status, WERR_OK)) {
+                       return status;
+               }
+               break;
        }
        case 1005:
        {
-               WERROR status;
-               union srvsvc_NetShareInfo info;
-
                /* r->in.info.dfs_flags; */
                
                if (r->in.parm_error) {
@@ -1349,14 +1359,23 @@ static WERROR srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_
                return WERR_UNKNOWN_LEVEL;
        }
 
-       return WERR_UNKNOWN_LEVEL;
+       nterr = share_set(sctx, r->in.share_name, info, count);
+       if (!NT_STATUS_IS_OK(nterr)) {
+               return ntstatus_to_werror(nterr);
+       }
+
+       if (r->in.parm_error) {
+               r->out.parm_error = r->in.parm_error;
+       }
+               
+       return WERR_OK;
 }
 
 
 /* 
   srvsvc_NetShareDelSticky 
 */
-static WERROR srvsvc_NetShareDelSticky(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetShareDelSticky(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetShareDelSticky *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1366,7 +1385,7 @@ static WERROR srvsvc_NetShareDelSticky(struct dcesrv_call_state *dce_call, TALLO
 /* 
   srvsvc_NetShareCheck 
 */
-static WERROR srvsvc_NetShareCheck(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetShareCheck(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetShareCheck *r)
 {
        NTSTATUS nterr;
@@ -1444,7 +1463,7 @@ static WERROR srvsvc_NetShareCheck(struct dcesrv_call_state *dce_call, TALLOC_CT
 /* 
   srvsvc_NetSrvGetInfo 
 */
-static WERROR srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetSrvGetInfo *r)
 {
        struct dcesrv_context *dce_ctx = dce_call->conn->dce_ctx;
@@ -1480,7 +1499,7 @@ static WERROR srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CT
                info101->version_major  = dcesrv_common_get_version_major(mem_ctx, dce_ctx);
                info101->version_minor  = dcesrv_common_get_version_minor(mem_ctx, dce_ctx);
                info101->server_type    = dcesrv_common_get_server_type(mem_ctx, dce_ctx);
-               info101->comment        = talloc_strdup(mem_ctx, lp_serverstring());
+               info101->comment        = talloc_strdup(mem_ctx, lp_serverstring(dce_ctx->lp_ctx));
                W_ERROR_HAVE_NO_MEMORY(info101->comment);
 
                r->out.info.info101 = info101;
@@ -1500,7 +1519,7 @@ static WERROR srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CT
                info102->version_major  = dcesrv_common_get_version_major(mem_ctx, dce_ctx);
                info102->version_minor  = dcesrv_common_get_version_minor(mem_ctx, dce_ctx);
                info102->server_type    = dcesrv_common_get_server_type(mem_ctx, dce_ctx);
-               info102->comment        = talloc_strdup(mem_ctx, lp_serverstring());
+               info102->comment        = talloc_strdup(mem_ctx, lp_serverstring(dce_ctx->lp_ctx));
                W_ERROR_HAVE_NO_MEMORY(info102->comment);
 
                info102->users          = dcesrv_common_get_users(mem_ctx, dce_ctx);
@@ -1526,7 +1545,7 @@ static WERROR srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CT
 /* 
   srvsvc_NetSrvSetInfo 
 */
-static WERROR srvsvc_NetSrvSetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetSrvSetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetSrvSetInfo *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1536,7 +1555,7 @@ static WERROR srvsvc_NetSrvSetInfo(struct dcesrv_call_state *dce_call, TALLOC_CT
 /* 
   srvsvc_NetDiskEnum 
 */
-static WERROR srvsvc_NetDiskEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetDiskEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetDiskEnum *r)
 {
        r->out.info.disks = NULL;
@@ -1575,7 +1594,7 @@ static WERROR srvsvc_NetDiskEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX
 /* 
   srvsvc_NetServerStatisticsGet 
 */
-static WERROR srvsvc_NetServerStatisticsGet(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetServerStatisticsGet(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetServerStatisticsGet *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1585,7 +1604,7 @@ static WERROR srvsvc_NetServerStatisticsGet(struct dcesrv_call_state *dce_call,
 /* 
   srvsvc_NetTransportAdd 
 */
-static WERROR srvsvc_NetTransportAdd(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetTransportAdd(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetTransportAdd *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1595,7 +1614,7 @@ static WERROR srvsvc_NetTransportAdd(struct dcesrv_call_state *dce_call, TALLOC_
 /* 
   srvsvc_NetTransportEnum 
 */
-static WERROR srvsvc_NetTransportEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetTransportEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetTransportEnum *r)
 {
        r->out.level = r->in.level;
@@ -1653,7 +1672,7 @@ static WERROR srvsvc_NetTransportEnum(struct dcesrv_call_state *dce_call, TALLOC
 /* 
   srvsvc_NetTransportDel 
 */
-static WERROR srvsvc_NetTransportDel(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetTransportDel(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetTransportDel *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1663,7 +1682,7 @@ static WERROR srvsvc_NetTransportDel(struct dcesrv_call_state *dce_call, TALLOC_
 /* 
   srvsvc_NetRemoteTOD 
 */
-static WERROR srvsvc_NetRemoteTOD(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetRemoteTOD(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetRemoteTOD *r)
 {
        struct timeval tval;
@@ -1701,7 +1720,7 @@ static WERROR srvsvc_NetRemoteTOD(struct dcesrv_call_state *dce_call, TALLOC_CTX
 /* 
   srvsvc_NetPathType 
 */
-static WERROR srvsvc_NetPathType(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetPathType(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetPathType *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1711,7 +1730,7 @@ static WERROR srvsvc_NetPathType(struct dcesrv_call_state *dce_call, TALLOC_CTX
 /* 
   srvsvc_NetPathCanonicalize 
 */
-static WERROR srvsvc_NetPathCanonicalize(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetPathCanonicalize(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetPathCanonicalize *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1721,7 +1740,7 @@ static WERROR srvsvc_NetPathCanonicalize(struct dcesrv_call_state *dce_call, TAL
 /* 
   srvsvc_NetPathCompare 
 */
-static WERROR srvsvc_NetPathCompare(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetPathCompare(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetPathCompare *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1731,7 +1750,7 @@ static WERROR srvsvc_NetPathCompare(struct dcesrv_call_state *dce_call, TALLOC_C
 /* 
   srvsvc_NetNameValidate 
 */
-static WERROR srvsvc_NetNameValidate(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetNameValidate(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetNameValidate *r)
 {
        int len;
@@ -1781,7 +1800,7 @@ static WERROR srvsvc_NetNameValidate(struct dcesrv_call_state *dce_call, TALLOC_
 /* 
   srvsvc_NetPRNameCompare 
 */
-static WERROR srvsvc_NetPRNameCompare(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetPRNameCompare(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetPRNameCompare *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1791,7 +1810,7 @@ static WERROR srvsvc_NetPRNameCompare(struct dcesrv_call_state *dce_call, TALLOC
 /* 
   srvsvc_NetShareEnum 
 */
-static WERROR srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetShareEnum *r)
 {
        NTSTATUS nterr;
@@ -1860,7 +1879,7 @@ static WERROR srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX
                        }
 
                        info.info0 = &ctr0->array[y];
-                       status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
+                       status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
                        W_ERROR_NOT_OK_RETURN(status);
                        talloc_free(scfg);
                        y++;
@@ -1911,7 +1930,7 @@ static WERROR srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX
                        }
 
                        info.info1 = &ctr1->array[y];
-                       status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
+                       status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
                        W_ERROR_NOT_OK_RETURN(status);
                        talloc_free(scfg);
                        y++;
@@ -1964,7 +1983,7 @@ static WERROR srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX
                        }
 
                        info.info2 = &ctr2->array[y];
-                       status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
+                       status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
                        W_ERROR_NOT_OK_RETURN(status);
                        talloc_free(scfg);
                        y++;
@@ -2017,7 +2036,7 @@ static WERROR srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX
                        }
 
                        info.info502 = &ctr502->array[y];
-                       status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
+                       status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.level, &info);
                        W_ERROR_NOT_OK_RETURN(status);
                        talloc_free(scfg);
                        y++;
@@ -2039,7 +2058,7 @@ static WERROR srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX
 /* 
   srvsvc_NetShareDelStart 
 */
-static WERROR srvsvc_NetShareDelStart(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetShareDelStart(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetShareDelStart *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -2049,7 +2068,7 @@ static WERROR srvsvc_NetShareDelStart(struct dcesrv_call_state *dce_call, TALLOC
 /* 
   srvsvc_NetShareDelCommit 
 */
-static WERROR srvsvc_NetShareDelCommit(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetShareDelCommit(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetShareDelCommit *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -2059,7 +2078,7 @@ static WERROR srvsvc_NetShareDelCommit(struct dcesrv_call_state *dce_call, TALLO
 /* 
   srvsvc_NetGetFileSecurity 
 */
-static WERROR srvsvc_NetGetFileSecurity(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetGetFileSecurity(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetGetFileSecurity *r)
 {
        struct sec_desc_buf *sd_buf;
@@ -2101,7 +2120,7 @@ static WERROR srvsvc_NetGetFileSecurity(struct dcesrv_call_state *dce_call, TALL
 /* 
   srvsvc_NetSetFileSecurity 
 */
-static WERROR srvsvc_NetSetFileSecurity(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetSetFileSecurity(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetSetFileSecurity *r)
 {
        struct ntvfs_context *ntvfs_ctx;
@@ -2137,7 +2156,7 @@ static WERROR srvsvc_NetSetFileSecurity(struct dcesrv_call_state *dce_call, TALL
 /* 
   srvsvc_NetServerTransportAddEx 
 */
-static WERROR srvsvc_NetServerTransportAddEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetServerTransportAddEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetServerTransportAddEx *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -2147,7 +2166,7 @@ static WERROR srvsvc_NetServerTransportAddEx(struct dcesrv_call_state *dce_call,
 /* 
   srvsvc_NetServerSetServiceBitsEx 
 */
-static WERROR srvsvc_NetServerSetServiceBitsEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetServerSetServiceBitsEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetServerSetServiceBitsEx *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -2157,7 +2176,7 @@ static WERROR srvsvc_NetServerSetServiceBitsEx(struct dcesrv_call_state *dce_cal
 /* 
   srvsvc_NETRDFSGETVERSION 
 */
-static WERROR srvsvc_NETRDFSGETVERSION(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NETRDFSGETVERSION(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NETRDFSGETVERSION *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -2167,7 +2186,7 @@ static WERROR srvsvc_NETRDFSGETVERSION(struct dcesrv_call_state *dce_call, TALLO
 /* 
   srvsvc_NETRDFSCREATELOCALPARTITION 
 */
-static WERROR srvsvc_NETRDFSCREATELOCALPARTITION(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NETRDFSCREATELOCALPARTITION(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NETRDFSCREATELOCALPARTITION *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -2177,7 +2196,7 @@ static WERROR srvsvc_NETRDFSCREATELOCALPARTITION(struct dcesrv_call_state *dce_c
 /* 
   srvsvc_NETRDFSDELETELOCALPARTITION 
 */
-static WERROR srvsvc_NETRDFSDELETELOCALPARTITION(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NETRDFSDELETELOCALPARTITION(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NETRDFSDELETELOCALPARTITION *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -2187,7 +2206,7 @@ static WERROR srvsvc_NETRDFSDELETELOCALPARTITION(struct dcesrv_call_state *dce_c
 /* 
   srvsvc_NETRDFSSETLOCALVOLUMESTATE 
 */
-static WERROR srvsvc_NETRDFSSETLOCALVOLUMESTATE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NETRDFSSETLOCALVOLUMESTATE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NETRDFSSETLOCALVOLUMESTATE *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -2197,7 +2216,7 @@ static WERROR srvsvc_NETRDFSSETLOCALVOLUMESTATE(struct dcesrv_call_state *dce_ca
 /* 
   srvsvc_NETRDFSSETSERVERINFO 
 */
-static WERROR srvsvc_NETRDFSSETSERVERINFO(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NETRDFSSETSERVERINFO(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NETRDFSSETSERVERINFO *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -2207,7 +2226,7 @@ static WERROR srvsvc_NETRDFSSETSERVERINFO(struct dcesrv_call_state *dce_call, TA
 /* 
   srvsvc_NETRDFSCREATEEXITPOINT 
 */
-static WERROR srvsvc_NETRDFSCREATEEXITPOINT(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NETRDFSCREATEEXITPOINT(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NETRDFSCREATEEXITPOINT *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -2217,7 +2236,7 @@ static WERROR srvsvc_NETRDFSCREATEEXITPOINT(struct dcesrv_call_state *dce_call,
 /* 
   srvsvc_NETRDFSDELETEEXITPOINT 
 */
-static WERROR srvsvc_NETRDFSDELETEEXITPOINT(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NETRDFSDELETEEXITPOINT(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NETRDFSDELETEEXITPOINT *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -2227,7 +2246,7 @@ static WERROR srvsvc_NETRDFSDELETEEXITPOINT(struct dcesrv_call_state *dce_call,
 /* 
   srvsvc_NETRDFSMODIFYPREFIX 
 */
-static WERROR srvsvc_NETRDFSMODIFYPREFIX(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NETRDFSMODIFYPREFIX(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NETRDFSMODIFYPREFIX *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -2237,7 +2256,7 @@ static WERROR srvsvc_NETRDFSMODIFYPREFIX(struct dcesrv_call_state *dce_call, TAL
 /* 
   srvsvc_NETRDFSFIXLOCALVOLUME 
 */
-static WERROR srvsvc_NETRDFSFIXLOCALVOLUME(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NETRDFSFIXLOCALVOLUME(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NETRDFSFIXLOCALVOLUME *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -2247,7 +2266,7 @@ static WERROR srvsvc_NETRDFSFIXLOCALVOLUME(struct dcesrv_call_state *dce_call, T
 /* 
   srvsvc_NETRDFSMANAGERREPORTSITEINFO 
 */
-static WERROR srvsvc_NETRDFSMANAGERREPORTSITEINFO(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NETRDFSMANAGERREPORTSITEINFO(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NETRDFSMANAGERREPORTSITEINFO *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -2257,7 +2276,7 @@ static WERROR srvsvc_NETRDFSMANAGERREPORTSITEINFO(struct dcesrv_call_state *dce_
 /* 
   srvsvc_NETRSERVERTRANSPORTDELEX 
 */
-static WERROR srvsvc_NETRSERVERTRANSPORTDELEX(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NETRSERVERTRANSPORTDELEX(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NETRSERVERTRANSPORTDELEX *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -2266,7 +2285,7 @@ static WERROR srvsvc_NETRSERVERTRANSPORTDELEX(struct dcesrv_call_state *dce_call
 /* 
   srvsvc_NetShareDel 
 */
-static WERROR srvsvc_NetShareDel(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetShareDel(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetShareDel *r)
 {
        NTSTATUS nterr;
@@ -2288,7 +2307,7 @@ static WERROR srvsvc_NetShareDel(struct dcesrv_call_state *dce_call, TALLOC_CTX
 /* 
   srvsvc_NetSetServiceBits 
 */
-static WERROR srvsvc_NetSetServiceBits(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NetSetServiceBits(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetSetServiceBits *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -2297,7 +2316,7 @@ static WERROR srvsvc_NetSetServiceBits(struct dcesrv_call_state *dce_call, TALLO
 /* 
   srvsvc_NETRPRNAMECANONICALIZE 
 */
-static WERROR srvsvc_NETRPRNAMECANONICALIZE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_srvsvc_NETRPRNAMECANONICALIZE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NETRPRNAMECANONICALIZE *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);