sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

s3:gencache: Allow to open gencache as read-only

Browse Source 
This allows client tools to access the cache for ready-only operations
as a normal user.

Example:
    net ads status

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14370

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri May 15 14:40:32 UTC 2020 on sn-devel-184
This commit is contained in:
Andreas Schneider 2020-05-06 17:10:51 +02:00 committed by Andreas Schneider
parent a15bd5493b
commit 04f0c45475
1 changed files with 60 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
source3/lib/gencache.c
View File

@ -29,10 +29,13 @@
#include "tdb_wrap/tdb_wrap.h"
#include "zlib.h"
#include "lib/util/strv.h"
#include "lib/util/util_paths.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_TDB
#define GENCACHE_USER_PATH "~/.cache/samba/gencache.tdb"
static struct tdb_wrap *cache;
/**
@ -68,6 +71,7 @@ static bool gencache_init(void)
{
char* cache_fname = NULL;
int open_flags = O_RDWR|O_CREAT;
int tdb_flags = TDB_INCOMPATIBLE_HASH|TDB_NOSYNC|TDB_MUTEX_LOCKING;
int hash_size;
/* skip file open if it's already opened */
@ -85,10 +89,63 @@ static bool gencache_init(void)
DEBUG(5, ("Opening cache file at %s\n", cache_fname));
cache = tdb_wrap_open(NULL, cache_fname, hash_size,
TDB_INCOMPATIBLE_HASH|
TDB_NOSYNC|
TDB_MUTEX_LOCKING,
tdb_flags,
open_flags, 0644);
/*
* Allow client tools to create a gencache in the home directory
* as a normal user.
*/
if (cache == NULL && errno == EACCES && geteuid() != 0) {
char *cache_dname = NULL, *tmp = NULL;
bool ok;
TALLOC_FREE(cache_fname);
cache_fname = path_expand_tilde(talloc_tos(),
GENCACHE_USER_PATH);
if (cache_fname == NULL) {
DBG_ERR("Failed to expand path: %s\n",
GENCACHE_USER_PATH);
return false;
}
tmp = talloc_strdup(talloc_tos(), cache_fname);
if (tmp == NULL) {
DBG_ERR("No memory!\n");
TALLOC_FREE(cache_fname);
return false;
}
cache_dname = dirname(tmp);
if (cache_dname == NULL) {
DBG_ERR("Invalid path: %s\n", cache_fname);
TALLOC_FREE(tmp);
TALLOC_FREE(cache_fname);
return false;
}
ok = directory_create_or_exist(cache_dname, 0700);
if (!ok) {
DBG_ERR("Failed to create directory: %s - %s\n",
cache_dname, strerror(errno));
TALLOC_FREE(tmp);
TALLOC_FREE(cache_fname);
return false;
}
TALLOC_FREE(tmp);
cache = tdb_wrap_open(NULL,
cache_fname,
hash_size,
tdb_flags,
open_flags,
0644);
if (cache != NULL) {
DBG_INFO("Opening user cache file %s.\n",
cache_fname);
}
}
if (cache == NULL) {
DEBUG(5, ("Opening %s failed: %s\n", cache_fname,
strerror(errno)));