diff options
| -rw-r--r-- | source3/Makefile.in | 4 | ||||
| -rw-r--r-- | source3/lib/dummyparam.c | 35 | ||||
| -rw-r--r-- | source3/lib/dummysmbd.c | 11 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 21 | ||||
| -rw-r--r-- | source3/param/service.c | 276 | ||||
| -rw-r--r-- | source3/smbd/service.c | 226 | ||||
| -rwxr-xr-x | source3/wscript_build | 8 |
7 files changed, 319 insertions, 262 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 366ecffc86..ab59ad0104 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -485,7 +485,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \ ../libcli/security/security_token.o ../libcli/security/util_sid.o \ ../libcli/smb/util.o -LIB_DUMMY_OBJ = lib/dummysmbd.o lib/dummyroot.o +LIB_DUMMY_OBJ = lib/dummysmbd.o lib/dummyparam.o lib/dummyroot.o LIB_NONSMBD_OBJ = $(LIB_OBJ) $(LIB_DUMMY_OBJ) READLINE_OBJ = ../libcli/smbreadline/smbreadline.o @@ -899,7 +899,7 @@ SMBD_OBJ_SRV = smbd/server_reload.o \ smbd/blocking.o smbd/sec_ctx.o smbd/srvstr.o \ smbd/vfs.o smbd/perfcount.o smbd/statcache.o smbd/seal.o \ smbd/posix_acls.o lib/sysacls.o \ - smbd/process.o smbd/service.o smbd/error.o \ + smbd/process.o smbd/service.o param/service.o smbd/error.o \ rpc_server/epmd.o \ printing/printspoolss.o printing/spoolssd.o \ lib/sysquotas.o lib/sysquotas_linux.o \ diff --git a/source3/lib/dummyparam.c b/source3/lib/dummyparam.c new file mode 100644 index 0000000000..bad5d56ffc --- /dev/null +++ b/source3/lib/dummyparam.c @@ -0,0 +1,35 @@ +/* + Unix SMB/CIFS implementation. + RPC pipe client + + Copyright (C) Gerald (Jerry) Carter 2004. + + 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 <http://www.gnu.org/licenses/>. +*/ + +/* Stupid dummy functions required due to the horrible dependency mess + in Samba. */ + +#include "includes.h" + +int find_service(TALLOC_CTX *ctx, const char *service_in, char **p_service_out) +{ + return -1; +} + +bool conn_snum_used(struct smbd_server_connection *sconn, + int snum) +{ + return False; +} diff --git a/source3/lib/dummysmbd.c b/source3/lib/dummysmbd.c index 7a6c2cd319..1d311a2dd9 100644 --- a/source3/lib/dummysmbd.c +++ b/source3/lib/dummysmbd.c @@ -23,17 +23,6 @@ #include "includes.h" -int find_service(TALLOC_CTX *ctx, const char *service_in, char **p_service_out) -{ - return -1; -} - -bool conn_snum_used(struct smbd_server_connection *sconn, - int snum) -{ - return False; -} - void cancel_pending_lock_requests_by_fid(files_struct *fsp, struct byte_range_lock *br_lck, enum file_close_type close_type) diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 8aff0cfdbe..2ee5988336 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -9798,27 +9798,6 @@ bool share_defined(const char *service_name) return (lp_servicenumber(service_name) != -1); } -struct share_params *get_share_params(TALLOC_CTX *mem_ctx, - const char *sharename) -{ - struct share_params *result; - char *sname = NULL; - int snum; - - snum = find_service(mem_ctx, sharename, &sname); - if (snum < 0 || sname == NULL) { - return NULL; - } - - if (!(result = TALLOC_P(mem_ctx, struct share_params))) { - DEBUG(0, ("talloc failed\n")); - return NULL; - } - - result->service = snum; - return result; -} - /******************************************************************* A useful volume label function. ********************************************************************/ diff --git a/source3/param/service.c b/source3/param/service.c new file mode 100644 index 0000000000..1545ef0171 --- /dev/null +++ b/source3/param/service.c @@ -0,0 +1,276 @@ +/* + Unix SMB/CIFS implementation. + service (connection) opening and closing + Copyright (C) Andrew Tridgell 1992-1998 + + 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 <http://www.gnu.org/licenses/>. +*/ + +#include "includes.h" +#include "system/filesys.h" +#include "../lib/tsocket/tsocket.h" +#include "smbd/smbd.h" +#include "smbd/globals.h" +#include "../librpc/gen_ndr/netlogon.h" +#include "../libcli/security/security.h" +#include "printing/pcap.h" +#include "passdb/lookup_sid.h" +#include "auth.h" + +static int load_registry_service(const char *servicename) +{ + if (!lp_registry_shares()) { + return -1; + } + + if ((servicename == NULL) || (*servicename == '\0')) { + return -1; + } + + if (strequal(servicename, GLOBAL_NAME)) { + return -2; + } + + if (!process_registry_service(servicename)) { + return -1; + } + + return lp_servicenumber(servicename); +} + +void load_registry_shares(void) +{ + DEBUG(8, ("load_registry_shares()\n")); + if (!lp_registry_shares()) { + return; + } + + process_registry_shares(); + + return; +} + +/**************************************************************************** + Add a home service. Returns the new service number or -1 if fail. +****************************************************************************/ + +int add_home_service(const char *service, const char *username, const char *homedir) +{ + int iHomeService; + + if (!service || !homedir || homedir[0] == '\0') + return -1; + + if ((iHomeService = lp_servicenumber(HOMES_NAME)) < 0) { + if ((iHomeService = load_registry_service(HOMES_NAME)) < 0) { + return -1; + } + } + + /* + * If this is a winbindd provided username, remove + * the domain component before adding the service. + * Log a warning if the "path=" parameter does not + * include any macros. + */ + + { + const char *p = strchr(service,*lp_winbind_separator()); + + /* We only want the 'user' part of the string */ + if (p) { + service = p + 1; + } + } + + if (!lp_add_home(service, iHomeService, username, homedir)) { + return -1; + } + + return lp_servicenumber(service); + +} + +/** + * Find a service entry. + * + * @param service is modified (to canonical form??) + **/ + +int find_service(TALLOC_CTX *ctx, const char *service_in, char **p_service_out) +{ + int iService; + + if (!service_in) { + return -1; + } + + /* First make a copy. */ + *p_service_out = talloc_strdup(ctx, service_in); + if (!*p_service_out) { + return -1; + } + + all_string_sub(*p_service_out,"\\","/",0); + + iService = lp_servicenumber(*p_service_out); + + /* now handle the special case of a home directory */ + if (iService < 0) { + char *phome_dir = get_user_home_dir(ctx, *p_service_out); + + if(!phome_dir) { + /* + * Try mapping the servicename, it may + * be a Windows to unix mapped user name. + */ + if(map_username(ctx, *p_service_out, p_service_out)) { + if (*p_service_out == NULL) { + /* Out of memory. */ + return -1; + } + phome_dir = get_user_home_dir( + ctx, *p_service_out); + } + } + + DEBUG(3,("checking for home directory %s gave %s\n",*p_service_out, + phome_dir?phome_dir:"(NULL)")); + + iService = add_home_service(*p_service_out,*p_service_out /* 'username' */, phome_dir); + } + + /* If we still don't have a service, attempt to add it as a printer. */ + if (iService < 0) { + int iPrinterService; + + if ((iPrinterService = lp_servicenumber(PRINTERS_NAME)) < 0) { + iPrinterService = load_registry_service(PRINTERS_NAME); + } + if (iPrinterService >= 0) { + DEBUG(3,("checking whether %s is a valid printer name...\n", + *p_service_out)); + if (pcap_printername_ok(*p_service_out)) { + DEBUG(3,("%s is a valid printer name\n", + *p_service_out)); + DEBUG(3,("adding %s as a printer service\n", + *p_service_out)); + lp_add_printer(*p_service_out, iPrinterService); + iService = lp_servicenumber(*p_service_out); + if (iService < 0) { + DEBUG(0,("failed to add %s as a printer service!\n", + *p_service_out)); + } + } else { + DEBUG(3,("%s is not a valid printer name\n", + *p_service_out)); + } + } + } + + /* Check for default vfs service? Unsure whether to implement this */ + if (iService < 0) { + } + + if (iService < 0) { + iService = load_registry_service(*p_service_out); + } + + /* Is it a usershare service ? */ + if (iService < 0 && *lp_usershare_path()) { + /* Ensure the name is canonicalized. */ + strlower_m(*p_service_out); + iService = load_usershare_service(*p_service_out); + } + + /* just possibly it's a default service? */ + if (iService < 0) { + char *pdefservice = lp_defaultservice(); + if (pdefservice && + *pdefservice && + !strequal(pdefservice, *p_service_out) + && !strstr_m(*p_service_out,"..")) { + /* + * We need to do a local copy here as lp_defaultservice() + * returns one of the rotating lp_string buffers that + * could get overwritten by the recursive find_service() call + * below. Fix from Josef Hinteregger <joehtg@joehtg.co.at>. + */ + char *defservice = talloc_strdup(ctx, pdefservice); + + if (!defservice) { + goto fail; + } + + /* Disallow anything except explicit share names. */ + if (strequal(defservice,HOMES_NAME) || + strequal(defservice, PRINTERS_NAME) || + strequal(defservice, "IPC$")) { + TALLOC_FREE(defservice); + goto fail; + } + + iService = find_service(ctx, defservice, p_service_out); + if (!*p_service_out) { + TALLOC_FREE(defservice); + iService = -1; + goto fail; + } + if (iService >= 0) { + all_string_sub(*p_service_out, "_","/",0); + iService = lp_add_service(*p_service_out, iService); + } + TALLOC_FREE(defservice); + } + } + + if (iService >= 0) { + if (!VALID_SNUM(iService)) { + DEBUG(0,("Invalid snum %d for %s\n",iService, + *p_service_out)); + iService = -1; + } + } + + fail: + + if (iService < 0) { + DEBUG(3,("find_service() failed to find service %s\n", + *p_service_out)); + } + + return (iService); +} + + +struct share_params *get_share_params(TALLOC_CTX *mem_ctx, + const char *sharename) +{ + struct share_params *result; + char *sname = NULL; + int snum; + + snum = find_service(mem_ctx, sharename, &sname); + if (snum < 0 || sname == NULL) { + return NULL; + } + + if (!(result = TALLOC_P(mem_ctx, struct share_params))) { + DEBUG(0, ("talloc failed\n")); + return NULL; + } + + result->service = snum; + return result; +} diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 5ab612a20b..66c791bb55 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -222,232 +222,6 @@ bool set_current_service(connection_struct *conn, uint16 flags, bool do_chdir) return(True); } -static int load_registry_service(const char *servicename) -{ - if (!lp_registry_shares()) { - return -1; - } - - if ((servicename == NULL) || (*servicename == '\0')) { - return -1; - } - - if (strequal(servicename, GLOBAL_NAME)) { - return -2; - } - - if (!process_registry_service(servicename)) { - return -1; - } - - return lp_servicenumber(servicename); -} - -void load_registry_shares(void) -{ - DEBUG(8, ("load_registry_shares()\n")); - if (!lp_registry_shares()) { - return; - } - - process_registry_shares(); - - return; -} - -/**************************************************************************** - Add a home service. Returns the new service number or -1 if fail. -****************************************************************************/ - -int add_home_service(const char *service, const char *username, const char *homedir) -{ - int iHomeService; - - if (!service || !homedir || homedir[0] == '\0') - return -1; - - if ((iHomeService = lp_servicenumber(HOMES_NAME)) < 0) { - if ((iHomeService = load_registry_service(HOMES_NAME)) < 0) { - return -1; - } - } - - /* - * If this is a winbindd provided username, remove - * the domain component before adding the service. - * Log a warning if the "path=" parameter does not - * include any macros. - */ - - { - const char *p = strchr(service,*lp_winbind_separator()); - - /* We only want the 'user' part of the string */ - if (p) { - service = p + 1; - } - } - - if (!lp_add_home(service, iHomeService, username, homedir)) { - return -1; - } - - return lp_servicenumber(service); - -} - -/** - * Find a service entry. - * - * @param service is modified (to canonical form??) - **/ - -int find_service(TALLOC_CTX *ctx, const char *service_in, char **p_service_out) -{ - int iService; - - if (!service_in) { - return -1; - } - - /* First make a copy. */ - *p_service_out = talloc_strdup(ctx, service_in); - if (!*p_service_out) { - return -1; - } - - all_string_sub(*p_service_out,"\\","/",0); - - iService = lp_servicenumber(*p_service_out); - - /* now handle the special case of a home directory */ - if (iService < 0) { - char *phome_dir = get_user_home_dir(ctx, *p_service_out); - - if(!phome_dir) { - /* - * Try mapping the servicename, it may - * be a Windows to unix mapped user name. - */ - if(map_username(ctx, *p_service_out, p_service_out)) { - if (*p_service_out == NULL) { - /* Out of memory. */ - return -1; - } - phome_dir = get_user_home_dir( - ctx, *p_service_out); - } - } - - DEBUG(3,("checking for home directory %s gave %s\n",*p_service_out, - phome_dir?phome_dir:"(NULL)")); - - iService = add_home_service(*p_service_out,*p_service_out /* 'username' */, phome_dir); - } - - /* If we still don't have a service, attempt to add it as a printer. */ - if (iService < 0) { - int iPrinterService; - - if ((iPrinterService = lp_servicenumber(PRINTERS_NAME)) < 0) { - iPrinterService = load_registry_service(PRINTERS_NAME); - } - if (iPrinterService >= 0) { - DEBUG(3,("checking whether %s is a valid printer name...\n", - *p_service_out)); - if (pcap_printername_ok(*p_service_out)) { - DEBUG(3,("%s is a valid printer name\n", - *p_service_out)); - DEBUG(3,("adding %s as a printer service\n", - *p_service_out)); - lp_add_printer(*p_service_out, iPrinterService); - iService = lp_servicenumber(*p_service_out); - if (iService < 0) { - DEBUG(0,("failed to add %s as a printer service!\n", - *p_service_out)); - } - } else { - DEBUG(3,("%s is not a valid printer name\n", - *p_service_out)); - } - } - } - - /* Check for default vfs service? Unsure whether to implement this */ - if (iService < 0) { - } - - if (iService < 0) { - iService = load_registry_service(*p_service_out); - } - - /* Is it a usershare service ? */ - if (iService < 0 && *lp_usershare_path()) { - /* Ensure the name is canonicalized. */ - strlower_m(*p_service_out); - iService = load_usershare_service(*p_service_out); - } - - /* just possibly it's a default service? */ - if (iService < 0) { - char *pdefservice = lp_defaultservice(); - if (pdefservice && - *pdefservice && - !strequal(pdefservice, *p_service_out) - && !strstr_m(*p_service_out,"..")) { - /* - * We need to do a local copy here as lp_defaultservice() - * returns one of the rotating lp_string buffers that - * could get overwritten by the recursive find_service() call - * below. Fix from Josef Hinteregger <joehtg@joehtg.co.at>. - */ - char *defservice = talloc_strdup(ctx, pdefservice); - - if (!defservice) { - goto fail; - } - - /* Disallow anything except explicit share names. */ - if (strequal(defservice,HOMES_NAME) || - strequal(defservice, PRINTERS_NAME) || - strequal(defservice, "IPC$")) { - TALLOC_FREE(defservice); - goto fail; - } - - iService = find_service(ctx, defservice, p_service_out); - if (!*p_service_out) { - TALLOC_FREE(defservice); - iService = -1; - goto fail; - } - if (iService >= 0) { - all_string_sub(*p_service_out, "_","/",0); - iService = lp_add_service(*p_service_out, iService); - } - TALLOC_FREE(defservice); - } - } - - if (iService >= 0) { - if (!VALID_SNUM(iService)) { - DEBUG(0,("Invalid snum %d for %s\n",iService, - *p_service_out)); - iService = -1; - } - } - - fail: - - if (iService < 0) { - DEBUG(3,("find_service() failed to find service %s\n", - *p_service_out)); - } - - return (iService); -} - - /**************************************************************************** do some basic sainity checks on the share. This function modifies dev, ecode. diff --git a/source3/wscript_build b/source3/wscript_build index 89fa4ac768..cbb94797f0 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -740,7 +740,7 @@ bld.SAMBA3_SUBSYSTEM('PARAM_UTIL', bld.SAMBA3_SUBSYSTEM('PARAM_WITHOUT_REG', source=PARAM_WITHOUT_REG_SRC, - deps='''PARAM_UTIL smbd_conn USER_UTIL PRINTING''', + deps='''PARAM_UTIL smbd_conn''', vars=locals()) bld.SAMBA3_LIBRARY('param', @@ -749,6 +749,10 @@ bld.SAMBA3_LIBRARY('param', private_library=True, vars=locals()) +bld.SAMBA3_SUBSYSTEM('param_service', + source='param/service.c', + deps = 'USER_UTIL param USER_UTIL PRINTING') + bld.SAMBA3_SUBSYSTEM('REGFIO', source=REGFIO_SRC, deps='samba-util-common', @@ -886,7 +890,7 @@ bld.SAMBA3_LIBRARY('smbd_base', smbconf REG_FULL FNAME_UTIL LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS RPC_NDR_SRVSVC npa_tstream INIT_NETLOGON INIT_SAMR - LIBCLI_SMB_COMMON RPC_SERVER smbd_conn + LIBCLI_SMB_COMMON RPC_SERVER smbd_conn param_service ''', private_library=True, vars=locals()) |