diff options
author | Andreas Schneider <asn@samba.org> | 2017-01-16 12:05:09 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2017-01-27 08:09:15 +0100 |
commit | 9d60ad53b809281a5a6f6ad82a0daea99c989f2d (patch) | |
tree | b70f0c2a3eab8517af2fa47983719fb2add018f6 /lib | |
parent | 35dfa5c6e2bf60f8f1efda5eb7026cabe8bf5ba3 (diff) | |
download | samba-9d60ad53b809281a5a6f6ad82a0daea99c989f2d.tar.gz |
rpc_server: Allow to configure the port range for RPC services
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12521
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/param/loadparm.c | 47 | ||||
-rw-r--r-- | lib/param/loadparm.h | 9 | ||||
-rw-r--r-- | lib/param/param.h | 3 |
3 files changed, 58 insertions, 1 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index a05610130e8..335c54a3abe 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -83,6 +83,16 @@ struct loadparm_service *lpcfg_default_service(struct loadparm_context *lp_ctx) return lp_ctx->sDefault; } +int lpcfg_rpc_low_port(struct loadparm_context *lp_ctx) +{ + return lp_ctx->globals->rpc_low_port; +} + +int lpcfg_rpc_high_port(struct loadparm_context *lp_ctx) +{ + return lp_ctx->globals->rpc_high_port; +} + /** * Convenience routine to grab string parameters into temporary memory * and run standard_sub_basic on them. @@ -1435,6 +1445,37 @@ bool handle_smb_ports(struct loadparm_context *lp_ctx, struct loadparm_service * return true; } +bool handle_rpc_server_dynamic_port_range(struct loadparm_context *lp_ctx, + struct loadparm_service *service, + const char *pszParmValue, + char **ptr) +{ + int low_port = -1, high_port = -1; + int rc; + + if (pszParmValue == NULL || pszParmValue[0] == '\0') { + return false; + } + + rc = sscanf(pszParmValue, "%d - %d", &low_port, &high_port); + if (rc != 2) { + return false; + } + + if (low_port > high_port) { + return false; + } + + if (low_port < SERVER_TCP_PORT_MIN|| high_port > SERVER_TCP_PORT_MAX) { + return false; + } + + lp_ctx->globals->rpc_low_port = low_port; + lp_ctx->globals->rpc_high_port = high_port; + + return true; +} + bool handle_smb2_max_credits(struct loadparm_context *lp_ctx, struct loadparm_service *service, const char *pszParmValue, char **ptr) @@ -2498,6 +2539,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) lp_ctx->globals = talloc_zero(lp_ctx, struct loadparm_global); /* This appears odd, but globals in s3 isn't a pointer */ lp_ctx->globals->ctx = lp_ctx->globals; + lp_ctx->globals->rpc_low_port = SERVER_TCP_LOW_PORT; + lp_ctx->globals->rpc_high_port = SERVER_TCP_HIGH_PORT; lp_ctx->sDefault = talloc_zero(lp_ctx, struct loadparm_service); lp_ctx->flags = talloc_zero_array(lp_ctx, unsigned int, num_parameters()); @@ -2901,6 +2944,10 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) lpcfg_do_global_parameter(lp_ctx, "kerberos encryption types", "all"); + lpcfg_do_global_parameter(lp_ctx, + "rpc server dynamic port range", + "49152-65535"); + /* Allow modules to adjust defaults */ for (defaults_hook = defaults_hooks; defaults_hook; defaults_hook = defaults_hook->next) { diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index 6d01b37f764..d1e2b7cb056 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -194,6 +194,11 @@ enum printing_types {PRINT_BSD,PRINT_SYSV,PRINT_AIX,PRINT_HPUX, #endif /* DEVELOPER */ }; +#define SERVER_TCP_LOW_PORT 49152 +#define SERVER_TCP_HIGH_PORT 65535 + +#define SERVER_TCP_PORT_MIN 1024 +#define SERVER_TCP_PORT_MAX 65535 @@ -275,7 +280,9 @@ enum mangled_names_options {MANGLED_NAMES_NO, MANGLED_NAMES_YES, MANGLED_NAMES_I #define LOADPARM_EXTRA_GLOBALS \ struct parmlist_entry *param_opt; \ char *dnsdomain; \ - char *realm_original; + char *realm_original; \ + int rpc_low_port; \ + int rpc_high_port; const char* server_role_str(uint32_t role); int lp_find_server_role(int server_role, int security, int domain_logons, int domain_master); diff --git a/lib/param/param.h b/lib/param/param.h index 66037e2ef1b..e123e67a990 100644 --- a/lib/param/param.h +++ b/lib/param/param.h @@ -313,6 +313,9 @@ void lpcfg_default_kdc_policy(struct loadparm_context *lp_ctx, time_t *usr_tkt_lifetime, time_t *renewal_lifetime); +int lpcfg_rpc_port_low(struct loadparm_context *lp_ctx); +int lpcfg_rpc_port_high(struct loadparm_context *lp_ctx); + /* The following definitions come from lib/version.c */ const char *samba_version_string(void); |