diff options
author | Garming Sam <garming@catalyst.net.nz> | 2014-03-21 09:34:18 +1300 |
---|---|---|
committer | Michael Adam <obnox@samba.org> | 2014-07-31 08:17:11 +0200 |
commit | a1d2e52110f0de0a3693312ca49412a7be425e4d (patch) | |
tree | 4bf06240297a52c82a6fab83e6a3d6170d3fa9b1 | |
parent | bc46178831e4bc748862254a6f994ea14d82a877 (diff) | |
download | samba-a1d2e52110f0de0a3693312ca49412a7be425e4d.tar.gz |
param: remove unused service_ok function
Change-Id: I0736a3b9b73aa80f529327ec70e856dd7fc008c6
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
-rw-r--r-- | source3/include/proto.h | 1 | ||||
-rw-r--r-- | source3/param/loadparm.c | 46 |
2 files changed, 0 insertions, 47 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 285ec7be321..c4d1606b93c 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1023,7 +1023,6 @@ bool lp_canonicalize_parameter_with_value(const char *parm_name, void show_parameter_list(void); bool lp_invert_boolean(const char *str, const char **inverse_str); bool lp_canonicalize_boolean(const char *str, const char**canon_str); -bool service_ok(int iService); bool process_registry_service(const char *service_name); bool process_registry_shares(void); bool lp_config_backend_is_registry(void); diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 48808779f2f..13ab5d05227 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -2007,52 +2007,6 @@ struct loadparm_service *lp_default_loadparm_service() return &sDefault; } -/*************************************************************************** -Check a service for consistency. Return false if the service is in any way -incomplete or faulty, else true. -***************************************************************************/ - -bool service_ok(int iService) -{ - bool bRetval; - - bRetval = true; - if (ServicePtrs[iService]->szService[0] == '\0') { - DEBUG(0, ("The following message indicates an internal error:\n")); - DEBUG(0, ("No service name in service entry.\n")); - bRetval = false; - } - - /* The [printers] entry MUST be printable. I'm all for flexibility, but */ - /* I can't see why you'd want a non-printable printer service... */ - if (strwicmp(ServicePtrs[iService]->szService, PRINTERS_NAME) == 0) { - if (!ServicePtrs[iService]->printable) { - DEBUG(0, ("WARNING: [%s] service MUST be printable!\n", - ServicePtrs[iService]->szService)); - ServicePtrs[iService]->printable = true; - } - /* [printers] service must also be non-browsable. */ - if (ServicePtrs[iService]->browseable) - ServicePtrs[iService]->browseable = false; - } - - if (ServicePtrs[iService]->path[0] == '\0' && - strwicmp(ServicePtrs[iService]->szService, HOMES_NAME) != 0 && - ServicePtrs[iService]->msdfs_proxy[0] == '\0' - ) { - DEBUG(0, ("WARNING: No path in service %s - making it unavailable!\n", - ServicePtrs[iService]->szService)); - ServicePtrs[iService]->bAvailable = false; - } - - /* If a service is flagged unavailable, log the fact at level 1. */ - if (!ServicePtrs[iService]->bAvailable) - DEBUG(1, ("NOTE: Service %s is flagged unavailable.\n", - ServicePtrs[iService]->szService)); - - return (bRetval); -} - static struct smbconf_ctx *lp_smbconf_ctx(void) { sbcErr err; |