From 95731132dc3cb78a41fc83c68af0f0168f07f246 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 26 Feb 2001 20:06:25 +0000 Subject: Split wks pipe into interface and implementation modules. Jeremy. (This used to be commit 6a16b3850fdc4d6750ef2046f1db934f1ef92f17) --- source3/Makefile.in | 2 +- source3/include/proto.h | 8 ++++ source3/rpc_server/srv_wkssvc.c | 64 ++++++------------------------- source3/rpc_server/srv_wkssvc_nt.c | 77 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 97 insertions(+), 54 deletions(-) create mode 100644 source3/rpc_server/srv_wkssvc_nt.c (limited to 'source3') diff --git a/source3/Makefile.in b/source3/Makefile.in index 85462979ce..ad10ebf69d 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -132,7 +132,7 @@ 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_util.o rpc_server/srv_wkssvc.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 5d2c792b84..9bdca542fb 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -3343,6 +3343,7 @@ BOOL close_lsa_policy_hnd(POLICY_HND *hnd); /*The following definitions come from rpc_server/srv_lsa_nt.c */ +#if OLD_NTDOMAIN uint32 _lsa_open_policy2(pipes_struct *p, LSA_Q_OPEN_POL2 *q_u, LSA_R_OPEN_POL2 *r_u); uint32 _lsa_open_policy(pipes_struct *p, LSA_Q_OPEN_POL *q_u, LSA_R_OPEN_POL *r_u); uint32 _lsa_enum_trust_dom(pipes_struct *p, LSA_Q_ENUM_TRUST_DOM *q_u, LSA_R_ENUM_TRUST_DOM *r_u); @@ -3351,6 +3352,7 @@ uint32 _lsa_lookup_sids(pipes_struct *p, LSA_Q_LOOKUP_SIDS *q_u, LSA_R_LOOKUP_SI uint32 _lsa_lookup_names(pipes_struct *p,LSA_Q_LOOKUP_NAMES *q_u, LSA_R_LOOKUP_NAMES *r_u); uint32 _lsa_close(pipes_struct *p, LSA_Q_CLOSE *q_u, LSA_R_CLOSE *r_u); uint32 _lsa_open_secret(pipes_struct *p, LSA_Q_OPEN_SECRET *q_u, LSA_R_OPEN_SECRET *r_u); +#endif /*The following definitions come from rpc_server/srv_netlog.c */ @@ -3557,6 +3559,12 @@ uint32 lookup_user_rid(char *user_name, uint32 *rid); BOOL api_wkssvc_rpc(pipes_struct *p); #endif +/*The following definitions come from rpc_server/srv_wkssvc_nt.c */ + +#if OLD_NTDOMAIN +uint32 _wks_query_info(pipes_struct *p, WKS_Q_QUERY_INFO *q_u, WKS_R_QUERY_INFO *r_u); +#endif + /*The following definitions come from rpcclient/cmd_lsarpc.c */ diff --git a/source3/rpc_server/srv_wkssvc.c b/source3/rpc_server/srv_wkssvc.c index d1e0c8e8eb..e648c0f122 100644 --- a/source3/rpc_server/srv_wkssvc.c +++ b/source3/rpc_server/srv_wkssvc.c @@ -22,76 +22,34 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* This is the interface to the wks pipe. */ + #include "includes.h" extern int DEBUGLEVEL; -extern pstring global_myname; - -/******************************************************************* - create_wks_info_100 - ********************************************************************/ -static void create_wks_info_100(WKS_INFO_100 *inf) -{ - pstring my_name; - pstring domain; - - DEBUG(5,("create_wks_info_100: %d\n", __LINE__)); - - pstrcpy (my_name, global_myname); - strupper(my_name); - - pstrcpy (domain, lp_workgroup()); - strupper(domain); - - init_wks_info_100(inf, - 0x000001f4, /* platform id info */ - lp_major_announce_version(), - lp_minor_announce_version(), - my_name, unix_to_dos(domain,False)); -} - -/******************************************************************* - wks_reply_query_info - - only supports info level 100 at the moment. - - ********************************************************************/ -static BOOL wks_reply_query_info(WKS_Q_QUERY_INFO *q_u, - prs_struct *rdata, - int status) -{ - WKS_R_QUERY_INFO r_u; - WKS_INFO_100 wks100; - - DEBUG(5,("wks_query_info: %d\n", __LINE__)); - - create_wks_info_100(&wks100); - init_wks_r_query_info(&r_u, q_u->switch_value, &wks100, status); - - /* store the response in the SMB stream */ - if(!wks_io_r_query_info("", &r_u, rdata, 0)) - return False; - - DEBUG(5,("wks_query_info: %d\n", __LINE__)); - - return True; -} /******************************************************************* api_wks_query_info ********************************************************************/ + static BOOL api_wks_query_info(pipes_struct *p) { WKS_Q_QUERY_INFO q_u; + WKS_R_QUERY_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 share enum */ if(!wks_io_q_query_info("", &q_u, data, 0)) return False; - /* construct reply. always indicate success */ - if(!wks_reply_query_info(&q_u, rdata, 0x0)) + r_u.status = _wks_query_info(p, &q_u, &r_u); + + /* store the response in the SMB stream */ + if(!wks_io_r_query_info("", &r_u, rdata, 0)) return False; return True; diff --git a/source3/rpc_server/srv_wkssvc_nt.c b/source3/rpc_server/srv_wkssvc_nt.c new file mode 100644 index 0000000000..81d3e1ef8f --- /dev/null +++ b/source3/rpc_server/srv_wkssvc_nt.c @@ -0,0 +1,77 @@ +#define OLD_NTDOMAIN 1 +/* + * Unix SMB/Netbios implementation. + * Version 1.9. + * RPC Pipe client / server routines + * 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 + * the Free Software Foundation; either version 2 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, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* This is the implementation of the wks interface. */ + +#include "includes.h" + +extern int DEBUGLEVEL; +extern pstring global_myname; + +/******************************************************************* + create_wks_info_100 + ********************************************************************/ + +static void create_wks_info_100(WKS_INFO_100 *inf) +{ + pstring my_name; + pstring domain; + + DEBUG(5,("create_wks_info_100: %d\n", __LINE__)); + + pstrcpy (my_name, global_myname); + strupper(my_name); + + pstrcpy (domain, lp_workgroup()); + strupper(domain); + + init_wks_info_100(inf, + 0x000001f4, /* platform id info */ + lp_major_announce_version(), + lp_minor_announce_version(), + my_name, unix_to_dos(domain,False)); +} + +/******************************************************************* + wks_reply_query_info + + only supports info level 100 at the moment. + + ********************************************************************/ + +uint32 _wks_query_info(pipes_struct *p, WKS_Q_QUERY_INFO *q_u, WKS_R_QUERY_INFO *r_u) +{ + WKS_INFO_100 wks100; + + DEBUG(5,("_wks_query_info: %d\n", __LINE__)); + + create_wks_info_100(&wks100); + init_wks_r_query_info(r_u, q_u->switch_value, &wks100, NT_STATUS_NOPROBLEMO); + + DEBUG(5,("_wks_query_info: %d\n", __LINE__)); + + return r_u->status; +} +#undef OLD_NTDOMAIN -- cgit