From 0b484e684ab3181eedbb1bdc18dd750c712bb16e Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 28 Aug 2008 01:01:11 +0200 Subject: netapi: add NetShareAdd skeleton. Guenther (This used to be commit 6e22bcc1f5cba9bc37ecf193bbc7e031b69134f5) --- source3/lib/netapi/share.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 source3/lib/netapi/share.c (limited to 'source3/lib/netapi/share.c') diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c new file mode 100644 index 0000000000..182330b0d6 --- /dev/null +++ b/source3/lib/netapi/share.c @@ -0,0 +1,43 @@ +/* + * Unix SMB/CIFS implementation. + * NetApi Share Support + * Copyright (C) Guenther Deschner 2008 + * + * 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 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#include "includes.h" + +#include "librpc/gen_ndr/libnetapi.h" +#include "lib/netapi/netapi.h" +#include "lib/netapi/netapi_private.h" +#include "lib/netapi/libnetapi.h" + +/**************************************************************** +****************************************************************/ + +WERROR NetShareAdd_r(struct libnetapi_ctx *ctx, + struct NetShareAdd *r) +{ + return WERR_NOT_SUPPORTED; +} + +/**************************************************************** +****************************************************************/ + +WERROR NetShareAdd_l(struct libnetapi_ctx *ctx, + struct NetShareAdd *r) +{ + LIBNETAPI_REDIRECT_TO_LOCALHOST(ctx, r, NetShareAdd); +} -- cgit From 0e37e225fd276b6126268f83842cc271f76653b5 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 28 Aug 2008 01:02:01 +0200 Subject: netapi: implement NetShareAdd_r. Guenther (This used to be commit d430d2fbd8746c8bcdb16e027d45a939c4976524) --- source3/lib/netapi/share.c | 92 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) (limited to 'source3/lib/netapi/share.c') diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c index 182330b0d6..3b99a8d291 100644 --- a/source3/lib/netapi/share.c +++ b/source3/lib/netapi/share.c @@ -27,10 +27,100 @@ /**************************************************************** ****************************************************************/ +static NTSTATUS map_SHARE_INFO_buffer_to_srvsvc_share_info(TALLOC_CTX *mem_ctx, + uint8_t *buffer, + uint32_t level, + union srvsvc_NetShareInfo *info) +{ + struct SHARE_INFO_2 *i2 = NULL; + struct srvsvc_NetShareInfo2 *s2 = NULL; + + if (!buffer) { + return NT_STATUS_INVALID_PARAMETER; + } + + switch (level) { + case 2: + i2 = (struct SHARE_INFO_2 *)buffer; + + s2 = TALLOC_P(mem_ctx, struct srvsvc_NetShareInfo2); + NT_STATUS_HAVE_NO_MEMORY(s2); + + s2->name = i2->shi2_netname; + s2->type = i2->shi2_type; + s2->comment = i2->shi2_remark; + s2->permissions = i2->shi2_permissions; + s2->max_users = i2->shi2_max_uses; + s2->current_users = i2->shi2_current_uses; + s2->path = i2->shi2_path; + s2->password = i2->shi2_passwd; + + info->info2 = s2; + + break; + default: + return NT_STATUS_INVALID_PARAMETER; + } + + return NT_STATUS_OK; +} + +/**************************************************************** +****************************************************************/ + WERROR NetShareAdd_r(struct libnetapi_ctx *ctx, struct NetShareAdd *r) { - return WERR_NOT_SUPPORTED; + WERROR werr; + NTSTATUS status; + struct cli_state *cli = NULL; + struct rpc_pipe_client *pipe_cli = NULL; + union srvsvc_NetShareInfo info; + + if (!r->in.buffer) { + return WERR_INVALID_PARAM; + } + + switch (r->in.level) { + case 2: + break; + default: + return WERR_UNKNOWN_LEVEL; + } + + werr = libnetapi_open_pipe(ctx, r->in.server_name, + &ndr_table_srvsvc.syntax_id, + &cli, + &pipe_cli); + if (!W_ERROR_IS_OK(werr)) { + goto done; + } + + status = map_SHARE_INFO_buffer_to_srvsvc_share_info(ctx, + r->in.buffer, + r->in.level, + &info); + if (!NT_STATUS_IS_OK(status)) { + werr = ntstatus_to_werror(status); + goto done; + } + + status = rpccli_srvsvc_NetShareAdd(pipe_cli, ctx, + r->in.server_name, + r->in.level, + &info, + r->out.parm_err, + &werr); + if (!W_ERROR_IS_OK(werr)) { + goto done; + } + + done: + if (!cli) { + return werr; + } + + return werr; } /**************************************************************** -- cgit From 7850c90d2d3c38a7b22e63d3d85e0bd31af1620d Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 4 Sep 2008 20:23:39 +0200 Subject: netapi: fix return code in NetShareAdd_r. Guenther (This used to be commit 69e6532e9d3fad9d1c55e33cf5f120ca8b4b8d51) --- source3/lib/netapi/share.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/lib/netapi/share.c') diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c index 3b99a8d291..9983471328 100644 --- a/source3/lib/netapi/share.c +++ b/source3/lib/netapi/share.c @@ -84,6 +84,9 @@ WERROR NetShareAdd_r(struct libnetapi_ctx *ctx, switch (r->in.level) { case 2: break; + case 502: + case 503: + return WERR_NOT_SUPPORTED; default: return WERR_UNKNOWN_LEVEL; } -- cgit From 6d310cb1d3b550295da386f8fa7a0036fb8e6ef2 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 29 Aug 2008 18:34:28 +0200 Subject: netapi: add NetShareDel skeleton. Guenther (This used to be commit 5b6e4740ea8b8fdfcbd766099a7c5044abbfddde) --- source3/lib/netapi/share.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'source3/lib/netapi/share.c') diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c index 9983471328..1532b477e5 100644 --- a/source3/lib/netapi/share.c +++ b/source3/lib/netapi/share.c @@ -134,3 +134,22 @@ WERROR NetShareAdd_l(struct libnetapi_ctx *ctx, { LIBNETAPI_REDIRECT_TO_LOCALHOST(ctx, r, NetShareAdd); } + +/**************************************************************** +****************************************************************/ + +WERROR NetShareDel_r(struct libnetapi_ctx *ctx, + struct NetShareDel *r) +{ + return WERR_NOT_SUPPORTED; +} + +/**************************************************************** +****************************************************************/ + +WERROR NetShareDel_l(struct libnetapi_ctx *ctx, + struct NetShareDel *r) +{ + LIBNETAPI_REDIRECT_TO_LOCALHOST(ctx, r, NetShareDel); +} + -- cgit From 148dd3b820f754bd7f0394ace19dff983babcf2d Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 29 Aug 2008 18:49:35 +0200 Subject: netapi: implement NetShareDel_r. Guenther (This used to be commit 47bed6f112dbcc509ce6ac593c9920d98b658f9a) --- source3/lib/netapi/share.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) (limited to 'source3/lib/netapi/share.c') diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c index 1532b477e5..2c796046df 100644 --- a/source3/lib/netapi/share.c +++ b/source3/lib/netapi/share.c @@ -141,7 +141,38 @@ WERROR NetShareAdd_l(struct libnetapi_ctx *ctx, WERROR NetShareDel_r(struct libnetapi_ctx *ctx, struct NetShareDel *r) { - return WERR_NOT_SUPPORTED; + WERROR werr; + NTSTATUS status; + struct cli_state *cli = NULL; + struct rpc_pipe_client *pipe_cli = NULL; + + if (!r->in.net_name) { + return WERR_INVALID_PARAM; + } + + werr = libnetapi_open_pipe(ctx, r->in.server_name, + &ndr_table_srvsvc.syntax_id, + &cli, + &pipe_cli); + if (!W_ERROR_IS_OK(werr)) { + goto done; + } + + status = rpccli_srvsvc_NetShareDel(pipe_cli, ctx, + r->in.server_name, + r->in.net_name, + r->in.reserved, + &werr); + if (!W_ERROR_IS_OK(werr)) { + goto done; + } + + done: + if (!cli) { + return werr; + } + + return werr; } /**************************************************************** -- cgit From 927a9f2cbe96d0044a7d56b6dd73de220dcbb246 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 29 Aug 2008 18:58:32 +0200 Subject: netapi: add NetShareEnum skeleton. Guenther (This used to be commit 0cc604ebc13125daf7e219c63a6ca8f21eda48c6) --- source3/lib/netapi/share.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'source3/lib/netapi/share.c') diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c index 2c796046df..d31743200f 100644 --- a/source3/lib/netapi/share.c +++ b/source3/lib/netapi/share.c @@ -184,3 +184,20 @@ WERROR NetShareDel_l(struct libnetapi_ctx *ctx, LIBNETAPI_REDIRECT_TO_LOCALHOST(ctx, r, NetShareDel); } +/**************************************************************** +****************************************************************/ + +WERROR NetShareEnum_r(struct libnetapi_ctx *ctx, + struct NetShareEnum *r) +{ + return WERR_NOT_SUPPORTED; +} + +/**************************************************************** +****************************************************************/ + +WERROR NetShareEnum_l(struct libnetapi_ctx *ctx, + struct NetShareEnum *r) +{ + LIBNETAPI_REDIRECT_TO_LOCALHOST(ctx, r, NetShareEnum); +} -- cgit From fda790bb5d9459d876b6cd4f2944ce434ebb7def Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 4 Sep 2008 15:53:54 +0200 Subject: netapi: add skeleton for NetShareGetInfo. Guenther (This used to be commit 237c6e0bca44e19ca89532e565b1345f9f329111) --- source3/lib/netapi/share.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'source3/lib/netapi/share.c') diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c index d31743200f..20bfd78571 100644 --- a/source3/lib/netapi/share.c +++ b/source3/lib/netapi/share.c @@ -201,3 +201,21 @@ WERROR NetShareEnum_l(struct libnetapi_ctx *ctx, { LIBNETAPI_REDIRECT_TO_LOCALHOST(ctx, r, NetShareEnum); } + +/**************************************************************** +****************************************************************/ + +WERROR NetShareGetInfo_r(struct libnetapi_ctx *ctx, + struct NetShareGetInfo *r) +{ + return WERR_NOT_SUPPORTED; +} + +/**************************************************************** +****************************************************************/ + +WERROR NetShareGetInfo_l(struct libnetapi_ctx *ctx, + struct NetShareGetInfo *r) +{ + LIBNETAPI_REDIRECT_TO_LOCALHOST(ctx, r, NetShareGetInfo); +} -- cgit From cdb31ef2f913e3504466121dde171bc6fff35c37 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 4 Sep 2008 16:31:18 +0200 Subject: netapi: implement NetShareGetInfo_r. Guenther (This used to be commit 029cf4a2a9d95b9c7de6eb75118a92474c0ae9c1) --- source3/lib/netapi/share.c | 155 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 154 insertions(+), 1 deletion(-) (limited to 'source3/lib/netapi/share.c') diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c index 20bfd78571..d0bcb3885f 100644 --- a/source3/lib/netapi/share.c +++ b/source3/lib/netapi/share.c @@ -27,6 +27,101 @@ /**************************************************************** ****************************************************************/ +static NTSTATUS map_srvsvc_share_info_to_SHARE_INFO_buffer(TALLOC_CTX *mem_ctx, + uint32_t level, + union srvsvc_NetShareInfo *info, + uint8_t **buffer, + uint32_t *num_shares) +{ + struct SHARE_INFO_0 i0; + struct SHARE_INFO_1 i1; + struct SHARE_INFO_2 i2; + struct SHARE_INFO_501 i501; + struct SHARE_INFO_1005 i1005; + + struct srvsvc_NetShareInfo0 *s0; + struct srvsvc_NetShareInfo1 *s1; + struct srvsvc_NetShareInfo2 *s2; + struct srvsvc_NetShareInfo501 *s501; + struct srvsvc_NetShareInfo1005 *s1005; + + if (!buffer) { + return NT_STATUS_INVALID_PARAMETER; + } + + switch (level) { + case 0: + s0 = info->info0; + + i0.shi0_netname = talloc_strdup(mem_ctx, s0->name); + + ADD_TO_ARRAY(mem_ctx, struct SHARE_INFO_0, i0, + (struct SHARE_INFO_0 **)buffer, + num_shares); + break; + + case 1: + s1 = info->info1; + + i1.shi1_netname = talloc_strdup(mem_ctx, s1->name); + i1.shi1_type = s1->type; + i1.shi1_remark = talloc_strdup(mem_ctx, s1->comment); + + ADD_TO_ARRAY(mem_ctx, struct SHARE_INFO_1, i1, + (struct SHARE_INFO_1 **)buffer, + num_shares); + break; + + case 2: + s2 = info->info2; + + i2.shi2_netname = talloc_strdup(mem_ctx, s2->name); + i2.shi2_type = s2->type; + i2.shi2_remark = talloc_strdup(mem_ctx, s2->comment); + i2.shi2_permissions = s2->permissions; + i2.shi2_max_uses = s2->max_users; + i2.shi2_current_uses = s2->current_users; + i2.shi2_path = talloc_strdup(mem_ctx, s2->path); + i2.shi2_passwd = talloc_strdup(mem_ctx, s2->password); + + ADD_TO_ARRAY(mem_ctx, struct SHARE_INFO_2, i2, + (struct SHARE_INFO_2 **)buffer, + num_shares); + break; + + case 501: + s501 = info->info501; + + i501.shi501_netname = talloc_strdup(mem_ctx, s501->name); + i501.shi501_type = s501->type; + i501.shi501_remark = talloc_strdup(mem_ctx, s501->comment); + i501.shi501_flags = s501->csc_policy; + + ADD_TO_ARRAY(mem_ctx, struct SHARE_INFO_501, i501, + (struct SHARE_INFO_501 **)buffer, + num_shares); + break; + + case 1005: + s1005 = info->info1005; + + i1005.shi1005_flags = s1005->dfs_flags; + + ADD_TO_ARRAY(mem_ctx, struct SHARE_INFO_1005, i1005, + (struct SHARE_INFO_1005 **)buffer, + num_shares); + break; + + default: + return NT_STATUS_INVALID_PARAMETER; + } + + return NT_STATUS_OK; +} + +/**************************************************************** +****************************************************************/ + static NTSTATUS map_SHARE_INFO_buffer_to_srvsvc_share_info(TALLOC_CTX *mem_ctx, uint8_t *buffer, uint32_t level, @@ -208,7 +303,65 @@ WERROR NetShareEnum_l(struct libnetapi_ctx *ctx, WERROR NetShareGetInfo_r(struct libnetapi_ctx *ctx, struct NetShareGetInfo *r) { - return WERR_NOT_SUPPORTED; + WERROR werr; + NTSTATUS status; + struct cli_state *cli = NULL; + struct rpc_pipe_client *pipe_cli = NULL; + union srvsvc_NetShareInfo info; + uint32_t num_entries = 0; + + if (!r->in.net_name) { + return WERR_INVALID_PARAM; + } + + switch (r->in.level) { + case 0: + case 1: + case 2: + case 501: + case 1005: + break; + case 502: + case 503: + return WERR_NOT_SUPPORTED; + default: + return WERR_UNKNOWN_LEVEL; + } + + werr = libnetapi_open_pipe(ctx, r->in.server_name, + &ndr_table_srvsvc.syntax_id, + &cli, + &pipe_cli); + if (!W_ERROR_IS_OK(werr)) { + goto done; + } + + status = rpccli_srvsvc_NetShareGetInfo(pipe_cli, ctx, + r->in.server_name, + r->in.net_name, + r->in.level, + &info, + &werr); + + if (!W_ERROR_IS_OK(werr)) { + goto done; + } + + status = map_srvsvc_share_info_to_SHARE_INFO_buffer(ctx, + r->in.level, + &info, + r->out.buffer, + &num_entries); + if (!NT_STATUS_IS_OK(status)) { + werr = ntstatus_to_werror(status); + } + + done: + if (!cli) { + return werr; + } + + return werr; } /**************************************************************** -- cgit From c38546ad9d6d97b9f92a548cec4f9e61ba7d2cc1 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 4 Sep 2008 19:29:47 +0200 Subject: netapi: implement NetShareEnum_r. Guenther (This used to be commit 3fbfbaea004f792a577f21275e6e4218f581d698) --- source3/lib/netapi/share.c | 91 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) (limited to 'source3/lib/netapi/share.c') diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c index d0bcb3885f..1b3cd4abc8 100644 --- a/source3/lib/netapi/share.c +++ b/source3/lib/netapi/share.c @@ -285,7 +285,96 @@ WERROR NetShareDel_l(struct libnetapi_ctx *ctx, WERROR NetShareEnum_r(struct libnetapi_ctx *ctx, struct NetShareEnum *r) { - return WERR_NOT_SUPPORTED; + WERROR werr; + NTSTATUS status; + struct cli_state *cli = NULL; + struct rpc_pipe_client *pipe_cli = NULL; + struct srvsvc_NetShareInfoCtr info_ctr; + struct srvsvc_NetShareCtr0 ctr0; + struct srvsvc_NetShareCtr1 ctr1; + struct srvsvc_NetShareCtr2 ctr2; + uint32_t i; + + if (!r->out.buffer) { + return WERR_INVALID_PARAM; + } + + switch (r->in.level) { + case 0: + case 1: + case 2: + break; + case 502: + case 503: + return WERR_NOT_SUPPORTED; + default: + return WERR_UNKNOWN_LEVEL; + } + + ZERO_STRUCT(info_ctr); + + werr = libnetapi_open_pipe(ctx, r->in.server_name, + &ndr_table_srvsvc.syntax_id, + &cli, + &pipe_cli); + if (!W_ERROR_IS_OK(werr)) { + goto done; + } + + info_ctr.level = r->in.level; + switch (r->in.level) { + case 0: + info_ctr.ctr.ctr0 = &ctr0; + break; + case 1: + info_ctr.ctr.ctr1 = &ctr1; + break; + case 2: + info_ctr.ctr.ctr2 = &ctr2; + break; + } + + status = rpccli_srvsvc_NetShareEnum(pipe_cli, ctx, + r->in.server_name, + &info_ctr, + r->in.prefmaxlen, + r->out.total_entries, + r->out.resume_handle, + &werr); + if (NT_STATUS_IS_ERR(status)) { + goto done; + } + + for (i=0; i < info_ctr.ctr.ctr1->count; i++) { + union srvsvc_NetShareInfo _i; + switch (r->in.level) { + case 0: + _i.info0 = &info_ctr.ctr.ctr0->array[i]; + break; + case 1: + _i.info1 = &info_ctr.ctr.ctr1->array[i]; + break; + case 2: + _i.info2 = &info_ctr.ctr.ctr2->array[i]; + break; + } + + status = map_srvsvc_share_info_to_SHARE_INFO_buffer(ctx, + r->in.level, + &_i, + r->out.buffer, + r->out.entries_read); + if (!NT_STATUS_IS_OK(status)) { + werr = ntstatus_to_werror(status); + } + } + + done: + if (!cli) { + return werr; + } + + return werr; } /**************************************************************** -- cgit From 582a48d89ce5e9650e6a5b293c06b2294cac0841 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 4 Sep 2008 20:03:14 +0200 Subject: netapi: add skeleton for NetShareSetInfo. Guenther (This used to be commit 4d7947e54959c6a445e8b0f7a8313fe232c1fb8f) --- source3/lib/netapi/share.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'source3/lib/netapi/share.c') diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c index 1b3cd4abc8..36f8133f7d 100644 --- a/source3/lib/netapi/share.c +++ b/source3/lib/netapi/share.c @@ -461,3 +461,21 @@ WERROR NetShareGetInfo_l(struct libnetapi_ctx *ctx, { LIBNETAPI_REDIRECT_TO_LOCALHOST(ctx, r, NetShareGetInfo); } + +/**************************************************************** +****************************************************************/ + +WERROR NetShareSetInfo_r(struct libnetapi_ctx *ctx, + struct NetShareSetInfo *r) +{ + return WERR_NOT_SUPPORTED; +} + +/**************************************************************** +****************************************************************/ + +WERROR NetShareSetInfo_l(struct libnetapi_ctx *ctx, + struct NetShareSetInfo *r) +{ + LIBNETAPI_REDIRECT_TO_LOCALHOST(ctx, r, NetShareSetInfo); +} -- cgit From 136ddc8f049a248b635d82ff395d774c5d78769d Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 4 Sep 2008 20:24:02 +0200 Subject: netapi: add support for level 1004 in map_SHARE_INFO_buffer_to_srvsvc_share_info. Guenther (This used to be commit f21a934e1e100cb1496a6c854684ff110ba6d1cc) --- source3/lib/netapi/share.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'source3/lib/netapi/share.c') diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c index 36f8133f7d..414900a11d 100644 --- a/source3/lib/netapi/share.c +++ b/source3/lib/netapi/share.c @@ -128,7 +128,9 @@ static NTSTATUS map_SHARE_INFO_buffer_to_srvsvc_share_info(TALLOC_CTX *mem_ctx, union srvsvc_NetShareInfo *info) { struct SHARE_INFO_2 *i2 = NULL; + struct SHARE_INFO_1004 *i1004 = NULL; struct srvsvc_NetShareInfo2 *s2 = NULL; + struct srvsvc_NetShareInfo1004 *s1004 = NULL; if (!buffer) { return NT_STATUS_INVALID_PARAMETER; @@ -152,6 +154,17 @@ static NTSTATUS map_SHARE_INFO_buffer_to_srvsvc_share_info(TALLOC_CTX *mem_ctx, info->info2 = s2; + break; + case 1004: + i1004 = (struct SHARE_INFO_1004 *)buffer; + + s1004 = TALLOC_P(mem_ctx, struct srvsvc_NetShareInfo1004); + NT_STATUS_HAVE_NO_MEMORY(s1004); + + s1004->comment = i1004->shi1004_remark; + + info->info1004 = s1004; + break; default: return NT_STATUS_INVALID_PARAMETER; -- cgit From 05449814e98b50a0f2615be5c476b48db1036f22 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 4 Sep 2008 20:24:23 +0200 Subject: netapi: implement NetShareSetInfo_r. Guenther (This used to be commit ebcd45ed3ff79ce3b90872aa87a737ba6ee3401f) --- source3/lib/netapi/share.c | 60 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) (limited to 'source3/lib/netapi/share.c') diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c index 414900a11d..c6af548225 100644 --- a/source3/lib/netapi/share.c +++ b/source3/lib/netapi/share.c @@ -481,7 +481,65 @@ WERROR NetShareGetInfo_l(struct libnetapi_ctx *ctx, WERROR NetShareSetInfo_r(struct libnetapi_ctx *ctx, struct NetShareSetInfo *r) { - return WERR_NOT_SUPPORTED; + WERROR werr; + NTSTATUS status; + struct cli_state *cli = NULL; + struct rpc_pipe_client *pipe_cli = NULL; + union srvsvc_NetShareInfo info; + + if (!r->in.buffer) { + return WERR_INVALID_PARAM; + } + + switch (r->in.level) { + case 2: + case 1004: + break; + case 1: + case 502: + case 503: + case 1005: + case 1006: + case 1501: + return WERR_NOT_SUPPORTED; + default: + return WERR_UNKNOWN_LEVEL; + } + + werr = libnetapi_open_pipe(ctx, r->in.server_name, + &ndr_table_srvsvc.syntax_id, + &cli, + &pipe_cli); + if (!W_ERROR_IS_OK(werr)) { + goto done; + } + + status = map_SHARE_INFO_buffer_to_srvsvc_share_info(ctx, + r->in.buffer, + r->in.level, + &info); + if (!NT_STATUS_IS_OK(status)) { + werr = ntstatus_to_werror(status); + goto done; + } + + status = rpccli_srvsvc_NetShareSetInfo(pipe_cli, ctx, + r->in.server_name, + r->in.net_name, + r->in.level, + &info, + r->out.parm_err, + &werr); + if (!W_ERROR_IS_OK(werr)) { + goto done; + } + + done: + if (!cli) { + return werr; + } + + return werr; } /**************************************************************** -- cgit From d323e48abea064a51399a6bcca63742cd32e81cd Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 10 Sep 2008 13:26:54 +0200 Subject: netapi: fix NetShareEnum_r which in fact enumerates all shares. Guenther (This used to be commit 0637ad872e5d30f71b6ea1ec2d243ec8e8836c31) --- source3/lib/netapi/share.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'source3/lib/netapi/share.c') diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c index c6af548225..2752895387 100644 --- a/source3/lib/netapi/share.c +++ b/source3/lib/netapi/share.c @@ -347,13 +347,13 @@ WERROR NetShareEnum_r(struct libnetapi_ctx *ctx, break; } - status = rpccli_srvsvc_NetShareEnum(pipe_cli, ctx, - r->in.server_name, - &info_ctr, - r->in.prefmaxlen, - r->out.total_entries, - r->out.resume_handle, - &werr); + status = rpccli_srvsvc_NetShareEnumAll(pipe_cli, ctx, + r->in.server_name, + &info_ctr, + r->in.prefmaxlen, + r->out.total_entries, + r->out.resume_handle, + &werr); if (NT_STATUS_IS_ERR(status)) { goto done; } -- cgit From 07585d9fb7bf8b7b8b22538f39208965c91a508a Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 10 Sep 2008 10:13:55 +0200 Subject: netapi: fix NetShareGetInfo_r. Guenther (This used to be commit b42408f54ea61ad47f5a33085ab1532c67ceee83) --- source3/lib/netapi/share.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/netapi/share.c') diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c index 2752895387..8b9124b513 100644 --- a/source3/lib/netapi/share.c +++ b/source3/lib/netapi/share.c @@ -412,7 +412,7 @@ WERROR NetShareGetInfo_r(struct libnetapi_ctx *ctx, union srvsvc_NetShareInfo info; uint32_t num_entries = 0; - if (!r->in.net_name) { + if (!r->in.net_name || !r->out.buffer) { return WERR_INVALID_PARAM; } -- cgit From 93eb9860c6e26bf53bb103e758c935987dba27c8 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 10 Sep 2008 10:13:41 +0200 Subject: netapi: fix NetShareEnum_r. Guenther (This used to be commit 7e8903b53beba3ad1bb8617ed435249257724be3) --- source3/lib/netapi/share.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source3/lib/netapi/share.c') diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c index 8b9124b513..1d0e1810f1 100644 --- a/source3/lib/netapi/share.c +++ b/source3/lib/netapi/share.c @@ -337,12 +337,15 @@ WERROR NetShareEnum_r(struct libnetapi_ctx *ctx, info_ctr.level = r->in.level; switch (r->in.level) { case 0: + ZERO_STRUCT(ctr0); info_ctr.ctr.ctr0 = &ctr0; - break; + break; case 1: + ZERO_STRUCT(ctr1); info_ctr.ctr.ctr1 = &ctr1; break; case 2: + ZERO_STRUCT(ctr2); info_ctr.ctr.ctr2 = &ctr2; break; } -- cgit