diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-27 03:34:50 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:14:49 -0500 |
| commit | 0cc2cee8d5ccd95cd4cd10a060e2b3e703b6fba1 (patch) | |
| tree | a0ac2be362419b564952ac4538dc1c95c993c592 | |
| parent | afbc8a1faa63eadbd99fb4b5ff262b1df80d13dc (diff) | |
| download | samba-0cc2cee8d5ccd95cd4cd10a060e2b3e703b6fba1.tar.gz samba-0cc2cee8d5ccd95cd4cd10a060e2b3e703b6fba1.tar.bz2 samba-0cc2cee8d5ccd95cd4cd10a060e2b3e703b6fba1.zip | |
r18939: don't rely on the umask being right in ldb creation. Both Samba3 and
Samba4 smbd force the umask to 0, which meant we ended up with ldb
being world writable.
This isn't really an ideal fix, as it means ldb no longer honors umask
(as it should do, like all good libraries).
Unfortunately the 'proper' fix is too complex for now
this also merges a tiny code style fix from s4 to s3
(This used to be commit dd8ec8725f168f4286bbfc00d69cd56089ba3543)
| -rw-r--r-- | source3/lib/ldb/common/ldb.c | 4 | ||||
| -rw-r--r-- | source3/lib/ldb/ldb_tdb/ldb_tdb.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source3/lib/ldb/common/ldb.c b/source3/lib/ldb/common/ldb.c index eca550f0f2..00bf5e79ba 100644 --- a/source3/lib/ldb/common/ldb.c +++ b/source3/lib/ldb/common/ldb.c @@ -819,7 +819,9 @@ int ldb_modify(struct ldb_context *ldb, int ret; ret = ldb_msg_sanity_check(ldb, message); - if (ret != LDB_SUCCESS) return ret; + if (ret != LDB_SUCCESS) { + return ret; + } ret = ldb_build_mod_req(&req, ldb, ldb, message, diff --git a/source3/lib/ldb/ldb_tdb/ldb_tdb.c b/source3/lib/ldb/ldb_tdb/ldb_tdb.c index 8f676654a6..5d43783903 100644 --- a/source3/lib/ldb/ldb_tdb/ldb_tdb.c +++ b/source3/lib/ldb/ldb_tdb/ldb_tdb.c @@ -1036,7 +1036,7 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url, /* note that we use quite a large default hash size */ ltdb->tdb = ltdb_wrap_open(ltdb, path, 10000, - tdb_flags, open_flags, 0666, ldb); + tdb_flags, open_flags, 0644, ldb); if (!ltdb->tdb) { ldb_debug(ldb, LDB_DEBUG_ERROR, "Unable to open tdb '%s'\n", path); talloc_free(ltdb); |