summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-02-26 22:05:41 +0000
committerJeremy Allison <jra@samba.org>2001-02-26 22:05:41 +0000
commitde187df10c3d34ef87b3618fc8fc0e14b466b2f8 (patch)
tree546244b8b6fc411b75405bd487117571bc3dffa5
parent95731132dc3cb78a41fc83c68af0f0168f07f246 (diff)
downloadsamba-de187df10c3d34ef87b3618fc8fc0e14b466b2f8.tar.gz
samba-de187df10c3d34ef87b3618fc8fc0e14b466b2f8.tar.bz2
samba-de187df10c3d34ef87b3618fc8fc0e14b466b2f8.zip
Split srvsvc pipe into interface and implementation modules.
Jeremy. (This used to be commit e14c88ddf466f17a710724fb4fc273d37a244d77)
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/include/proto.h12
-rw-r--r--source3/rpc_parse/parse_srv.c53
-rw-r--r--source3/rpc_server/srv_srvsvc.c1073
4 files changed, 148 insertions, 992 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index ad10ebf69d..ccd1a421b4 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -131,7 +131,7 @@ LIBMSRPC_OBJ = libsmb/cli_lsarpc.o libsmb/cli_samr.o libsmb/cli_spoolss.o \
RPC_SERVER_OBJ = rpc_server/srv_lsa.o rpc_server/srv_lsa_nt.o \
rpc_server/srv_lsa_hnd.o rpc_server/srv_netlog.o \
rpc_server/srv_pipe_hnd.o rpc_server/srv_reg.o rpc_server/srv_reg_nt.o \
- rpc_server/srv_samr.o rpc_server/srv_srvsvc.o \
+ rpc_server/srv_samr.o rpc_server/srv_srvsvc.o rpc_server/srv_srvsvc_nt.o \
rpc_server/srv_util.o rpc_server/srv_wkssvc.o rpc_server/srv_wkssvc_nt.o \
rpc_server/srv_pipe.o rpc_server/srv_dfs.o \
rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9bdca542fb..858796aa22 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3540,6 +3540,18 @@ uint32 _spoolss_getjob( POLICY_HND *handle, uint32 jobid, uint32 level,
BOOL api_srvsvc_rpc(pipes_struct *p);
#endif
+/*The following definitions come from rpc_server/srv_srvsvc_nt.c */
+
+#if OLD_NTDOMAIN
+uint32 _srv_net_srv_get_info(pipes_struct *p, SRV_Q_NET_SRV_GET_INFO *q_u, SRV_R_NET_SRV_GET_INFO *r_u);
+uint32 _srv_net_file_enum(pipes_struct *p, SRV_Q_NET_FILE_ENUM *q_u, SRV_R_NET_FILE_ENUM *r_u);
+uint32 _srv_net_conn_enum(pipes_struct *p, SRV_Q_NET_CONN_ENUM *q_u, SRV_R_NET_CONN_ENUM *r_u);
+uint32 _srv_net_sess_enum(pipes_struct *p, SRV_Q_NET_SESS_ENUM *q_u, SRV_R_NET_SESS_ENUM *r_u);
+uint32 _srv_net_share_enum(pipes_struct *p, SRV_Q_NET_SHARE_ENUM *q_u, SRV_R_NET_SHARE_ENUM *r_u);
+uint32 _srv_net_share_get_info(pipes_struct *p, SRV_Q_NET_SHARE_GET_INFO *q_u, SRV_R_NET_SHARE_GET_INFO *r_u);
+uint32 _srv_net_remote_tod(pipes_struct *p, SRV_Q_NET_REMOTE_TOD *q_u, SRV_R_NET_REMOTE_TOD *r_u);
+#endif
+
/*The following definitions come from rpc_server/srv_util.c */
#if OLD_NTDOMAIN
diff --git a/source3/rpc_parse/parse_srv.c b/source3/rpc_parse/parse_srv.c
index c572d881d6..1721b6f187 100644
--- a/source3/rpc_parse/parse_srv.c
+++ b/source3/rpc_parse/parse_srv.c
@@ -796,14 +796,23 @@ static BOOL srv_io_srv_sess_info_1(char *desc, SRV_SESS_INFO_1 *ss1, prs_struct
Reads or writes a structure.
********************************************************************/
-static BOOL srv_io_srv_sess_ctr(char *desc, SRV_SESS_INFO_CTR *ctr, prs_struct *ps, int depth)
+static BOOL srv_io_srv_sess_ctr(char *desc, SRV_SESS_INFO_CTR **pp_ctr, prs_struct *ps, int depth)
{
- if (ctr == NULL)
- return False;
+ SRV_SESS_INFO_CTR *ctr = *pp_ctr;
prs_debug(ps, depth, desc, "srv_io_srv_sess_ctr");
depth++;
+ if(UNMARSHALLING(ps)) {
+ ctr = *pp_ctr = (SRV_SESS_INFO_CTR *)prs_alloc_mem(ps, sizeof(SRV_SESS_INFO_CTR));
+ if (ctr == NULL)
+ return False;
+ ZERO_STRUCTP(ctr);
+ }
+
+ if (ctr == NULL)
+ return False;
+
if(!prs_align(ps))
return False;
@@ -890,7 +899,7 @@ BOOL srv_io_q_net_sess_enum(char *desc, SRV_Q_NET_SESS_ENUM *q_n, prs_struct *ps
return False;
if (q_n->sess_level != -1) {
- if(!srv_io_srv_sess_ctr("sess_ctr", q_n->ctr, ps, depth))
+ if(!srv_io_srv_sess_ctr("sess_ctr", &q_n->ctr, ps, depth))
return False;
}
@@ -922,7 +931,7 @@ BOOL srv_io_r_net_sess_enum(char *desc, SRV_R_NET_SESS_ENUM *r_n, prs_struct *ps
return False;
if (r_n->sess_level != -1) {
- if(!srv_io_srv_sess_ctr("sess_ctr", r_n->ctr, ps, depth))
+ if(!srv_io_srv_sess_ctr("sess_ctr", &r_n->ctr, ps, depth))
return False;
}
@@ -1153,14 +1162,23 @@ static BOOL srv_io_srv_conn_info_1(char *desc, SRV_CONN_INFO_1 *ss1, prs_struct
Reads or writes a structure.
********************************************************************/
-static BOOL srv_io_srv_conn_ctr(char *desc, SRV_CONN_INFO_CTR *ctr, prs_struct *ps, int depth)
+static BOOL srv_io_srv_conn_ctr(char *desc, SRV_CONN_INFO_CTR **pp_ctr, prs_struct *ps, int depth)
{
- if (ctr == NULL)
- return False;
+ SRV_CONN_INFO_CTR *ctr = *pp_ctr;
prs_debug(ps, depth, desc, "srv_io_srv_conn_ctr");
depth++;
+ if (UNMARSHALLING(ps)) {
+ ctr = *pp_ctr = (SRV_CONN_INFO_CTR *)prs_alloc_mem(ps, sizeof(SRV_CONN_INFO_CTR));
+ if (ctr == NULL)
+ return False;
+ ZERO_STRUCTP(ctr);
+ }
+
+ if (ctr == NULL)
+ return False;
+
if(!prs_align(ps))
return False;
@@ -1247,7 +1265,7 @@ BOOL srv_io_q_net_conn_enum(char *desc, SRV_Q_NET_CONN_ENUM *q_n, prs_struct *ps
return False;
if (q_n->conn_level != -1) {
- if(!srv_io_srv_conn_ctr("conn_ctr", q_n->ctr, ps, depth))
+ if(!srv_io_srv_conn_ctr("conn_ctr", &q_n->ctr, ps, depth))
return False;
}
@@ -1279,7 +1297,7 @@ BOOL srv_io_r_net_conn_enum(char *desc, SRV_R_NET_CONN_ENUM *r_n, prs_struct *p
return False;
if (r_n->conn_level != -1) {
- if(!srv_io_srv_conn_ctr("conn_ctr", r_n->ctr, ps, depth))
+ if(!srv_io_srv_conn_ctr("conn_ctr", &r_n->ctr, ps, depth))
return False;
}
@@ -1427,8 +1445,17 @@ static BOOL srv_io_srv_file_info_3(char *desc, SRV_FILE_INFO_3 *fl3, prs_struct
Reads or writes a structure.
********************************************************************/
-static BOOL srv_io_srv_file_ctr(char *desc, SRV_FILE_INFO_CTR *ctr, prs_struct *ps, int depth)
+static BOOL srv_io_srv_file_ctr(char *desc, SRV_FILE_INFO_CTR **pp_ctr, prs_struct *ps, int depth)
{
+ SRV_FILE_INFO_CTR *ctr = *pp_ctr;
+
+ if (UNMARSHALLING(ps)) {
+ ctr = *pp_ctr = (SRV_FILE_INFO_CTR *)prs_alloc_mem(ps, sizeof(SRV_FILE_INFO_CTR));
+ if (ctr == NULL)
+ return False;
+ ZERO_STRUCTP(ctr);
+ }
+
if (ctr == NULL)
return False;
@@ -1517,7 +1544,7 @@ BOOL srv_io_q_net_file_enum(char *desc, SRV_Q_NET_FILE_ENUM *q_n, prs_struct *ps
return False;
if (q_n->file_level != -1) {
- if(!srv_io_srv_file_ctr("file_ctr", q_n->ctr, ps, depth))
+ if(!srv_io_srv_file_ctr("file_ctr", &q_n->ctr, ps, depth))
return False;
}
@@ -1549,7 +1576,7 @@ BOOL srv_io_r_net_file_enum(char *desc, SRV_R_NET_FILE_ENUM *r_n, prs_struct *ps
return False;
if (r_n->file_level != 0) {
- if(!srv_io_srv_file_ctr("file_ctr", r_n->ctr, ps, depth))
+ if(!srv_io_srv_file_ctr("file_ctr", &r_n->ctr, ps, depth))
return False;
}
diff --git a/source3/rpc_server/srv_srvsvc.c b/source3/rpc_server/srv_srvsvc.c
index 52ae54fd94..b530d66092 100644
--- a/source3/rpc_server/srv_srvsvc.c
+++ b/source3/rpc_server/srv_srvsvc.c
@@ -6,6 +6,7 @@
* Copyright (C) Andrew Tridgell 1992-1997,
* Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
* Copyright (C) Paul Ashton 1997.
+ * Copyright (C) Jeremy Allison 2001.
*
* 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
@@ -22,1010 +23,149 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+/* This is the interface to the srvsvc pipe. */
+
#include "includes.h"
extern int DEBUGLEVEL;
-extern pstring global_myname;
-
-/*******************************************************************
- Fill in a share info level 1 structure.
- ********************************************************************/
-
-static void init_srv_share_info_1(SRV_SHARE_INFO_1 *sh1, int snum)
-{
- int len_net_name;
- pstring net_name;
- pstring remark;
- uint32 type;
-
- pstrcpy(net_name, lp_servicename(snum));
- pstrcpy(remark, lp_comment(snum));
- pstring_sub(remark,"%S",lp_servicename(snum));
- len_net_name = strlen(net_name);
-
- /* work out the share type */
- type = STYPE_DISKTREE;
-
- if (lp_print_ok(snum))
- type = STYPE_PRINTQ;
- if (strequal("IPC$", net_name))
- type = STYPE_IPC;
- if (net_name[len_net_name] == '$')
- type |= STYPE_HIDDEN;
-
- init_srv_share_info1(&sh1->info_1, net_name, type, remark);
- init_srv_share_info1_str(&sh1->info_1_str, net_name, remark);
-}
-
-/*******************************************************************
- Fill in a share info level 2 structure.
- ********************************************************************/
-
-static void init_srv_share_info_2(SRV_SHARE_INFO_2 *sh2, int snum)
-{
- int len_net_name;
- pstring net_name;
- pstring remark;
- pstring path;
- pstring passwd;
- uint32 type;
-
- pstrcpy(net_name, lp_servicename(snum));
- pstrcpy(remark, lp_comment(snum));
- pstring_sub(remark,"%S",lp_servicename(snum));
- pstrcpy(path, lp_pathname(snum));
- pstrcpy(passwd, "");
- len_net_name = strlen(net_name);
-
- /* work out the share type */
- type = STYPE_DISKTREE;
-
- if (lp_print_ok(snum))
- type = STYPE_PRINTQ;
- if (strequal("IPC$", net_name))
- type = STYPE_IPC;
- if (net_name[len_net_name] == '$')
- type |= STYPE_HIDDEN;
-
- init_srv_share_info2(&sh2->info_2, net_name, type, remark, 0, 0xffffffff, 1, path, passwd);
- init_srv_share_info2_str(&sh2->info_2_str, net_name, remark, path, passwd);
-}
-
-/***************************************************************************
- Fill in a share info level 1005 structure.
- ***************************************************************************/
-static void init_srv_share_info_1005(SRV_SHARE_INFO_1005* sh1005, int snum)
-{
- sh1005->dfs_root_flag = 0;
-
-#ifdef WITH_MSDFS
- if(lp_host_msdfs() && lp_msdfs_root(snum))
- sh1005->dfs_root_flag = 3;
-#endif
-
-}
-
-/*******************************************************************
- Fill in a share info structure.
- ********************************************************************/
-
-static BOOL init_srv_share_info_ctr(TALLOC_CTX *ctx, SRV_SHARE_INFO_CTR *ctr,
- uint32 info_level, uint32 *resume_hnd, uint32 *total_entries)
-{
- int num_entries = 0;
- int num_services = lp_numservices();
- int snum;
-
- DEBUG(5,("init_srv_share_info_ctr\n"));
-
- ZERO_STRUCTPN(ctr);
-
- ctr->info_level = ctr->switch_value = info_level;
- *resume_hnd = 0;
-
- /* Count the number of entries. */
- for (snum = 0; snum < num_services; snum++) {
- if (lp_browseable(snum) && lp_snum_ok(snum))
- num_entries++;
- }
-
- *total_entries = num_entries;
- ctr->num_entries2 = ctr->num_entries = num_entries;
- ctr->ptr_share_info = ctr->ptr_entries = 1;
-
- if (!num_entries)
- return True;
-
- switch (info_level) {
- case 1:
- {
- SRV_SHARE_INFO_1 *info1;
- int i = 0;
-
- info1 = talloc(ctx, num_entries * sizeof(SRV_SHARE_INFO_1));
-
- for (snum = *resume_hnd; snum < num_services; snum++) {
- if (lp_browseable(snum) && lp_snum_ok(snum)) {
- init_srv_share_info_1(&info1[i++], snum);
- }
- }
-
- ctr->share.info1 = info1;
- break;
- }
-
- case 2:
- {
- SRV_SHARE_INFO_2 *info2;
- int i = 0;
-
- info2 = talloc(ctx, num_entries * sizeof(SRV_SHARE_INFO_2));
-
- for (snum = *resume_hnd; snum < num_services; snum++) {
- if (lp_browseable(snum) && lp_snum_ok(snum)) {
- init_srv_share_info_2(&info2[i++], snum);
- }
- }
-
- ctr->share.info2 = info2;
- break;
- }
-
- default:
- DEBUG(5,("init_srv_share_info_ctr: unsupported switch value %d\n", info_level));
- return False;
- }
-
- return True;
-}
-
-/*******************************************************************
- Inits a SRV_R_NET_SHARE_ENUM structure.
-********************************************************************/
-
-static void init_srv_r_net_share_enum(TALLOC_CTX *ctx, SRV_R_NET_SHARE_ENUM *r_n,
- uint32 info_level, uint32 resume_hnd)
-{
- DEBUG(5,("init_srv_r_net_share_enum: %d\n", __LINE__));
-
- if (init_srv_share_info_ctr(ctx, &r_n->ctr, info_level,
- &resume_hnd, &r_n->total_entries)) {
- r_n->status = 0x0;
- } else {
- r_n->status = NT_STATUS_INVALID_INFO_CLASS;
- }
-
- init_enum_hnd(&r_n->enum_hnd, resume_hnd);
-}
-
-/*******************************************************************
- Net share enum.
-********************************************************************/
-
-static BOOL srv_reply_net_share_enum(SRV_Q_NET_SHARE_ENUM *q_n,
- prs_struct *rdata)
-{
- SRV_R_NET_SHARE_ENUM r_n;
- BOOL ret;
- TALLOC_CTX *ctx = talloc_init();
-
- DEBUG(5,("srv_net_share_enum: %d\n", __LINE__));
-
- if (!ctx) {
- DEBUG(0,("srv_reply_net_share_enum: talloc_init failed.\n"));
- return False;
- }
-
- /* Create the list of shares for the response. */
- init_srv_r_net_share_enum(ctx, &r_n,
- q_n->ctr.info_level,
- get_enum_hnd(&q_n->enum_hnd));
-
- /* store the response in the SMB stream */
- ret = srv_io_r_net_share_enum("", &r_n, rdata, 0);
-
- DEBUG(5,("srv_net_share_enum: %d\n", __LINE__));
- talloc_destroy(ctx);
-
- return ret;
-}
-
-/*******************************************************************
- Inits a SRV_R_NET_SHARE_GET_INFO structure.
-********************************************************************/
-
-static void init_srv_r_net_share_get_info(SRV_R_NET_SHARE_GET_INFO *r_n,
- char *share_name, uint32 info_level)
-{
- uint32 status = 0x0;
- int snum;
-
- DEBUG(5,("init_srv_r_net_share_get_info: %d\n", __LINE__));
-
- r_n->switch_value = info_level;
-
- snum = find_service(share_name);
-
- if (snum >= 0) {
- switch (info_level) {
- case 1:
- init_srv_share_info_1(&r_n->share.info1, snum);
- break;
- case 2:
- init_srv_share_info_2(&r_n->share.info2, snum);
- break;
- case 1005:
- init_srv_share_info_1005(&r_n->share.info1005, snum);
- break;
- default:
- DEBUG(5,("init_srv_net_share_get_info: unsupported switch value %d\n", info_level));
- status = NT_STATUS_INVALID_INFO_CLASS;
- break;
- }
- } else {
- status = NT_STATUS_BAD_NETWORK_NAME;
- }
-
- r_n->ptr_share_ctr = (status == 0x0) ? 1 : 0;
- r_n->status = status;
-}
-
-/*******************************************************************
- Net share get info.
-********************************************************************/
-
-static BOOL srv_reply_net_share_get_info(SRV_Q_NET_SHARE_GET_INFO *q_n,
- prs_struct *rdata)
-{
- SRV_R_NET_SHARE_GET_INFO r_n;
- char *share_name;
- BOOL ret;
-
- DEBUG(5,("srv_net_share_get_info: %d\n", __LINE__));
-
- /* Create the list of shares for the response. */
- share_name = dos_unistr2_to_str(&q_n->uni_share_name);
- init_srv_r_net_share_get_info(&r_n, share_name, q_n->info_level);
-
- /* store the response in the SMB stream */
- ret = srv_io_r_net_share_get_info("", &r_n, rdata, 0);
-
- DEBUG(5,("srv_net_share_get_info: %d\n", __LINE__));
-
- return ret;
-}
-
-/*******************************************************************
- fill in a sess info level 1 structure.
-
- this function breaks the rule that i'd like to be in place, namely
- it doesn't receive its data as arguments: it has to call lp_xxxx()
- functions itself. yuck.
-
- ********************************************************************/
-static void init_srv_sess_0_info(SESS_INFO_0 *se0, SESS_INFO_0_STR *str0,
- char *name)
-{
- init_srv_sess_info0 (se0 , name);
- init_srv_sess_info0_str(str0, name);
-}
-
-/*******************************************************************
- fill in a sess info level 0 structure.
-
- this function breaks the rule that i'd like to be in place, namely
- it doesn't receive its data as arguments: it has to call lp_xxxx()
- functions itself. yuck.
-
- ********************************************************************/
-static void init_srv_sess_info_0(SRV_SESS_INFO_0 *ss0, uint32 *snum, uint32 *stot)
-{
- uint32 num_entries = 0;
- (*stot) = 1;
-
- if (ss0 == NULL)
- {
- (*snum) = 0;
- return;
- }
-
- DEBUG(5,("init_srv_sess_0_ss0\n"));
-
- if (snum)
- {
- for (; (*snum) < (*stot) && num_entries < MAX_SESS_ENTRIES; (*snum)++)
- {
- init_srv_sess_0_info(&(ss0->info_0 [num_entries]),
- &(ss0->info_0_str[num_entries]), "MACHINE");
-
- /* move on to creating next session */
- /* move on to creating next sess */
- num_entries++;
- }
-
- ss0->num_entries_read = num_entries;
- ss0->ptr_sess_info = num_entries > 0 ? 1 : 0;
- ss0->num_entries_read2 = num_entries;
-
- if ((*snum) >= (*stot))
- {
- (*snum) = 0;
- }
- }
- else
- {
- ss0->num_entries_read = 0;
- ss0->ptr_sess_info = 0;
- ss0->num_entries_read2 = 0;
- }
-}
-
-/*******************************************************************
- fill in a sess info level 1 structure.
-
- this function breaks the rule that i'd like to be in place, namely
- it doesn't receive its data as arguments: it has to call lp_xxxx()
- functions itself. yuck.
-
- ********************************************************************/
-static void init_srv_sess_1_info(SESS_INFO_1 *se1, SESS_INFO_1_STR *str1,
- char *name, char *user,
- uint32 num_opens,
- uint32 open_time, uint32 idle_time,
- uint32 usr_flgs)
-{
- init_srv_sess_info1 (se1 , name, user, num_opens, open_time, idle_time, usr_flgs);
- init_srv_sess_info1_str(str1, name, user);
-}
/*******************************************************************
- fill in a sess info level 1 structure.
-
- this function breaks the rule that i'd like to be in place, namely
- it doesn't receive its data as arguments: it has to call lp_xxxx()
- functions itself. yuck.
-
- ********************************************************************/
-static void init_srv_sess_info_1(SRV_SESS_INFO_1 *ss1, uint32 *snum, uint32 *stot)
-{
- uint32 num_entries = 0;
- (*stot) = 1;
-
- if (ss1 == NULL)
- {
- (*snum) = 0;
- return;
- }
-
- DEBUG(5,("init_srv_sess_1_ss1\n"));
-
- if (snum)
- {
- for (; (*snum) < (*stot) && num_entries < MAX_SESS_ENTRIES; (*snum)++)
- {
- init_srv_sess_1_info(&(ss1->info_1 [num_entries]),
- &(ss1->info_1_str[num_entries]),
- "MACHINE", "dummy_user", 1, 10, 5, 0);
-
- /* move on to creating next session */
- /* move on to creating next sess */
- num_entries++;
- }
-
- ss1->num_entries_read = num_entries;
- ss1->ptr_sess_info = num_entries > 0 ? 1 : 0;
- ss1->num_entries_read2 = num_entries;
-
- if ((*snum) >= (*stot))
- {
- (*snum) = 0;
- }
- }
- else
- {
- ss1->num_entries_read = 0;
- ss1->ptr_sess_info = 0;
- ss1->num_entries_read2 = 0;
-
- (*stot) = 0;
- }
-}
-
-/*******************************************************************
- makes a SRV_R_NET_SESS_ENUM structure.
-********************************************************************/
-static uint32 init_srv_sess_info_ctr(SRV_SESS_INFO_CTR *ctr,
- int switch_value, uint32 *resume_hnd, uint32 *total_entries)
-{
- uint32 status = 0x0;
- DEBUG(5,("init_srv_sess_info_ctr: %d\n", __LINE__));
-
- ctr->switch_value = switch_value;
-
- switch (switch_value)
- {
- case 0:
- {
- init_srv_sess_info_0(&(ctr->sess.info0), resume_hnd, total_entries);
- ctr->ptr_sess_ctr = 1;
- break;
- }
- case 1:
- {
- init_srv_sess_info_1(&(ctr->sess.info1), resume_hnd, total_entries);
- ctr->ptr_sess_ctr = 1;
- break;
- }
- default:
- {
- DEBUG(5,("init_srv_sess_info_ctr: unsupported switch value %d\n",
- switch_value));
- (*resume_hnd) = 0;
- (*total_entries) = 0;
- ctr->ptr_sess_ctr = 0;
- status = NT_STATUS_INVALID_INFO_CLASS;
- break;
- }
- }
-
- return status;
-}
-
-/*******************************************************************
- makes a SRV_R_NET_SESS_ENUM structure.
+ api_srv_net_srv_get_info
********************************************************************/
-static void init_srv_r_net_sess_enum(SRV_R_NET_SESS_ENUM *r_n,
- uint32 resume_hnd, int sess_level, int switch_value)
-{
- DEBUG(5,("init_srv_r_net_sess_enum: %d\n", __LINE__));
-
- r_n->sess_level = sess_level;
- if (sess_level == -1)
- {
- r_n->status = NT_STATUS_INVALID_INFO_CLASS;
- }
- else
- {
- r_n->status = init_srv_sess_info_ctr(r_n->ctr, switch_value, &resume_hnd, &r_n->total_entries);
- }
- if (r_n->status != 0x0)
- {
- resume_hnd = 0;
- }
- init_enum_hnd(&(r_n->enum_hnd), resume_hnd);
-}
-
-/*******************************************************************
-net sess enum
-********************************************************************/
-static void srv_reply_net_sess_enum(SRV_Q_NET_SESS_ENUM *q_n,
- prs_struct *rdata)
-{
- SRV_R_NET_SESS_ENUM r_n;
- SRV_SESS_INFO_CTR ctr;
-
- r_n.ctr = &ctr;
-
- DEBUG(5,("srv_net_sess_enum: %d\n", __LINE__));
-
- /* set up the */
- init_srv_r_net_sess_enum(&r_n,
- get_enum_hnd(&q_n->enum_hnd),
- q_n->sess_level,
- q_n->ctr->switch_value);
-
- /* store the response in the SMB stream */
- srv_io_r_net_sess_enum("", &r_n, rdata, 0);
-
- DEBUG(5,("srv_net_sess_enum: %d\n", __LINE__));
-}
-
-/*******************************************************************
- fill in a conn info level 0 structure.
-
- this function breaks the rule that i'd like to be in place, namely
- it doesn't receive its data as arguments: it has to call lp_xxxx()
- functions itself. yuck.
-
- ********************************************************************/
-static void init_srv_conn_info_0(SRV_CONN_INFO_0 *ss0, uint32 *snum, uint32 *stot)
-{
- uint32 num_entries = 0;
- (*stot) = 1;
-
- if (ss0 == NULL)
- {
- (*snum) = 0;
- return;
- }
-
- DEBUG(5,("init_srv_conn_0_ss0\n"));
-
- if (snum)
- {
- for (; (*snum) < (*stot) && num_entries < MAX_CONN_ENTRIES; (*snum)++)
- {
- init_srv_conn_info0(&(ss0->info_0 [num_entries]), (*stot));
-
- /* move on to creating next connection */
- /* move on to creating next conn */
- num_entries++;
- }
-
- ss0->num_entries_read = num_entries;
- ss0->ptr_conn_info = num_entries > 0 ? 1 : 0;
- ss0->num_entries_read2 = num_entries;
-
-
- if ((*snum) >= (*stot))
- {
- (*snum) = 0;
- }
- }
- else
- {
- ss0->num_entries_read = 0;
- ss0->ptr_conn_info = 0;
- ss0->num_entries_read2 = 0;
-
- (*stot) = 0;
- }
-}
-
-/*******************************************************************
- fill in a conn info level 1 structure.
-
- this function breaks the rule that i'd like to be in place, namely
- it doesn't receive its data as arguments: it has to call lp_xxxx()
- functions itself. yuck.
-
- ********************************************************************/
-static void init_srv_conn_1_info(CONN_INFO_1 *se1, CONN_INFO_1_STR *str1,
- uint32 id, uint32 type,
- uint32 num_opens, uint32 num_users, uint32 open_time,
- char *usr_name, char *net_name)
-{
- init_srv_conn_info1 (se1 , id, type, num_opens, num_users, open_time, usr_name, net_name);
- init_srv_conn_info1_str(str1, usr_name, net_name);
-}
-
-/*******************************************************************
- fill in a conn info level 1 structure.
-
- this function breaks the rule that i'd like to be in place, namely
- it doesn't receive its data as arguments: it has to call lp_xxxx()
- functions itself. yuck.
-
- ********************************************************************/
-static void init_srv_conn_info_1(SRV_CONN_INFO_1 *ss1, uint32 *snum, uint32 *stot)
-{
- uint32 num_entries = 0;
- (*stot) = 1;
-
- if (ss1 == NULL)
- {
- (*snum) = 0;
- return;
- }
-
- DEBUG(5,("init_srv_conn_1_ss1\n"));
-
- if (snum)
- {
- for (; (*snum) < (*stot) && num_entries < MAX_CONN_ENTRIES; (*snum)++)
- {
- init_srv_conn_1_info(&(ss1->info_1 [num_entries]),
- &(ss1->info_1_str[num_entries]),
- (*stot), 0x3, 1, 1, 3,"dummy_user", "IPC$");
-
- /* move on to creating next connection */
- /* move on to creating next conn */
- num_entries++;
- }
-
- ss1->num_entries_read = num_entries;
- ss1->ptr_conn_info = num_entries > 0 ? 1 : 0;
- ss1->num_entries_read2 = num_entries;
-
-
- if ((*snum) >= (*stot))
- {
- (*snum) = 0;
- }
- }
- else
- {
- ss1->num_entries_read = 0;
- ss1->ptr_conn_info = 0;
- ss1->num_entries_read2 = 0;
-
- (*stot) = 0;
- }
-}
-
-/*******************************************************************
- makes a SRV_R_NET_CONN_ENUM structure.
-********************************************************************/
-static uint32 init_srv_conn_info_ctr(SRV_CONN_INFO_CTR *ctr,
- int switch_value, uint32 *resume_hnd, uint32 *total_entries)
-{
- uint32 status = 0x0;
- DEBUG(5,("init_srv_conn_info_ctr: %d\n", __LINE__));
-
- ctr->switch_value = switch_value;
-
- switch (switch_value)
- {
- case 0:
- {
- init_srv_conn_info_0(&(ctr->conn.info0), resume_hnd, total_entries);
- ctr->ptr_conn_ctr = 1;
- break;
- }
- case 1:
- {
- init_srv_conn_info_1(&(ctr->conn.info1), resume_hnd, total_entries);
- ctr->ptr_conn_ctr = 1;
- break;
- }
- default:
- {
- DEBUG(5,("init_srv_conn_info_ctr: unsupported switch value %d\n",
- switch_value));
- (*resume_hnd = 0);
- (*total_entries) = 0;
- ctr->ptr_conn_ctr = 0;
- status = NT_STATUS_INVALID_INFO_CLASS;
- break;
- }
- }
-
- return status;
-}
-
-/*******************************************************************
- makes a SRV_R_NET_CONN_ENUM structure.
-********************************************************************/
-static void init_srv_r_net_conn_enum(SRV_R_NET_CONN_ENUM *r_n,
- uint32 resume_hnd, int conn_level, int switch_value)
-{
- DEBUG(5,("init_srv_r_net_conn_enum: %d\n", __LINE__));
-
- r_n->conn_level = conn_level;
- if (conn_level == -1)
- {
- r_n->status = NT_STATUS_INVALID_INFO_CLASS;
- }
- else
- {
- r_n->status = init_srv_conn_info_ctr(r_n->ctr, switch_value, &resume_hnd, &r_n->total_entries);
- }
- if (r_n->status != 0x0)
- {
- resume_hnd = 0;
- }
- init_enum_hnd(&(r_n->enum_hnd), resume_hnd);
-}
-
-/*******************************************************************
-net conn enum
-********************************************************************/
-static void srv_reply_net_conn_enum(SRV_Q_NET_CONN_ENUM *q_n,
- prs_struct *rdata)
-{
- SRV_R_NET_CONN_ENUM r_n;
- SRV_CONN_INFO_CTR ctr;
-
- r_n.ctr = &ctr;
-
- DEBUG(5,("srv_net_conn_enum: %d\n", __LINE__));
-
- /* set up the */
- init_srv_r_net_conn_enum(&r_n,
- get_enum_hnd(&q_n->enum_hnd),
- q_n->conn_level,
- q_n->ctr->switch_value);
-
- /* store the response in the SMB stream */
- srv_io_r_net_conn_enum("", &r_n, rdata, 0);
-
- DEBUG(5,("srv_net_conn_enum: %d\n", __LINE__));
-}
-
-/*******************************************************************
- fill in a file info level 3 structure.
- ********************************************************************/
-static void init_srv_file_3_info(FILE_INFO_3 *fl3, FILE_INFO_3_STR *str3,
- uint32 fnum, uint32 perms, uint32 num_locks,
- char *path_name, char *user_name)
-{
- init_srv_file_info3 (fl3 , fnum, perms, num_locks, path_name, user_name);
- init_srv_file_info3_str(str3, path_name, user_name);
-}
-
-/*******************************************************************
- fill in a file info level 3 structure.
-
- this function breaks the rule that i'd like to be in place, namely
- it doesn't receive its data as arguments: it has to call lp_xxxx()
- functions itself. yuck.
-
- ********************************************************************/
-static void init_srv_file_info_3(SRV_FILE_INFO_3 *fl3, uint32 *fnum, uint32 *ftot)
-{
- uint32 num_entries = 0;
- (*ftot) = 1;
-
- if (fl3 == NULL)
- {
- (*fnum) = 0;
- return;
- }
-
- DEBUG(5,("init_srv_file_3_fl3\n"));
-
- for (; (*fnum) < (*ftot) && num_entries < MAX_FILE_ENTRIES; (*fnum)++)
- {
- init_srv_file_3_info(&(fl3->info_3 [num_entries]),
- &(fl3->info_3_str[num_entries]),
- (*fnum), 0x35, 0, "\\PIPE\\samr", "dummy user");
-
- /* move on to creating next file */
- num_entries++;
- }
-
- fl3->num_entries_read = num_entries;
- fl3->ptr_file_info = num_entries > 0 ? 1 : 0;
- fl3->num_entries_read2 = num_entries;
-
- if ((*fnum) >= (*ftot))
- {
- (*fnum) = 0;
- }
-}
-
-/*******************************************************************
- makes a SRV_R_NET_FILE_ENUM structure.
-********************************************************************/
-static uint32 init_srv_file_info_ctr(SRV_FILE_INFO_CTR *ctr,
- int switch_value, uint32 *resume_hnd, uint32 *total_entries)
-{
- uint32 status = 0x0;
- DEBUG(5,("init_srv_file_info_ctr: %d\n", __LINE__));
-
- ctr->switch_value = switch_value;
-
- switch (switch_value)
- {
- case 3:
- {
- init_srv_file_info_3(&(ctr->file.info3), resume_hnd, total_entries);
- ctr->ptr_file_ctr = 1;
- break;
- }
- default:
- {
- DEBUG(5,("init_srv_file_info_ctr: unsupported switch value %d\n",
- switch_value));
- (*resume_hnd = 0);
- (*total_entries) = 0;
- ctr->ptr_file_ctr = 0;
- status = NT_STATUS_INVALID_INFO_CLASS;
- break;
- }
- }
-
- return status;
-}
-
-/*******************************************************************
- makes a SRV_R_NET_FILE_ENUM structure.
-********************************************************************/
-static void init_srv_r_net_file_enum(SRV_R_NET_FILE_ENUM *r_n,
- uint32 resume_hnd, int file_level, int switch_value)
-{
- DEBUG(5,("init_srv_r_net_file_enum: %d\n", __LINE__));
-
- r_n->file_level = file_level;
- if (file_level == 0)
- {
- r_n->status = NT_STATUS_INVALID_INFO_CLASS;
- }
- else
- {
- r_n->status = init_srv_file_info_ctr(r_n->ctr, switch_value, &resume_hnd, &(r_n->total_entries));
- }
- if (r_n->status != 0x0)
- {
- resume_hnd = 0;
- }
- init_enum_hnd(&(r_n->enum_hnd), resume_hnd);
-}
-
-/*******************************************************************
-net file enum
-********************************************************************/
-static void srv_reply_net_file_enum(SRV_Q_NET_FILE_ENUM *q_n,
- prs_struct *rdata)
-{
- SRV_R_NET_FILE_ENUM r_n;
- SRV_FILE_INFO_CTR ctr;
-
- r_n.ctr = &ctr;
-
- DEBUG(5,("srv_net_file_enum: %d\n", __LINE__));
-
- /* set up the */
- init_srv_r_net_file_enum(&r_n,
- get_enum_hnd(&q_n->enum_hnd),
- q_n->file_level,
- q_n->ctr->switch_value);
-
- /* store the response in the SMB stream */
- srv_io_r_net_file_enum("", &r_n, rdata, 0);
-
- DEBUG(5,("srv_net_file_enum: %d\n", __LINE__));
-}
-
-/*******************************************************************
-net server get info
-********************************************************************/
-
-static void srv_reply_net_srv_get_info(SRV_Q_NET_SRV_GET_INFO *q_n,
- prs_struct *rdata)
-{
- SRV_R_NET_SRV_GET_INFO r_n;
- uint32 status = 0x0;
- SRV_INFO_CTR ctr;
-
-
- DEBUG(5,("srv_net_srv_get_info: %d\n", __LINE__));
-
- switch (q_n->switch_value)
- {
- case 102:
- {
- init_srv_info_102(&ctr.srv.sv102,
- 500, global_myname,
- string_truncate(lp_serverstring(), MAX_SERVER_STRING_LENGTH),
- lp_major_announce_version(), lp_minor_announce_version(),
- lp_default_server_announce(),
- 0xffffffff, /* users */
- 0xf, /* disc */
- 0, /* hidden */
- 240, /* announce */
- 3000, /* announce delta */
- 100000, /* licenses */
- "c:\\"); /* user path */
- break;
- }
- case 101:
- {
- init_srv_info_101(&ctr.srv.sv101,
- 500, global_myname,
- lp_major_announce_version(), lp_minor_announce_version(),
- lp_default_server_announce(),
- string_truncate(lp_serverstring(), MAX_SERVER_STRING_LENGTH));
- break;
- }
- default:
- {
- status = NT_STATUS_INVALID_INFO_CLASS;
- break;
- }
- }
-
- /* set up the net server get info structure */
- init_srv_r_net_srv_get_info(&r_n, q_n->switch_value, &ctr, status);
-
- /* store the response in the SMB stream */
- srv_io_r_net_srv_get_info("", &r_n, rdata, 0);
-
- DEBUG(5,("srv_net_srv_get_info: %d\n", __LINE__));
-}
-
-/*******************************************************************
-********************************************************************/
static BOOL api_srv_net_srv_get_info(pipes_struct *p)
{
- SRV_Q_NET_SRV_GET_INFO q_n;
+ SRV_Q_NET_SRV_GET_INFO q_u;
+ SRV_R_NET_SRV_GET_INFO r_u;
prs_struct *data = &p->in_data.data;
prs_struct *rdata = &p->out_data.rdata;
+ ZERO_STRUCT(q_u);
+ ZERO_STRUCT(r_u);
+
/* grab the net server get info */
- srv_io_q_net_srv_get_info("", &q_n, data, 0);
+ if (!srv_io_q_net_srv_get_info("", &q_u, data, 0))
+ return False;
- /* construct reply. always indicate success */
- srv_reply_net_srv_get_info(&q_n, rdata);
+ r_u.status = _srv_net_srv_get_info(p, &q_u, &r_u);
+
+ /* store the response in the SMB stream */
+ if (!srv_io_r_net_srv_get_info("", &r_u, rdata, 0))
+ return False;
return True;
}
-
/*******************************************************************
+ api_srv_net_file_enum
********************************************************************/
+
static BOOL api_srv_net_file_enum(pipes_struct *p)
{
- SRV_Q_NET_FILE_ENUM q_n;
- SRV_FILE_INFO_CTR ctr;
+ SRV_Q_NET_FILE_ENUM q_u;
+ SRV_R_NET_FILE_ENUM r_u;
prs_struct *data = &p->in_data.data;
prs_struct *rdata = &p->out_data.rdata;
- q_n.ctr = &ctr;
+ ZERO_STRUCT(q_u);
+ ZERO_STRUCT(r_u);
/* grab the net file enum */
- srv_io_q_net_file_enum("", &q_n, data, 0);
+ if (!srv_io_q_net_file_enum("", &q_u, data, 0))
+ return False;
- /* construct reply. always indicate success */
- srv_reply_net_file_enum(&q_n, rdata);
+ r_u.status = _srv_net_file_enum(p, &q_u, &r_u);
+
+ /* store the response in the SMB stream */
+ if(!srv_io_r_net_file_enum("", &r_u, rdata, 0))
+ return False;
return True;
}
-
/*******************************************************************
+ api_srv_net_conn_enum
********************************************************************/
+
static BOOL api_srv_net_conn_enum(pipes_struct *p)
{
- SRV_Q_NET_CONN_ENUM q_n;
- SRV_CONN_INFO_CTR ctr;
+ SRV_Q_NET_CONN_ENUM q_u;
+ SRV_R_NET_CONN_ENUM r_u;
prs_struct *data = &p->in_data.data;
prs_struct *rdata = &p->out_data.rdata;
- q_n.ctr = &ctr;
+ ZERO_STRUCT(q_u);
+ ZERO_STRUCT(r_u);
/* grab the net server get enum */
- srv_io_q_net_conn_enum("", &q_n, data, 0);
+ if (!srv_io_q_net_conn_enum("", &q_u, data, 0))
+ return False;
- /* construct reply. always indicate success */
- srv_reply_net_conn_enum(&q_n, rdata);
+ r_u.status = _srv_net_conn_enum(p, &q_u, &r_u);
+
+ /* store the response in the SMB stream */
+ if (!srv_io_r_net_conn_enum("", &r_u, rdata, 0))
+ return False;
return True;
}
-
/*******************************************************************
+ Enumerate sessions.
********************************************************************/
+
static BOOL api_srv_net_sess_enum(pipes_struct *p)
{
- SRV_Q_NET_SESS_ENUM q_n;
- SRV_SESS_INFO_CTR ctr;
+ SRV_Q_NET_SESS_ENUM q_u;
+ SRV_R_NET_SESS_ENUM r_u;
prs_struct *data = &p->in_data.data;
prs_struct *rdata = &p->out_data.rdata;
- q_n.ctr = &ctr;
+ ZERO_STRUCT(q_u);
+ ZERO_STRUCT(r_u);
/* grab the net server get enum */
- srv_io_q_net_sess_enum("", &q_n, data, 0);
+ if (!srv_io_q_net_sess_enum("", &q_u, data, 0))
+ return False;
/* construct reply. always indicate success */
- srv_reply_net_sess_enum(&q_n, rdata);
+ r_u.status = _srv_net_sess_enum(p, &q_u, &r_u);
+
+ /* store the response in the SMB stream */
+ if (!srv_io_r_net_sess_enum("", &r_u, rdata, 0))
+ return False;
return True;
}
-
/*******************************************************************
RPC to enumerate shares.
********************************************************************/
static BOOL api_srv_net_share_enum(pipes_struct *p)
{
- SRV_Q_NET_SHARE_ENUM q_n;
- BOOL ret;
+ SRV_Q_NET_SHARE_ENUM q_u;
+ SRV_R_NET_SHARE_ENUM 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 get enum. */
- if(!srv_io_q_net_share_enum("", &q_n, data, 0)) {
+ if(!srv_io_q_net_share_enum("", &q_u, data, 0)) {
DEBUG(0,("api_srv_net_share_enum: Failed to unmarshall SRV_Q_NET_SHARE_ENUM.\n"));
return False;
}
- ret = srv_reply_net_share_enum(&q_n, rdata);
+ r_u.status = _srv_net_share_enum(p, &q_u, &r_u);
- return ret;
+ if (!srv_io_r_net_share_enum("", &r_u, rdata, 0)) {
+ DEBUG(0,("api_srv_net_share_enum: Failed to marshall SRV_R_NET_SHARE_ENUM.\n"));
+ return False;
+ }
+
+ return True;
}
/*******************************************************************
@@ -1034,84 +174,61 @@ static BOOL api_srv_net_share_enum(pipes_struct *p)
static BOOL api_srv_net_share_get_info(pipes_struct *p)
{
- SRV_Q_NET_SHARE_GET_INFO q_n;
- BOOL ret;
+ SRV_Q_NET_SHARE_GET_INFO q_u;
+ SRV_R_NET_SHARE_GET_INFO 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 get info. */
- if(!srv_io_q_net_share_get_info("", &q_n, data, 0)) {
+ if(!srv_io_q_net_share_get_info("", &q_u, data, 0)) {
DEBUG(0,("api_srv_net_share_get_info: Failed to unmarshall SRV_Q_NET_SHARE_GET_INFO.\n"));
return False;
}
- ret = srv_reply_net_share_get_info(&q_n, rdata);
+ r_u.status = _srv_net_share_get_info(p, &q_u, &r_u);
- return ret;
-}
-
-/*******************************************************************
-time of day
-********************************************************************/
-static BOOL srv_reply_net_remote_tod(SRV_Q_NET_REMOTE_TOD *q_n,
- prs_struct *rdata)
-{
- SRV_R_NET_REMOTE_TOD r_n;
- TIME_OF_DAY_INFO tod;
- struct tm *t;
- time_t unixdate = time(NULL);
-
- r_n.tod = &tod;
- r_n.ptr_srv_tod = 0x1;
- r_n.status = 0x0;
-
- DEBUG(5,("srv_reply_net_remote_tod: %d\n", __LINE__));
-
- t = gmtime(&unixdate);
-
- /* set up the */
- init_time_of_day_info(&tod,
- unixdate,
- 0,
- t->tm_hour,
- t->tm_min,
- t->tm_sec,
- 0,
- TimeDiff(unixdate)/60,
- 10000,
- t->tm_mday,
- t->tm_mon + 1,
- 1900+t->tm_year,
- t->tm_wday);
-
- /* store the response in the SMB stream */
- srv_io_r_net_remote_tod("", &r_n, rdata, 0);
-
- DEBUG(5,("srv_reply_net_remote_tod: %d\n", __LINE__));
+ if(!srv_io_r_net_share_get_info("", &r_u, rdata, 0)) {
+ DEBUG(0,("api_srv_net_share_get_info: Failed to marshall SRV_R_NET_SHARE_GET_INFO.\n"));
+ return False;
+ }
return True;
}
+
/*******************************************************************
+ api_srv_net_remote_tod
********************************************************************/
+
static BOOL api_srv_net_remote_tod(pipes_struct *p)
{
- SRV_Q_NET_REMOTE_TOD q_n;
+ SRV_Q_NET_REMOTE_TOD q_u;
+ SRV_R_NET_REMOTE_TOD r_u;
prs_struct *data = &p->in_data.data;
prs_struct *rdata = &p->out_data.rdata;
+ ZERO_STRUCT(q_u);
+ ZERO_STRUCT(r_u);
+
/* grab the net server get enum */
- srv_io_q_net_remote_tod("", &q_n, data, 0);
+ if(!srv_io_q_net_remote_tod("", &q_u, data, 0))
+ return False;
- /* construct reply. always indicate success */
- srv_reply_net_remote_tod(&q_n, rdata);
+ r_u.status = _srv_net_remote_tod(p, &q_u, &r_u);
+
+ /* store the response in the SMB stream */
+ if(!srv_io_r_net_remote_tod("", &r_u, rdata, 0))
+ return False;
return True;
}
-
/*******************************************************************
\PIPE\srvsvc commands
********************************************************************/
+
struct api_struct api_srv_cmds[] =
{
{ "SRV_NETCONNENUM" , SRV_NETCONNENUM , api_srv_net_conn_enum },