Create the share security tdb.
********************************************************************/
-static TDB_CONTEXT *share_tdb; /* used for share security descriptors */
+static struct db_context *share_db; /* used for share security descriptors */
#define SHARE_DATABASE_VERSION_V1 1
#define SHARE_DATABASE_VERSION_V2 2 /* version id in little endian. */
/* Map generic permissions to file object specific permissions */
-static const struct generic_mapping file_generic_mapping = {
- FILE_GENERIC_READ,
- FILE_GENERIC_WRITE,
- FILE_GENERIC_EXECUTE,
- FILE_GENERIC_ALL
-};
+extern const struct generic_mapping file_generic_mapping;
+static int delete_fn(struct db_record *rec, void *priv)
+{
+ rec->delete_rec(rec);
+ return 0;
+}
static bool share_info_db_init(void)
{
const char *vstring = "INFO/version";
int32 vers_id;
-
- if (share_tdb) {
+
+ if (share_db != NULL) {
return True;
}
- share_tdb = tdb_open_log(state_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
- if (!share_tdb) {
+ share_db = db_open(NULL, state_path("share_info.tdb"), 0,
+ TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ if (share_db == NULL) {
DEBUG(0,("Failed to open share info database %s (%s)\n",
state_path("share_info.tdb"), strerror(errno) ));
return False;
}
-
- /* handle a Samba upgrade */
- tdb_lock_bystring(share_tdb, vstring);
+
+ vers_id = dbwrap_fetch_int32(share_db, vstring);
+ if (vers_id == SHARE_DATABASE_VERSION_V2) {
+ return true;
+ }
+
+ if (share_db->transaction_start(share_db) != 0) {
+ DEBUG(0, ("transaction_start failed\n"));
+ TALLOC_FREE(share_db);
+ return false;
+ }
+
+ vers_id = dbwrap_fetch_int32(share_db, vstring);
+ if (vers_id == SHARE_DATABASE_VERSION_V2) {
+ /*
+ * Race condition
+ */
+ if (share_db->transaction_cancel(share_db)) {
+ smb_panic("transaction_cancel failed");
+ }
+ return true;
+ }
/* Cope with byte-reversed older versions of the db. */
- vers_id = tdb_fetch_int32(share_tdb, vstring);
if ((vers_id == SHARE_DATABASE_VERSION_V1) || (IREV(vers_id) == SHARE_DATABASE_VERSION_V1)) {
/* Written on a bigendian machine with old fetch_int code. Save as le. */
- tdb_store_int32(share_tdb, vstring, SHARE_DATABASE_VERSION_V2);
+
+ if (dbwrap_store_int32(share_db, vstring,
+ SHARE_DATABASE_VERSION_V2) != 0) {
+ DEBUG(0, ("dbwrap_store_int32 failed\n"));
+ goto cancel;
+ }
vers_id = SHARE_DATABASE_VERSION_V2;
}
if (vers_id != SHARE_DATABASE_VERSION_V2) {
- tdb_traverse(share_tdb, tdb_traverse_delete_fn, NULL);
- tdb_store_int32(share_tdb, vstring, SHARE_DATABASE_VERSION_V2);
+ int ret;
+ ret = share_db->traverse(share_db, delete_fn, NULL);
+ if (ret < 0) {
+ DEBUG(0, ("traverse failed\n"));
+ goto cancel;
+ }
+ if (dbwrap_store_int32(share_db, vstring,
+ SHARE_DATABASE_VERSION_V2) != 0) {
+ DEBUG(0, ("dbwrap_store_int32 failed\n"));
+ goto cancel;
+ }
}
- tdb_unlock_bystring(share_tdb, vstring);
- return True;
+ if (share_db->transaction_commit(share_db) != 0) {
+ DEBUG(0, ("transaction_commit failed\n"));
+ return false;
+ }
+
+ return true;
+
+ cancel:
+ if (share_db->transaction_cancel(share_db)) {
+ smb_panic("transaction_cancel failed");
+ }
+
+ return false;
}
/*******************************************************************
SEC_DESC *get_share_security_default( TALLOC_CTX *ctx, size_t *psize, uint32 def_access)
{
- SEC_ACCESS sa;
+ uint32_t sa;
SEC_ACE ace;
SEC_ACL *psa = NULL;
SEC_DESC *psd = NULL;
se_map_generic(&spec_access, &file_generic_mapping);
- init_sec_access(&sa, def_access | spec_access );
+ sa = (def_access | spec_access );
init_sec_ace(&ace, &global_sid_World, SEC_ACE_TYPE_ACCESS_ALLOWED, sa, 0);
if ((psa = make_sec_acl(ctx, NT4_ACL_REVISION, 1, &ace)) != NULL) {
return NULL;
}
- data = tdb_fetch_bystring(share_tdb, key);
+ data = dbwrap_fetch_bystring(share_db, talloc_tos(), key);
TALLOC_FREE(key);
status = unmarshall_sec_desc(ctx, data.dptr, data.dsize, &psd);
+ TALLOC_FREE(data.dptr);
+
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("unmarshall_sec_desc failed: %s\n",
nt_errstr(status)));
}
if (psd)
- *psize = ndr_size_security_descriptor(psd, 0);
+ *psize = ndr_size_security_descriptor(psd, NULL, 0);
return psd;
}
goto out;
}
- if (tdb_trans_store_bystring(share_tdb, key, blob,
- TDB_REPLACE) == -1) {
- DEBUG(1,("set_share_security: Failed to store secdesc for "
- "%s\n", share_name ));
+ status = dbwrap_trans_store(share_db, string_term_tdb_data(key), blob,
+ TDB_REPLACE);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("set_share_security: Failed to store secdesc for "
+ "%s: %s\n", share_name, nt_errstr(status)));
goto out;
}
{
TDB_DATA kbuf;
char *key;
+ NTSTATUS status;
+
+ if (!share_info_db_init()) {
+ return False;
+ }
if (!(key = talloc_asprintf(talloc_tos(), "SECDESC/%s",
servicename))) {
}
kbuf = string_term_tdb_data(key);
- if (tdb_trans_delete(share_tdb, kbuf) != 0) {
+ status = dbwrap_trans_delete(share_db, kbuf);
+ if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("delete_share_security: Failed to delete entry for "
- "share %s\n", servicename));
+ "share %s: %s\n", servicename, nt_errstr(status)));
return False;
}
NTSTATUS status;
SEC_DESC *psd = NULL;
size_t sd_size;
- bool ret = True;
psd = get_share_security(talloc_tos(), sharename, &sd_size);
return True;
}
- ret = se_access_check(psd, token, desired_access, &granted, &status);
+ status = se_access_check(psd, token, desired_access, &granted);
TALLOC_FREE(psd);
- return ret;
+ return NT_STATUS_IS_OK(status);
}
/***************************************************************************
}
for (i = 0; i < num_aces; i++) {
- SEC_ACCESS sa;
+ uint32_t sa;
uint32 g_access;
uint32 s_access;
DOM_SID sid;
pacl++; /* Go past any ',' */
se_map_generic(&s_access, &file_generic_mapping);
- init_sec_access(&sa, g_access | s_access );
+ sa = (g_access | s_access);
init_sec_ace(&ace_list[i], &sid, type, sa, 0);
}
git.samba.org / kai / samba-autobuild / .git / blobdiff