s4-param: added "rndc command" smb.conf option
authorAndrew Tridgell <tridge@samba.org>
Wed, 17 Feb 2010 07:18:28 +0000 (18:18 +1100)
committerAndrew Tridgell <tridge@samba.org>
Wed, 17 Feb 2010 08:43:32 +0000 (19:43 +1100)
source4/param/loadparm.c
source4/param/param.h

index 7b301d646fb30f9b0364467b1104336fb895809c..bcd31888d74c1d8f01aae2e2a016775417080cec 100644 (file)
@@ -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)) {
index 52224252a0a0b089c41c918065e7e1228618e3e8..05b3939a48add64d2b9fbf144ed089ad84d63231 100644 (file)
@@ -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 *);