diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-10-09 23:25:11 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-11 13:41:35 +1100 |
| commit | c9bb497f3f7fae8aa6ec4a4a45a2ac4047b640a5 (patch) | |
| tree | 1b4700091ca1eaabe9b108c486a12c53c8a77f77 | |
| parent | 1e5af9ecd0567e0afbe29ee3d69d4537628a3d63 (diff) | |
| download | samba-c9bb497f3f7fae8aa6ec4a4a45a2ac4047b640a5.tar.gz samba-c9bb497f3f7fae8aa6ec4a4a45a2ac4047b640a5.tar.bz2 samba-c9bb497f3f7fae8aa6ec4a4a45a2ac4047b640a5.zip | |
lib/param Avoid dyn_ defines that are not provided by the autoconf build
The autoconf build will never use these parameters or load the
smb.conf with these defaults, so the defaults are not important.
Andrew Bartlett
| -rw-r--r-- | lib/param/loadparm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 2c47193415..54ef0404da 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -3369,7 +3369,12 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) lpcfg_do_global_parameter(lp_ctx, "winbind separator", "\\"); lpcfg_do_global_parameter(lp_ctx, "winbind sealed pipes", "True"); lpcfg_do_global_parameter(lp_ctx, "winbindd socket directory", dyn_WINBINDD_SOCKET_DIR); +#if _SAMBA_BUILD >= 4 lpcfg_do_global_parameter(lp_ctx, "winbindd privileged socket directory", dyn_WINBINDD_PRIVILEGED_SOCKET_DIR); + lpcfg_do_global_parameter(lp_ctx, "ntp signd socket directory", dyn_NTP_SIGND_SOCKET_DIR); + lpcfg_do_global_parameter_var(lp_ctx, "dns update command", "%s/samba_dnsupdate", dyn_SCRIPTSBINDIR); + lpcfg_do_global_parameter_var(lp_ctx, "spn update command", "%s/samba_spnupdate", dyn_SCRIPTSBINDIR); +#endif lpcfg_do_global_parameter(lp_ctx, "template shell", "/bin/false"); lpcfg_do_global_parameter(lp_ctx, "template homedir", "/home/%WORKGROUP%/%ACCOUNTNAME%"); lpcfg_do_global_parameter(lp_ctx, "idmap trusted only", "False"); @@ -3398,10 +3403,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) lpcfg_do_global_parameter(lp_ctx, "tls cafile", "tls/ca.pem"); lpcfg_do_global_parameter(lp_ctx, "prefork children:smb", "4"); - lpcfg_do_global_parameter(lp_ctx, "ntp signd socket directory", dyn_NTP_SIGND_SOCKET_DIR); lpcfg_do_global_parameter(lp_ctx, "rndc command", "/usr/sbin/rndc"); - lpcfg_do_global_parameter_var(lp_ctx, "dns update command", "%s/samba_dnsupdate", dyn_SCRIPTSBINDIR); - lpcfg_do_global_parameter_var(lp_ctx, "spn update command", "%s/samba_spnupdate", dyn_SCRIPTSBINDIR); lpcfg_do_global_parameter(lp_ctx, "nsupdate command", "/usr/bin/nsupdate -g"); for (i = 0; parm_table[i].label; i++) { |