diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-06-26 00:12:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:48 -0500 |
| commit | 8c53aba485e7986baacf91b2c99ef7999142aee4 (patch) | |
| tree | b615503de3ef8a222ba95d5dd8a591d71cf7653f /source4/param | |
| parent | b3e493470f3465cfe5cfa958b019ac8cfb8f12f2 (diff) | |
| download | samba-8c53aba485e7986baacf91b2c99ef7999142aee4.tar.gz samba-8c53aba485e7986baacf91b2c99ef7999142aee4.tar.bz2 samba-8c53aba485e7986baacf91b2c99ef7999142aee4.zip | |
r7912: make private_path() recognise a non-relative filename, so we can have
sam database = sam.ldb
and it will know to put it in the private dir, but if you use
sam database = ldap://server
it knows to use it as-is
(This used to be commit c5bccbc366db144d3e1cb7b21f0e3284d841dd06)
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/loadparm.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index d59d4efadf..80f7709280 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -931,10 +931,10 @@ static void init_globals(void) do_parameter("auth methods", "anonymous sam_ignoredomain"); do_parameter("smb passwd file", dyn_SMB_PASSWD_FILE); do_parameter("private dir", dyn_PRIVATE_DIR); - do_parameter_var("sam database", "tdb://%s/sam.ldb", dyn_PRIVATE_DIR); - do_parameter_var("spoolss database", "tdb://%s/spoolss.ldb", dyn_PRIVATE_DIR); - do_parameter_var("wins database", "tdb://%s/wins.ldb", dyn_PRIVATE_DIR); - do_parameter_var("registry:HKEY_LOCAL_MACHINE", "ldb:/%s/hklm.ldb", dyn_PRIVATE_DIR); + do_parameter("sam database", "sam.ldb"); + do_parameter("spoolss database", "spoolss.ldb"); + do_parameter("wins database", "wins.ldb"); + do_parameter("registry:HKEY_LOCAL_MACHINE", "hklm.ldb"); do_parameter("guest account", GUEST_ACCOUNT); /* using UTF8 by default allows us to support all chars */ @@ -1056,9 +1056,9 @@ static void init_globals(void) do_parameter("min wins ttl", "10"); do_parameter("tls enabled", "True"); - do_parameter_var("tls keyfile", "%s/tls/key.pem", dyn_PRIVATE_DIR); - do_parameter_var("tls certfile", "%s/tls/cert.pem", dyn_PRIVATE_DIR); - do_parameter_var("tls cafile", "%s/tls/ca.pem", dyn_PRIVATE_DIR); + do_parameter("tls keyfile", "tls/key.pem"); + do_parameter("tls certfile", "tls/cert.pem"); + do_parameter("tls cafile", "tls/ca.pem"); } static TALLOC_CTX *lp_talloc; |