summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-02-17 18:18:28 +1100
committerAndrew Tridgell <tridge@samba.org>2010-02-17 19:43:32 +1100
commit8633d8126bdf5c31c079d64428492bf1ab2d4cb2 (patch)
tree6b2bcb7d08424d58eec050d97717f26e436bc436
parent8756e130098254564ebbfb878efdc9f2a24a0696 (diff)
downloadsamba-8633d8126bdf5c31c079d64428492bf1ab2d4cb2.tar.gz
samba-8633d8126bdf5c31c079d64428492bf1ab2d4cb2.tar.bz2
samba-8633d8126bdf5c31c079d64428492bf1ab2d4cb2.zip
s4-param: added "rndc command" smb.conf option
-rw-r--r--source4/param/loadparm.c4
-rw-r--r--source4/param/param.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 7b301d646f..bcd31888d7 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -186,6 +186,7 @@ struct loadparm_global
int bDisableNetbios;
int bRpcBigEndian;
char *szNTPSignDSocketDirectory;
+ char *szRNDCCommand;
struct parmlist_entry *param_opt;
};
@@ -503,6 +504,7 @@ static struct parm_struct parm_table[] = {
{"idmap trusted only", P_BOOL, P_GLOBAL, GLOBAL_VAR(bIdmapTrustedOnly), NULL, NULL},
{"ntp signd socket directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szNTPSignDSocketDirectory), NULL, NULL },
+ {"rndc command", P_STRING, P_GLOBAL, GLOBAL_VAR(szRNDCCommand), NULL, NULL },
{NULL, P_BOOL, P_NONE, 0, NULL, NULL}
};
@@ -654,6 +656,7 @@ _PUBLIC_ FN_GLOBAL_STRING(lp_dos_charset, dos_charset)
_PUBLIC_ FN_GLOBAL_STRING(lp_unix_charset, unix_charset)
_PUBLIC_ FN_GLOBAL_STRING(lp_display_charset, display_charset)
_PUBLIC_ FN_GLOBAL_STRING(lp_piddir, szPidDir)
+_PUBLIC_ FN_GLOBAL_STRING(lp_rndc_command, szRNDCCommand)
_PUBLIC_ FN_GLOBAL_LIST(lp_dcerpc_endpoint_servers, dcerpc_ep_servers)
_PUBLIC_ FN_GLOBAL_LIST(lp_server_services, server_services)
_PUBLIC_ FN_GLOBAL_STRING(lp_ntptr_providor, ntptr_providor)
@@ -2447,6 +2450,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lp_do_global_parameter(lp_ctx, "prefork children:smb", "4");
lp_do_global_parameter(lp_ctx, "ntp signd socket directory", dyn_NTP_SIGND_SOCKET_DIR);
+ lp_do_global_parameter(lp_ctx, "rndc command", "/usr/sbin/rndc");
for (i = 0; parm_table[i].label; i++) {
if (!(lp_ctx->flags[i] & FLAG_CMDLINE)) {
diff --git a/source4/param/param.h b/source4/param/param.h
index 52224252a0..05b3939a48 100644
--- a/source4/param/param.h
+++ b/source4/param/param.h
@@ -130,6 +130,7 @@ const char **lp_wins_server_list(struct loadparm_context *);
const char **lp_interfaces(struct loadparm_context *);
const char *lp_socket_address(struct loadparm_context *);
const char **lp_netbios_aliases(struct loadparm_context *);
+const char *lp_rndc_command(struct loadparm_context *);
bool lp_disable_netbios(struct loadparm_context *);
bool lp_wins_support(struct loadparm_context *);
bool lp_wins_dns_proxy(struct loadparm_context *);