s4:rpc_server/srvsvc: make use dcesrv_call_session_info()
[samba.git] / source4 / rpc_server / srvsvc / dcesrv_srvsvc.c
index b4e08896e5f2068568fecbf5ed4d8b343786f7bb..09673f6345cdcfd6f3fb35fb61ec51cab0d26059 100644 (file)
@@ -24,7 +24,7 @@
 #include "rpc_server/dcerpc_server.h"
 #include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "rpc_server/common/common.h"
-#include "rpc_server/common/proto.h"
+#include "rpc_server/common/share.h"
 #include "auth/auth.h"
 #include "libcli/security/security.h"
 #include "system/time.h"
 #include "param/param.h"
 
 #define SRVSVC_CHECK_ADMIN_ACCESS do { \
-       struct security_token *t = dce_call->conn->auth_state.session_info->security_token; \
+       struct auth_session_info *si = dcesrv_call_session_info(dce_call); \
+       struct security_token *t = si->security_token; \
        if (!security_token_has_builtin_administrators(t) && \
-           !security_token_has_sid_string(t, SID_BUILTIN_SERVER_OPERATORS)) { \
+           !security_token_has_sid(t, &global_sid_Builtin_Server_Operators)) { \
                return WERR_ACCESS_DENIED; \
        } \
 } while (0)
@@ -67,10 +68,8 @@ static WERROR dcesrv_srvsvc_NetCharDevEnum(struct dcesrv_call_state *dce_call, T
                return WERR_NOT_SUPPORTED;
 
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
-
-       return WERR_OK;
 }
 
 
@@ -92,10 +91,8 @@ static WERROR dcesrv_srvsvc_NetCharDevGetInfo(struct dcesrv_call_state *dce_call
                return WERR_NOT_SUPPORTED;
        }
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
-
-       return WERR_UNKNOWN_LEVEL;
 }
 
 
@@ -139,10 +136,8 @@ static WERROR dcesrv_srvsvc_NetCharDevQEnum(struct dcesrv_call_state *dce_call,
                return WERR_NOT_SUPPORTED;
        }
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
-
-       return WERR_UNKNOWN_LEVEL;
 }
 
 
@@ -164,10 +159,8 @@ static WERROR dcesrv_srvsvc_NetCharDevQGetInfo(struct dcesrv_call_state *dce_cal
                return WERR_NOT_SUPPORTED;
        }
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
-
-       return WERR_UNKNOWN_LEVEL;
 }
 
 
@@ -193,10 +186,8 @@ static WERROR dcesrv_srvsvc_NetCharDevQSetInfo(struct dcesrv_call_state *dce_cal
                return WERR_NOT_SUPPORTED;
        }
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
-
-       return WERR_UNKNOWN_LEVEL;
 }
 
 
@@ -250,10 +241,8 @@ static WERROR dcesrv_srvsvc_NetConnEnum(struct dcesrv_call_state *dce_call, TALL
                return WERR_NOT_SUPPORTED;
        }
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
-
-       return WERR_UNKNOWN_LEVEL;
 }
 
 
@@ -287,10 +276,8 @@ static WERROR dcesrv_srvsvc_NetFileEnum(struct dcesrv_call_state *dce_call, TALL
                return WERR_NOT_SUPPORTED;
        }
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
-
-       return WERR_UNKNOWN_LEVEL;
 }
 
 
@@ -312,10 +299,8 @@ static WERROR dcesrv_srvsvc_NetFileGetInfo(struct dcesrv_call_state *dce_call, T
                return WERR_NOT_SUPPORTED;
        }
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
-
-       return WERR_UNKNOWN_LEVEL;
 }
 
 
@@ -389,10 +374,8 @@ static WERROR dcesrv_srvsvc_NetSessEnum(struct dcesrv_call_state *dce_call, TALL
                return WERR_NOT_SUPPORTED;
        }
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
-
-       return WERR_UNKNOWN_LEVEL;
 }
 
 
@@ -432,10 +415,10 @@ static WERROR dcesrv_srvsvc_NetShareAdd(struct dcesrv_call_state *dce_call, TALL
                NTSTATUS nterr;
                struct share_info *info;
                struct share_context *sctx;
-               int count = 8;
-               int i;
+               unsigned int count = 8;
+               unsigned int i;
 
-               nterr = share_get_context_by_name(mem_ctx, lp_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
+               nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
                if (!NT_STATUS_IS_OK(nterr)) {
                        return ntstatus_to_werror(nterr);
                }
@@ -449,17 +432,17 @@ static WERROR dcesrv_srvsvc_NetShareAdd(struct dcesrv_call_state *dce_call, TALL
                info[i].name = SHARE_TYPE;
                info[i].type = SHARE_INFO_STRING;
                switch (r->in.info->info2->type) {
-               case 0x00:
+               case STYPE_DISKTREE:
                        info[i].value = talloc_strdup(info, "DISK");
                        break;
-               case 0x01:
+               case STYPE_PRINTQ:
                        info[i].value = talloc_strdup(info, "PRINTER");
                        break;
-               case 0x03:
+               case STYPE_IPC:
                        info[i].value = talloc_strdup(info, "IPC");
                        break;
                default:
-                       return WERR_INVALID_PARAM;
+                       return WERR_INVALID_PARAMETER;
                }
                W_ERROR_HAVE_NO_MEMORY(info[i].value);
                i++;
@@ -530,10 +513,10 @@ static WERROR dcesrv_srvsvc_NetShareAdd(struct dcesrv_call_state *dce_call, TALL
                NTSTATUS nterr;
                struct share_info *info;
                struct share_context *sctx;
-               int count = 10;
-               int i;
+               unsigned int count = 10;
+               unsigned int i;
 
-               nterr = share_get_context_by_name(mem_ctx, lp_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
+               nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
                if (!NT_STATUS_IS_OK(nterr)) {
                        return ntstatus_to_werror(nterr);
                }
@@ -557,7 +540,7 @@ static WERROR dcesrv_srvsvc_NetShareAdd(struct dcesrv_call_state *dce_call, TALL
                        info[i].value = talloc_strdup(info, "IPC");
                        break;
                default:
-                       return WERR_INVALID_PARAM;
+                       return WERR_INVALID_PARAMETER;
                }
                W_ERROR_HAVE_NO_MEMORY(info[i].value);
                i++;
@@ -617,10 +600,8 @@ static WERROR dcesrv_srvsvc_NetShareAdd(struct dcesrv_call_state *dce_call, TALL
                return WERR_OK;
        }
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
-
-       return WERR_UNKNOWN_LEVEL;
 }
 
 static WERROR dcesrv_srvsvc_fiel_ShareInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
@@ -642,7 +623,7 @@ static WERROR dcesrv_srvsvc_fiel_ShareInfo(struct dcesrv_call_state *dce_call, T
                info->info1->name       = talloc_strdup(mem_ctx, scfg->name);
                W_ERROR_HAVE_NO_MEMORY(info->info1->name);
                info->info1->type       = dcesrv_common_get_share_type(mem_ctx, dce_ctx, scfg);
-               info->info1->comment    = talloc_strdup(mem_ctx, share_string_option(scfg, SHARE_COMMENT, ""));
+               info->info1->comment    = share_string_option(mem_ctx, scfg, SHARE_COMMENT, "");
                W_ERROR_HAVE_NO_MEMORY(info->info1->comment);
 
                return WERR_OK;
@@ -652,14 +633,14 @@ static WERROR dcesrv_srvsvc_fiel_ShareInfo(struct dcesrv_call_state *dce_call, T
                info->info2->name               = talloc_strdup(mem_ctx, scfg->name);
                W_ERROR_HAVE_NO_MEMORY(info->info2->name);
                info->info2->type               = dcesrv_common_get_share_type(mem_ctx, dce_ctx, scfg);
-               info->info2->comment            = talloc_strdup(mem_ctx, share_string_option(scfg, SHARE_COMMENT, ""));
+               info->info2->comment            = share_string_option(mem_ctx, scfg, SHARE_COMMENT, "");
                W_ERROR_HAVE_NO_MEMORY(info->info2->comment);
                info->info2->permissions        = dcesrv_common_get_share_permissions(mem_ctx, dce_ctx, scfg);
                info->info2->max_users          = share_int_option(scfg, SHARE_MAX_CONNECTIONS, SHARE_MAX_CONNECTIONS_DEFAULT);
                info->info2->current_users      = dcesrv_common_get_share_current_users(mem_ctx, dce_ctx, scfg);
                info->info2->path               = dcesrv_common_get_share_path(mem_ctx, dce_ctx, scfg);
                W_ERROR_HAVE_NO_MEMORY(info->info2->path);
-               info->info2->password           = talloc_strdup(mem_ctx, share_string_option(scfg, SHARE_PASSWORD, NULL));
+               info->info2->password           = share_string_option(mem_ctx, scfg, SHARE_PASSWORD, NULL);
 
                return WERR_OK;
        }
@@ -668,7 +649,7 @@ static WERROR dcesrv_srvsvc_fiel_ShareInfo(struct dcesrv_call_state *dce_call, T
                info->info501->name             = talloc_strdup(mem_ctx, scfg->name);
                W_ERROR_HAVE_NO_MEMORY(info->info501->name);
                info->info501->type             = dcesrv_common_get_share_type(mem_ctx, dce_ctx, scfg);
-               info->info501->comment          = talloc_strdup(mem_ctx, share_string_option(scfg, SHARE_COMMENT, ""));
+               info->info501->comment          = share_string_option(mem_ctx, scfg, SHARE_COMMENT, "");
                W_ERROR_HAVE_NO_MEMORY(info->info501->comment);
                info->info501->csc_policy       = share_int_option(scfg, SHARE_CSC_POLICY, SHARE_CSC_POLICY_DEFAULT);
 
@@ -679,14 +660,14 @@ static WERROR dcesrv_srvsvc_fiel_ShareInfo(struct dcesrv_call_state *dce_call, T
                info->info502->name             = talloc_strdup(mem_ctx, scfg->name);
                W_ERROR_HAVE_NO_MEMORY(info->info502->name);
                info->info502->type             = dcesrv_common_get_share_type(mem_ctx, dce_ctx, scfg);
-               info->info502->comment          = talloc_strdup(mem_ctx, share_string_option(scfg, SHARE_COMMENT, ""));
+               info->info502->comment          = share_string_option(mem_ctx, scfg, SHARE_COMMENT, "");
                W_ERROR_HAVE_NO_MEMORY(info->info502->comment);
                info->info502->permissions      = dcesrv_common_get_share_permissions(mem_ctx, dce_ctx, scfg);
                info->info502->max_users        = share_int_option(scfg, SHARE_MAX_CONNECTIONS, SHARE_MAX_CONNECTIONS_DEFAULT);
                info->info502->current_users    = dcesrv_common_get_share_current_users(mem_ctx, dce_ctx, scfg);
                info->info502->path             = dcesrv_common_get_share_path(mem_ctx, dce_ctx, scfg);
                W_ERROR_HAVE_NO_MEMORY(info->info502->path);
-               info->info502->password         = talloc_strdup(mem_ctx, share_string_option(scfg, SHARE_PASSWORD, NULL));
+               info->info502->password         = share_string_option(mem_ctx, scfg, SHARE_PASSWORD, NULL);
                info->info502->sd_buf.sd        = dcesrv_common_get_security_descriptor(mem_ctx, dce_ctx, scfg);
 
                return WERR_OK;
@@ -698,10 +679,8 @@ static WERROR dcesrv_srvsvc_fiel_ShareInfo(struct dcesrv_call_state *dce_call, T
                return WERR_OK;
        }
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
-
-       return WERR_UNKNOWN_LEVEL;
 }
 
 /* 
@@ -721,7 +700,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call,
        /* TODO: - paging of results 
         */
 
-       nterr = share_get_context_by_name(mem_ctx, lp_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
+       nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
        if (!NT_STATUS_IS_OK(nterr)) {
                return ntstatus_to_werror(nterr);
        }
@@ -734,7 +713,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call,
        switch (r->in.info_ctr->level) {
        case 0:
        {
-               int i;
+               unsigned int i;
                struct srvsvc_NetShareCtr0 *ctr0;
 
                ctr0 = talloc(mem_ctx, struct srvsvc_NetShareCtr0);
@@ -758,7 +737,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call,
                        nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg);
                        if (!NT_STATUS_IS_OK(nterr)) {
                                DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i]));
-                               return WERR_GENERAL_FAILURE;
+                               return WERR_GEN_FAILURE;
                        }
                        info.info0 = &ctr0->array[i];
                        status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.info_ctr->level, &info);
@@ -775,7 +754,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call,
        }
        case 1:
        {
-               int i;
+               unsigned int i;
                struct srvsvc_NetShareCtr1 *ctr1;
 
                ctr1 = talloc(mem_ctx, struct srvsvc_NetShareCtr1);
@@ -799,7 +778,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call,
                        nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg);
                        if (!NT_STATUS_IS_OK(nterr)) {
                                DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i]));
-                               return WERR_GENERAL_FAILURE;
+                               return WERR_GEN_FAILURE;
                        }
                        info.info1 = &ctr1->array[i];
                        status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.info_ctr->level, &info);
@@ -817,7 +796,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call,
        }
        case 2:
        {
-               int i;
+               unsigned int i;
                struct srvsvc_NetShareCtr2 *ctr2;
 
                SRVSVC_CHECK_ADMIN_ACCESS;
@@ -843,7 +822,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call,
                        nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg);
                        if (!NT_STATUS_IS_OK(nterr)) {
                                DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i]));
-                               return WERR_GENERAL_FAILURE;
+                               return WERR_GEN_FAILURE;
                        }
                        info.info2 = &ctr2->array[i];
                        status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.info_ctr->level, &info);
@@ -861,7 +840,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call,
        }
        case 501:
        {
-               int i;
+               unsigned int i;
                struct srvsvc_NetShareCtr501 *ctr501;
 
                SRVSVC_CHECK_ADMIN_ACCESS;
@@ -887,7 +866,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call,
                        nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg);
                        if (!NT_STATUS_IS_OK(nterr)) {
                                DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i]));
-                               return WERR_GENERAL_FAILURE;
+                               return WERR_GEN_FAILURE;
                        }
                        info.info501 = &ctr501->array[i];
                        status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.info_ctr->level, &info);
@@ -905,7 +884,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call,
        }
        case 502:
        {
-               int i;
+               unsigned int i;
                struct srvsvc_NetShareCtr502 *ctr502;
 
                SRVSVC_CHECK_ADMIN_ACCESS;
@@ -931,7 +910,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call,
                        nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg);
                        if (!NT_STATUS_IS_OK(nterr)) {
                                DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i]));
-                               return WERR_GENERAL_FAILURE;
+                               return WERR_GEN_FAILURE;
                        }
                        info.info502 = &ctr502->array[i];
                        status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.info_ctr->level, &info);
@@ -948,10 +927,8 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call,
                return WERR_OK;
        }
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
-
-       return WERR_UNKNOWN_LEVEL;
 }
 
 
@@ -971,10 +948,10 @@ static WERROR dcesrv_srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call,
         */
 
        if (strcmp("", r->in.share_name) == 0) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
-       nterr = share_get_context_by_name(mem_ctx, lp_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
+       nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
        if (!NT_STATUS_IS_OK(nterr)) {
                return ntstatus_to_werror(nterr);
        }
@@ -1086,10 +1063,8 @@ static WERROR dcesrv_srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call,
                return WERR_OK;
        }
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
-
-       return WERR_UNKNOWN_LEVEL;
 }
 
 static WERROR dcesrv_srvsvc_fill_share_info(struct share_info *info, int *count,
@@ -1103,7 +1078,7 @@ static WERROR dcesrv_srvsvc_fill_share_info(struct share_info *info, int *count,
                                        uint32_t csc_policy,
                                        struct security_descriptor *sd)
 {
-       int i = 0;
+       unsigned int i = 0;
 
        if (level == 501) {
                info[i].name = SHARE_CSC_POLICY;
@@ -1153,6 +1128,7 @@ static WERROR dcesrv_srvsvc_fill_share_info(struct share_info *info, int *count,
                *((int *)info[i].value) = max_users;
                i++;
 
+               FALL_THROUGH;
        case 501:
        case 1:
                info[i].name = SHARE_TYPE;
@@ -1168,11 +1144,12 @@ static WERROR dcesrv_srvsvc_fill_share_info(struct share_info *info, int *count,
                        info[i].value = talloc_strdup(info, "IPC");
                        break;
                default:
-                       return WERR_INVALID_PARAM;
+                       return WERR_INVALID_PARAMETER;
                }
                W_ERROR_HAVE_NO_MEMORY(info[i].value);
                i++;
 
+               FALL_THROUGH;
        case 1004:
                if (comment) {
                        info[i].name = SHARE_COMMENT;
@@ -1182,6 +1159,8 @@ static WERROR dcesrv_srvsvc_fill_share_info(struct share_info *info, int *count,
 
                        i++;
                }
+
+               FALL_THROUGH;
        case 0:
                if (name &&
                    strcasecmp(share_name, name) != 0) {
@@ -1195,7 +1174,7 @@ static WERROR dcesrv_srvsvc_fill_share_info(struct share_info *info, int *count,
                break;
 
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
 
        *count = i;
@@ -1222,13 +1201,11 @@ static WERROR dcesrv_srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call,
        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;
+               return WERR_INVALID_PARAMETER;
        }
 
-       nterr = share_get_context_by_name(mem_ctx, lp_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
+       nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
        if (!NT_STATUS_IS_OK(nterr)) {
                return ntstatus_to_werror(nterr);
        }
@@ -1246,7 +1223,7 @@ static WERROR dcesrv_srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call,
                                        0,
                                        0,
                                        NULL);
-               if (W_ERROR_EQUAL(status, WERR_OK)) {
+               if (!W_ERROR_EQUAL(status, WERR_OK)) {
                        return status;
                }
                break;
@@ -1263,7 +1240,7 @@ static WERROR dcesrv_srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call,
                                        0,
                                        0,
                                        NULL);
-               if (W_ERROR_EQUAL(status, WERR_OK)) {
+               if (!W_ERROR_EQUAL(status, WERR_OK)) {
                        return status;
                }
                break;
@@ -1280,7 +1257,7 @@ static WERROR dcesrv_srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call,
                                        r->in.info->info2->max_users,
                                        0,
                                        NULL);
-               if (W_ERROR_EQUAL(status, WERR_OK)) {
+               if (!W_ERROR_EQUAL(status, WERR_OK)) {
                        return status;
                }
                break;
@@ -1297,7 +1274,7 @@ static WERROR dcesrv_srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call,
                                        0,
                                        r->in.info->info501->csc_policy,
                                        NULL);
-               if (W_ERROR_EQUAL(status, WERR_OK)) {
+               if (!W_ERROR_EQUAL(status, WERR_OK)) {
                        return status;
                }
                break;
@@ -1314,7 +1291,7 @@ static WERROR dcesrv_srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call,
                                        r->in.info->info502->max_users,
                                        0,
                                        r->in.info->info502->sd_buf.sd);
-               if (W_ERROR_EQUAL(status, WERR_OK)) {
+               if (!W_ERROR_EQUAL(status, WERR_OK)) {
                        return status;
                }
                break;
@@ -1331,7 +1308,7 @@ static WERROR dcesrv_srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call,
                                        0,
                                        0,
                                        NULL);
-               if (W_ERROR_EQUAL(status, WERR_OK)) {
+               if (!W_ERROR_EQUAL(status, WERR_OK)) {
                        return status;
                }
                break;
@@ -1347,7 +1324,7 @@ static WERROR dcesrv_srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call,
                return WERR_OK;
        }
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
 
        nterr = share_set(sctx, r->in.share_name, info, count);
@@ -1384,7 +1361,8 @@ static WERROR dcesrv_srvsvc_NetShareCheck(struct dcesrv_call_state *dce_call, TA
        struct share_config *scfg = NULL;
        char *device;
        const char **names;
-       int count, i;
+       int count;
+       int i;
 
        *r->out.type = 0;
 
@@ -1401,11 +1379,11 @@ static WERROR dcesrv_srvsvc_NetShareCheck(struct dcesrv_call_state *dce_call, TA
                device = talloc_strdup(mem_ctx, &r->in.device_name[2]);
        } else {
                /* no chance we have a share that doesn't start with C:\ */
-               return WERR_DEVICE_NOT_SHARED;
+               return WERR_NERR_DEVICENOTSHARED;
        }
        all_string_sub(device, "\\", "/", 0);
 
-       nterr = share_get_context_by_name(mem_ctx, lp_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
+       nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
        if (!NT_STATUS_IS_OK(nterr)) {
                return ntstatus_to_werror(nterr);
        }
@@ -1423,11 +1401,11 @@ static WERROR dcesrv_srvsvc_NetShareCheck(struct dcesrv_call_state *dce_call, TA
                if (!NT_STATUS_IS_OK(nterr)) {
                        return ntstatus_to_werror(nterr);
                }
-               path = share_string_option(scfg, SHARE_PATH, NULL);
+               path = share_string_option(mem_ctx, scfg, SHARE_PATH, NULL);
                if (!path) continue;
 
-               if (strcmp(device, path) == 0) {                
-                       type = share_string_option(scfg, SHARE_TYPE, NULL);
+               if (strcmp(device, path) == 0) {
+                       type = share_string_option(mem_ctx, scfg, SHARE_TYPE, NULL);
                        if (!type) continue;
 
                        if (strcmp(type, "DISK") == 0) {
@@ -1447,7 +1425,7 @@ static WERROR dcesrv_srvsvc_NetShareCheck(struct dcesrv_call_state *dce_call, TA
                }
        }
 
-       return WERR_DEVICE_NOT_SHARED;
+       return WERR_NERR_DEVICENOTSHARED;
 }
 
 
@@ -1458,6 +1436,7 @@ static WERROR dcesrv_srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TA
                       struct srvsvc_NetSrvGetInfo *r)
 {
        struct dcesrv_context *dce_ctx = dce_call->conn->dce_ctx;
+       struct dcerpc_server_info *server_info = lpcfg_dcerpc_server_info(mem_ctx, dce_ctx->lp_ctx);
 
        ZERO_STRUCTP(r->out.info);
 
@@ -1487,10 +1466,10 @@ static WERROR dcesrv_srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TA
                info101->server_name    = dcesrv_common_get_server_name(mem_ctx, dce_ctx, r->in.server_unc);
                W_ERROR_HAVE_NO_MEMORY(info101->server_name);
 
-               info101->version_major  = dcesrv_common_get_version_major(mem_ctx, dce_ctx->lp_ctx);
-               info101->version_minor  = dcesrv_common_get_version_minor(mem_ctx, dce_ctx->lp_ctx);
+               info101->version_major  = server_info->version_major;
+               info101->version_minor  = server_info->version_minor;
                info101->server_type    = dcesrv_common_get_server_type(mem_ctx, dce_call->event_ctx, dce_ctx);
-               info101->comment        = talloc_strdup(mem_ctx, lp_serverstring(dce_ctx->lp_ctx));
+               info101->comment        = lpcfg_server_string(dce_ctx->lp_ctx, mem_ctx);
                W_ERROR_HAVE_NO_MEMORY(info101->comment);
 
                r->out.info->info101 = info101;
@@ -1507,10 +1486,10 @@ static WERROR dcesrv_srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TA
                info102->server_name    = dcesrv_common_get_server_name(mem_ctx, dce_ctx, r->in.server_unc);
                W_ERROR_HAVE_NO_MEMORY(info102->server_name);
 
-               info102->version_major  = dcesrv_common_get_version_major(mem_ctx, dce_ctx->lp_ctx);
-               info102->version_minor  = dcesrv_common_get_version_minor(mem_ctx, dce_ctx->lp_ctx);
+               info102->version_major  = server_info->version_major;
+               info102->version_minor  = server_info->version_minor;
                info102->server_type    = dcesrv_common_get_server_type(mem_ctx, dce_call->event_ctx, dce_ctx);
-               info102->comment        = talloc_strdup(mem_ctx, lp_serverstring(dce_ctx->lp_ctx));
+               info102->comment        = lpcfg_server_string(dce_ctx->lp_ctx, mem_ctx);
                W_ERROR_HAVE_NO_MEMORY(info102->comment);
 
                info102->users          = dcesrv_common_get_users(mem_ctx, dce_ctx);
@@ -1526,10 +1505,8 @@ static WERROR dcesrv_srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TA
                return WERR_OK;
        }
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
-
-       return WERR_UNKNOWN_LEVEL;
 }
 
 
@@ -1574,10 +1551,8 @@ static WERROR dcesrv_srvsvc_NetDiskEnum(struct dcesrv_call_state *dce_call, TALL
                return WERR_OK;
        }
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
-
-       return WERR_UNKNOWN_LEVEL;
 }
 
 
@@ -1655,10 +1630,8 @@ static WERROR dcesrv_srvsvc_NetTransportEnum(struct dcesrv_call_state *dce_call,
                return WERR_NOT_SUPPORTED;
        }
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
-
-       return WERR_UNKNOWN_LEVEL;
 }
 
 /* 
@@ -1785,10 +1758,8 @@ static WERROR dcesrv_srvsvc_NetNameValidate(struct dcesrv_call_state *dce_call,
        case 13:
                return WERR_NOT_SUPPORTED;
        default:
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
-
-       return WERR_INVALID_PARAM;
 }
 
 
@@ -1820,7 +1791,7 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL
        /* TODO: - paging of results 
         */
 
-       nterr = share_get_context_by_name(mem_ctx, lp_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
+       nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
        if (!NT_STATUS_IS_OK(nterr)) {
                return ntstatus_to_werror(nterr);
        }
@@ -1833,8 +1804,8 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL
        switch (r->in.info_ctr->level) {
        case 0:
        {
-               int i, y = 0;
-               int count;
+               unsigned int i, y = 0;
+               unsigned int count;
                struct srvsvc_NetShareCtr0 *ctr0;
 
                ctr0 = talloc(mem_ctx, struct srvsvc_NetShareCtr0);
@@ -1860,7 +1831,7 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL
                        nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg);
                        if (!NT_STATUS_IS_OK(nterr)) {
                                DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i]));
-                               return WERR_GENERAL_FAILURE;
+                               return WERR_GEN_FAILURE;
                        }
                        
                        type = dcesrv_common_get_share_type(mem_ctx, dce_ctx, scfg);
@@ -1885,8 +1856,8 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL
        }
        case 1:
        {
-               int i, y = 0;
-               int count;
+               unsigned int i, y = 0;
+               unsigned int count;
                struct srvsvc_NetShareCtr1 *ctr1;
 
                ctr1 = talloc(mem_ctx, struct srvsvc_NetShareCtr1);
@@ -1912,7 +1883,7 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL
                        nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg);
                        if (!NT_STATUS_IS_OK(nterr)) {
                                DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i]));
-                               return WERR_GENERAL_FAILURE;
+                               return WERR_GEN_FAILURE;
                        }
 
                        type = dcesrv_common_get_share_type(mem_ctx, dce_ctx, scfg);
@@ -1937,8 +1908,8 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL
        }
        case 2:
        {
-               int i, y = 0;
-               int count;
+               unsigned int i, y = 0;
+               unsigned int count;
                struct srvsvc_NetShareCtr2 *ctr2;
 
                SRVSVC_CHECK_ADMIN_ACCESS;
@@ -1966,7 +1937,7 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL
                        nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg);
                        if (!NT_STATUS_IS_OK(nterr)) {
                                DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i]));
-                               return WERR_GENERAL_FAILURE;
+                               return WERR_GEN_FAILURE;
                        }
 
                        type = dcesrv_common_get_share_type(mem_ctx, dce_ctx, scfg);
@@ -1991,8 +1962,8 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL
        }
        case 502:
        {
-               int i, y = 0;
-               int count;
+               unsigned int i, y = 0;
+               unsigned int count;
                struct srvsvc_NetShareCtr502 *ctr502;
 
                SRVSVC_CHECK_ADMIN_ACCESS;
@@ -2020,7 +1991,7 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL
                        nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg);
                        if (!NT_STATUS_IS_OK(nterr)) {
                                DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i]));
-                               return WERR_GENERAL_FAILURE;
+                               return WERR_GEN_FAILURE;
                        }
 
                        type = dcesrv_common_get_share_type(mem_ctx, dce_ctx, scfg);
@@ -2044,10 +2015,8 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL
                return WERR_OK;
        }
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
-
-       return WERR_UNKNOWN_LEVEL;
 }
 
 
@@ -2077,6 +2046,8 @@ static WERROR dcesrv_srvsvc_NetShareDelCommit(struct dcesrv_call_state *dce_call
 static WERROR dcesrv_srvsvc_NetGetFileSecurity(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetGetFileSecurity *r)
 {
+       struct auth_session_info *session_info =
+               dcesrv_call_session_info(dce_call);
        struct sec_desc_buf *sd_buf;
        struct ntvfs_context *ntvfs_ctx = NULL;
        struct ntvfs_request *ntvfs_req;
@@ -2087,7 +2058,7 @@ static WERROR dcesrv_srvsvc_NetGetFileSecurity(struct dcesrv_call_state *dce_cal
        if (!NT_STATUS_IS_OK(nt_status)) return ntstatus_to_werror(nt_status);
 
        ntvfs_req = ntvfs_request_create(ntvfs_ctx, mem_ctx,
-                                        dce_call->conn->auth_state.session_info,
+                                        session_info,
                                         0,
                                         dce_call->time,
                                         NULL, NULL, 0);
@@ -2119,6 +2090,8 @@ static WERROR dcesrv_srvsvc_NetGetFileSecurity(struct dcesrv_call_state *dce_cal
 static WERROR dcesrv_srvsvc_NetSetFileSecurity(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct srvsvc_NetSetFileSecurity *r)
 {
+       struct auth_session_info *session_info =
+               dcesrv_call_session_info(dce_call);
        struct ntvfs_context *ntvfs_ctx;
        struct ntvfs_request *ntvfs_req;
        union smb_setfileinfo *io;
@@ -2128,7 +2101,7 @@ static WERROR dcesrv_srvsvc_NetSetFileSecurity(struct dcesrv_call_state *dce_cal
        if (!NT_STATUS_IS_OK(nt_status)) return ntstatus_to_werror(nt_status);
 
        ntvfs_req = ntvfs_request_create(ntvfs_ctx, mem_ctx,
-                                        dce_call->conn->auth_state.session_info,
+                                        session_info,
                                         0,
                                         dce_call->time,
                                         NULL, NULL, 0);
@@ -2137,7 +2110,7 @@ static WERROR dcesrv_srvsvc_NetSetFileSecurity(struct dcesrv_call_state *dce_cal
        io = talloc(mem_ctx, union smb_setfileinfo);
        W_ERROR_HAVE_NO_MEMORY(io);
 
-       io->set_secdesc.level                   = RAW_FILEINFO_SEC_DESC;
+       io->set_secdesc.level                   = RAW_SFILEINFO_SEC_DESC;
        io->set_secdesc.in.file.path            = r->in.file;
        io->set_secdesc.in.secinfo_flags        = r->in.securityinformation;
        io->set_secdesc.in.sd                   = r->in.sd_buf->sd;
@@ -2287,7 +2260,7 @@ static WERROR dcesrv_srvsvc_NetShareDel(struct dcesrv_call_state *dce_call, TALL
        NTSTATUS nterr;
        struct share_context *sctx;
                
-       nterr = share_get_context_by_name(mem_ctx, lp_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
+       nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
        if (!NT_STATUS_IS_OK(nterr)) {
                return ntstatus_to_werror(nterr);
        }