[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-152-gfd3e772
Günther Deschner
gd at samba.org
Fri Mar 7 23:25:47 GMT 2008
The branch, v3-2-test has been updated
via fd3e7728181e7a208706e477905173bec44c982e (commit)
from 39e9cfa3018786f176aeb237ea7805da4e576c62 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit fd3e7728181e7a208706e477905173bec44c982e
Author: Günther Deschner <gd at samba.org>
Date: Sat Mar 8 00:22:44 2008 +0100
Use pidl for _srvsvc_NetShareAdd.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/rpc_server/srv_srvsvc.c | 23 +------------
source/rpc_server/srv_srvsvc_nt.c | 66 ++++++++++++++++++-------------------
2 files changed, 33 insertions(+), 56 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_server/srv_srvsvc.c b/source/rpc_server/srv_srvsvc.c
index 8853295..1873bcb 100644
--- a/source/rpc_server/srv_srvsvc.c
+++ b/source/rpc_server/srv_srvsvc.c
@@ -216,28 +216,7 @@ static bool api_srv_net_share_set_info(pipes_struct *p)
static bool api_srv_net_share_add(pipes_struct *p)
{
- SRV_Q_NET_SHARE_ADD q_u;
- SRV_R_NET_SHARE_ADD r_u;
- prs_struct *data = &p->in_data.data;
- prs_struct *rdata = &p->out_data.rdata;
-
- ZERO_STRUCT(q_u);
- ZERO_STRUCT(r_u);
-
- /* Unmarshall the net server add info. */
- if(!srv_io_q_net_share_add("", &q_u, data, 0)) {
- DEBUG(0,("api_srv_net_share_add: Failed to unmarshall SRV_Q_NET_SHARE_ADD.\n"));
- return False;
- }
-
- r_u.status = _srv_net_share_add(p, &q_u, &r_u);
-
- if(!srv_io_r_net_share_add("", &r_u, rdata, 0)) {
- DEBUG(0,("api_srv_net_share_add: Failed to marshall SRV_R_NET_SHARE_ADD.\n"));
- return False;
- }
-
- return True;
+ return proxy_srvsvc_call(p, NDR_SRVSVC_NETSHAREADD);
}
/*******************************************************************
diff --git a/source/rpc_server/srv_srvsvc_nt.c b/source/rpc_server/srv_srvsvc_nt.c
index a64691c..d45ebb2 100644
--- a/source/rpc_server/srv_srvsvc_nt.c
+++ b/source/rpc_server/srv_srvsvc_nt.c
@@ -1726,11 +1726,13 @@ WERROR _srvsvc_NetShareSetInfo(pipes_struct *p,
}
/*******************************************************************
- Net share add. Call 'add_share_command "sharename" "pathname"
+ _srvsvc_NetShareAdd.
+ Call 'add_share_command "sharename" "pathname"
"comment" "max connections = "
********************************************************************/
-WERROR _srv_net_share_add(pipes_struct *p, SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_SHARE_ADD *r_u)
+WERROR _srvsvc_NetShareAdd(pipes_struct *p,
+ struct srvsvc_NetShareAdd *r)
{
struct current_user user;
char *command = NULL;
@@ -1747,9 +1749,9 @@ WERROR _srv_net_share_add(pipes_struct *p, SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_S
int max_connections = 0;
TALLOC_CTX *ctx = p->mem_ctx;
- DEBUG(5,("_srv_net_share_add: %d\n", __LINE__));
+ DEBUG(5,("_srvsvc_NetShareAdd: %d\n", __LINE__));
- r_u->parm_error = 0;
+ *r->out.parm_error = 0;
get_current_user(&user,p);
@@ -1759,11 +1761,11 @@ WERROR _srv_net_share_add(pipes_struct *p, SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_S
return WERR_ACCESS_DENIED;
if (!lp_add_share_cmd() || !*lp_add_share_cmd()) {
- DEBUG(10,("_srv_net_share_add: No add share command\n"));
+ DEBUG(10,("_srvsvc_NetShareAdd: No add share command\n"));
return WERR_ACCESS_DENIED;
}
- switch (q_u->info_level) {
+ switch (r->in.level) {
case 0:
/* No path. Not enough info in a level 0 to do anything. */
return WERR_ACCESS_DENIED;
@@ -1771,27 +1773,24 @@ WERROR _srv_net_share_add(pipes_struct *p, SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_S
/* Not enough info in a level 1 to do anything. */
return WERR_ACCESS_DENIED;
case 2:
- share_name = unistr2_to_ascii_talloc(ctx,
- &q_u->info.share.info2.info_2_str.uni_netname);
- comment = unistr2_to_ascii_talloc(ctx,
- &q_u->info.share.info2.info_2_str.uni_remark);
- pathname = unistr2_to_ascii_talloc(ctx,
- &q_u->info.share.info2.info_2_str.uni_path);
- max_connections = (q_u->info.share.info2.info_2.max_uses == 0xffffffff) ? 0 : q_u->info.share.info2.info_2.max_uses;
- type = q_u->info.share.info2.info_2.type;
+ share_name = talloc_strdup(ctx, r->in.info->info2->name);
+ comment = talloc_strdup(ctx, r->in.info->info2->comment);
+ pathname = talloc_strdup(ctx, r->in.info->info2->path);
+ max_connections = (r->in.info->info2->max_users == 0xffffffff) ?
+ 0 : r->in.info->info2->max_users;
+ type = r->in.info->info2->type;
break;
case 501:
/* No path. Not enough info in a level 501 to do anything. */
return WERR_ACCESS_DENIED;
case 502:
- share_name = unistr2_to_ascii_talloc(ctx,
- &q_u->info.share.info502.info_502_str.uni_netname);
- comment = unistr2_to_ascii_talloc(ctx,
- &q_u->info.share.info502.info_502_str.uni_remark);
- pathname = unistr2_to_ascii_talloc(ctx,
- &q_u->info.share.info502.info_502_str.uni_path);
- type = q_u->info.share.info502.info_502.type;
- psd = q_u->info.share.info502.info_502_str.sd;
+ share_name = talloc_strdup(ctx, r->in.info->info502->name);
+ comment = talloc_strdup(ctx, r->in.info->info502->comment);
+ pathname = talloc_strdup(ctx, r->in.info->info502->path);
+ max_connections = (r->in.info->info502->max_users == 0xffffffff) ?
+ 0 : r->in.info->info502->max_users;
+ type = r->in.info->info502->type;
+ psd = r->in.info->info502->sd;
map_generic_share_sd_bits(psd);
break;
@@ -1806,7 +1805,8 @@ WERROR _srv_net_share_add(pipes_struct *p, SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_S
/* DFS only level. */
return WERR_ACCESS_DENIED;
default:
- DEBUG(5,("_srv_net_share_add: unsupported switch value %d\n", q_u->info_level));
+ DEBUG(5,("_srvsvc_NetShareAdd: unsupported switch value %d\n",
+ r->in.level));
return WERR_UNKNOWN_LEVEL;
}
@@ -1815,7 +1815,7 @@ WERROR _srv_net_share_add(pipes_struct *p, SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_S
if (!share_name || !validate_net_name(share_name,
INVALID_SHARENAME_CHARS,
strlen(share_name))) {
- DEBUG(5,("_srv_net_name_validate: Bad sharename \"%s\"\n",
+ DEBUG(5,("_srvsvc_NetShareAdd: Bad sharename \"%s\"\n",
share_name ? share_name : ""));
return WERR_INVALID_NAME;
}
@@ -1862,13 +1862,15 @@ WERROR _srv_net_share_add(pipes_struct *p, SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_S
return WERR_NOMEM;
}
- DEBUG(10,("_srv_net_share_add: Running [%s]\n", command ));
+ DEBUG(10,("_srvsvc_NetShareAdd: Running [%s]\n", command ));
/********* BEGIN SeDiskOperatorPrivilege BLOCK *********/
if ( is_disk_op )
become_root();
+ /* FIXME: use libnetconf here - gd */
+
if ( (ret = smbrun(command, NULL)) == 0 ) {
/* Tell everyone we updated smb.conf. */
message_send_all(smbd_messaging_context(),
@@ -1880,7 +1882,8 @@ WERROR _srv_net_share_add(pipes_struct *p, SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_S
/********* END SeDiskOperatorPrivilege BLOCK *********/
- DEBUG(3,("_srv_net_share_add: Running [%s] returned (%d)\n", command, ret ));
+ DEBUG(3,("_srvsvc_NetShareAdd: Running [%s] returned (%d)\n",
+ command, ret ));
TALLOC_FREE(command);
@@ -1889,7 +1892,8 @@ WERROR _srv_net_share_add(pipes_struct *p, SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_S
if (psd) {
if (!set_share_security(share_name, psd)) {
- DEBUG(0,("_srv_net_share_add: Failed to add security info to share %s.\n", share_name ));
+ DEBUG(0,("_srvsvc_NetShareAdd: Failed to add security info to share %s.\n",
+ share_name ));
}
}
@@ -1899,7 +1903,7 @@ WERROR _srv_net_share_add(pipes_struct *p, SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_S
* from the client. JRA.
*/
- DEBUG(5,("_srv_net_share_add: %d\n", __LINE__));
+ DEBUG(5,("_srvsvc_NetShareAdd: %d\n", __LINE__));
return WERR_OK;
}
@@ -2494,12 +2498,6 @@ WERROR _srvsvc_NetSessDel(pipes_struct *p, struct srvsvc_NetSessDel *r)
return WERR_NOT_SUPPORTED;
}
-WERROR _srvsvc_NetShareAdd(pipes_struct *p, struct srvsvc_NetShareAdd *r)
-{
- p->rng_fault_state = True;
- return WERR_NOT_SUPPORTED;
-}
-
WERROR _srvsvc_NetShareCheck(pipes_struct *p, struct srvsvc_NetShareCheck *r)
{
p->rng_fault_state = True;
--
Samba Shared Repository
More information about the samba-cvs
mailing list