/*
* Unix SMB/CIFS implementation.
* account policy storage
- * Copyright (C) Jean François Micouleau 1998-2001.
+ * Copyright (C) Jean François Micouleau 1998-2001
* Copyright (C) Andrew Bartlett 2002
* Copyright (C) Guenther Deschner 2004-2005
*
#include "dbwrap/dbwrap_open.h"
#include "../libcli/security/security.h"
#include "lib/privileges.h"
+#include "lib/gencache.h"
static struct db_context *db;
struct ap_table {
enum pdb_policy_type type;
const char *string;
- uint32 default_val;
+ uint32_t default_val;
const char *description;
const char *ldap_attr;
};
"Force Users to logon for password change (default: 0 => off, 2 => on)",
"sambaLogonToChgPwd" },
- {PDB_POLICY_MAX_PASSWORD_AGE, "maximum password age", (uint32) -1,
+ {PDB_POLICY_MAX_PASSWORD_AGE, "maximum password age", (uint32_t) -1,
"Maximum password age, in seconds (default: -1 => never expire passwords)",
"sambaMaxPwdAge" },
"Lockout users after bad logon attempts (default: 0 => off)",
"sambaLockoutThreshold" },
- {PDB_POLICY_TIME_TO_LOGOUT, "disconnect time", (uint32) -1,
+ {PDB_POLICY_TIME_TO_LOGOUT, "disconnect time", (uint32_t) -1,
"Disconnect Users outside logon hours (default: -1 => off, 0 => on)",
"sambaForceLogoff" },
{0, NULL, 0, "", NULL}
};
-void account_policy_names_list(const char ***names, int *num_names)
+void account_policy_names_list(TALLOC_CTX *mem_ctx, const char ***names, int *num_names)
{
const char **nl;
- int i, count;
+ int i, count = ARRAY_SIZE(account_policy_names);
- for (count=0; account_policy_names[count].string; count++) {
- }
- nl = SMB_MALLOC_ARRAY(const char *, count);
+ nl = talloc_array(mem_ctx, const char *, count);
if (!nl) {
*num_names = 0;
return;
}
- for (i=0; account_policy_names[i].string; i++) {
+ for (i=0; i<count; i++) {
nl[i] = account_policy_names[i].string;
}
- *num_names = count;
+ /* Do not return the last null entry */
+ *num_names = count-1;
*names = nl;
return;
}
static bool account_policy_set_default_on_empty(enum pdb_policy_type type)
{
- uint32 value;
+ uint32_t value;
if (!account_policy_get(type, &value) &&
!account_policy_get_default(type, &value)) {
{
const char *vstring = "INFO/version";
- uint32 version;
+ uint32_t version = 0;
int i;
+ NTSTATUS status;
+ char *db_path;
if (db != NULL) {
return True;
}
- db = db_open(NULL, state_path("account_policy.tdb"), 0, TDB_DEFAULT,
- O_RDWR, 0600);
+ db_path = state_path(talloc_tos(), "account_policy.tdb");
+ if (db_path == NULL) {
+ return false;
+ }
+
+ db = db_open(NULL, db_path, 0, TDB_DEFAULT,
+ O_RDWR, 0600, DBWRAP_LOCK_ORDER_1, DBWRAP_FLAG_NONE);
if (db == NULL) { /* the account policies files does not exist or open
* failed, try to create a new one */
- db = db_open(NULL, state_path("account_policy.tdb"), 0,
- TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ db = db_open(NULL, db_path, 0,
+ TDB_DEFAULT, O_RDWR|O_CREAT, 0600,
+ DBWRAP_LOCK_ORDER_1, DBWRAP_FLAG_NONE);
if (db == NULL) {
DEBUG(0,("Failed to open account policy database\n"));
+ TALLOC_FREE(db_path);
return False;
}
}
+ TALLOC_FREE(db_path);
+
+ status = dbwrap_fetch_uint32_bystring(db, vstring, &version);
+ if (!NT_STATUS_IS_OK(status)) {
+ version = 0;
+ }
- version = dbwrap_fetch_int32(db, vstring);
if (version == DATABASE_VERSION) {
return true;
}
/* handle a Samba upgrade */
- if (db->transaction_start(db) != 0) {
+ if (dbwrap_transaction_start(db) != 0) {
DEBUG(0, ("transaction_start failed\n"));
TALLOC_FREE(db);
return false;
}
- version = dbwrap_fetch_int32(db, vstring);
+ status = dbwrap_fetch_uint32_bystring(db, vstring, &version);
+ if (!NT_STATUS_IS_OK(status)) {
+ version = 0;
+ }
+
if (version == DATABASE_VERSION) {
/*
* Race condition
*/
- if (db->transaction_cancel(db)) {
+ if (dbwrap_transaction_cancel(db)) {
smb_panic("transaction_cancel failed");
}
return true;
}
if (version != DATABASE_VERSION) {
- if (dbwrap_store_uint32(db, vstring, DATABASE_VERSION) != 0) {
- DEBUG(0, ("dbwrap_store_uint32 failed\n"));
+ status = dbwrap_store_uint32_bystring(db, vstring,
+ DATABASE_VERSION);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, ("dbwrap_store_uint32_t failed: %s\n",
+ nt_errstr(status)));
goto cancel;
}
}
}
- if (db->transaction_commit(db) != 0) {
+ if (dbwrap_transaction_commit(db) != 0) {
DEBUG(0, ("transaction_commit failed\n"));
TALLOC_FREE(db);
return false;
return True;
cancel:
- if (db->transaction_cancel(db)) {
+ if (dbwrap_transaction_cancel(db)) {
smb_panic("transaction_cancel failed");
}
TALLOC_FREE(db);
bool account_policy_get(enum pdb_policy_type type, uint32_t *value)
{
const char *name;
- uint32 regval;
+ uint32_t regval;
+ NTSTATUS status;
if (!init_account_policy()) {
return False;
return False;
}
- if (!dbwrap_fetch_uint32(db, name, ®val)) {
- DEBUG(1, ("account_policy_get: tdb_fetch_uint32 failed for type %d (%s), returning 0\n", type, name));
+ status = dbwrap_fetch_uint32_bystring(db, name, ®val);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(2, ("account_policy_get: tdb_fetch_uint32_t failed for type %d (%s), returning 0\n", type, name));
return False;
}
return False;
}
- status = dbwrap_trans_store_uint32(db, name, value);
+ status = dbwrap_trans_store_uint32_bystring(db, name, value);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("store_uint32 failed for type %d (%s) on value "
+ DEBUG(1, ("store_uint32_t failed for type %d (%s) on value "
"%u: %s\n", type, name, value, nt_errstr(status)));
return False;
}
goto done;
}
- if (gencache_get(cache_key, &cache_value, NULL)) {
- uint32 tmp = strtoul(cache_value, NULL, 10);
+ if (gencache_get(cache_key, talloc_tos(), &cache_value, NULL)) {
+ int error = 0;
+ uint32_t tmp;
+
+ tmp = strtoul_err(cache_value, NULL, 10, &error);
+ if (error != 0) {
+ goto done;
+ }
*value = tmp;
ret = True;
}
done:
SAFE_FREE(cache_key);
- SAFE_FREE(cache_value);
+ TALLOC_FREE(cache_value);
return ret;
}
git.samba.org / bbaumbach / samba-autobuild / .git / blobdiff