s3-account_policy: add pdb_policy_type enum.

Guenther

1 files changed, 44 insertions, 44 deletions

diff --git a/source3/lib/account_pol.c b/source3/lib/account_pol.c
index 4b63375e29..f4101e96bc 100644
--- a/source3/lib/account_pol.c
+++ b/source3/lib/account_pol.c
@@ -31,7 +31,7 @@ static struct db_context *db;
 
 
 struct ap_table {
-	int field;
+	enum pdb_policy_type type;
 	const char *string;
 	uint32 default_val;
 	const char *description;
@@ -39,43 +39,43 @@ struct ap_table {
 };
 
 static const struct ap_table account_policy_names[] = {
-	{AP_MIN_PASSWORD_LEN, "min password length", MINPASSWDLENGTH,
+	{PDB_POLICY_MIN_PASSWORD_LEN, "min password length", MINPASSWDLENGTH,
 		"Minimal password length (default: 5)",
 		"sambaMinPwdLength" },
 
-	{AP_PASSWORD_HISTORY, "password history", 0,
+	{PDB_POLICY_PASSWORD_HISTORY, "password history", 0,
 		"Length of Password History Entries (default: 0 => off)",
 		"sambaPwdHistoryLength" },
 
-	{AP_USER_MUST_LOGON_TO_CHG_PASS, "user must logon to change password", 0,
+	{PDB_POLICY_USER_MUST_LOGON_TO_CHG_PASS, "user must logon to change password", 0,
 		"Force Users to logon for password change (default: 0 => off, 2 => on)",
 		"sambaLogonToChgPwd" },
 
-	{AP_MAX_PASSWORD_AGE, "maximum password age", (uint32) -1,
+	{PDB_POLICY_MAX_PASSWORD_AGE, "maximum password age", (uint32) -1,
 		"Maximum password age, in seconds (default: -1 => never expire passwords)",
 		"sambaMaxPwdAge" },
 
-	{AP_MIN_PASSWORD_AGE,"minimum password age", 0,
+	{PDB_POLICY_MIN_PASSWORD_AGE,"minimum password age", 0,
 		"Minimal password age, in seconds (default: 0 => allow immediate password change)",
 		"sambaMinPwdAge" },
 
-	{AP_LOCK_ACCOUNT_DURATION, "lockout duration", 30,
+	{PDB_POLICY_LOCK_ACCOUNT_DURATION, "lockout duration", 30,
 		"Lockout duration in minutes (default: 30, -1 => forever)",
 		"sambaLockoutDuration" },
 
-	{AP_RESET_COUNT_TIME, "reset count minutes", 30,
+	{PDB_POLICY_RESET_COUNT_TIME, "reset count minutes", 30,
 		"Reset time after lockout in minutes (default: 30)",
 		"sambaLockoutObservationWindow" },
 
-	{AP_BAD_ATTEMPT_LOCKOUT, "bad lockout attempt", 0,
+	{PDB_POLICY_BAD_ATTEMPT_LOCKOUT, "bad lockout attempt", 0,
 		"Lockout users after bad logon attempts (default: 0 => off)",
 		"sambaLockoutThreshold" },
 
-	{AP_TIME_TO_LOGOUT, "disconnect time", (uint32) -1,
+	{PDB_POLICY_TIME_TO_LOGOUT, "disconnect time", (uint32) -1,
 		"Disconnect Users outside logon hours (default: -1 => off, 0 => on)",
 		"sambaForceLogoff" },
 
-	{AP_REFUSE_MACHINE_PW_CHANGE, "refuse machine password change", 0,
+	{PDB_POLICY_REFUSE_MACHINE_PW_CHANGE, "refuse machine password change", 0,
 		"Allow Machine Password changes (default: 0 => off)",
 		"sambaRefuseMachinePwdChange" },
 
@@ -106,11 +106,11 @@ void account_policy_names_list(const char ***names, int *num_names)
 Get the account policy name as a string from its #define'ed number
 ****************************************************************************/
 
-const char *decode_account_policy_name(int field)
+const char *decode_account_policy_name(enum pdb_policy_type type)
 {
 	int i;
 	for (i=0; account_policy_names[i].string; i++) {
-		if (field == account_policy_names[i].field) {
+		if (type == account_policy_names[i].type) {
 			return account_policy_names[i].string;
 		}
 	}
@@ -121,11 +121,11 @@ const char *decode_account_policy_name(int field)
 Get the account policy LDAP attribute as a string from its #define'ed number
 ****************************************************************************/
 
-const char *get_account_policy_attr(int field)
+const char *get_account_policy_attr(enum pdb_policy_type type)
 {
 	int i;
-	for (i=0; account_policy_names[i].field; i++) {
-		if (field == account_policy_names[i].field) {
+	for (i=0; account_policy_names[i].type; i++) {
+		if (type == account_policy_names[i].type) {
 			return account_policy_names[i].ldap_attr;
 		}
 	}
@@ -136,11 +136,11 @@ const char *get_account_policy_attr(int field)
 Get the account policy description as a string from its #define'ed number
 ****************************************************************************/
 
-const char *account_policy_get_desc(int field)
+const char *account_policy_get_desc(enum pdb_policy_type type)
 {
 	int i;
 	for (i=0; account_policy_names[i].string; i++) {
-		if (field == account_policy_names[i].field) {
+		if (type == account_policy_names[i].type) {
 			return account_policy_names[i].description;
 		}
 	}
@@ -151,12 +151,12 @@ const char *account_policy_get_desc(int field)
 Get the account policy name as a string from its #define'ed number
 ****************************************************************************/
 
-int account_policy_name_to_fieldnum(const char *name)
+enum pdb_policy_type account_policy_name_to_typenum(const char *name)
 {
 	int i;
 	for (i=0; account_policy_names[i].string; i++) {
 		if (strcmp(name, account_policy_names[i].string) == 0) {
-			return account_policy_names[i].field;
+			return account_policy_names[i].type;
 		}
 	}
 	return 0;
@@ -166,35 +166,35 @@ int account_policy_name_to_fieldnum(const char *name)
 Get default value for account policy
 *****************************************************************************/
 
-bool account_policy_get_default(int account_policy, uint32 *val)
+bool account_policy_get_default(enum pdb_policy_type type, uint32_t *val)
 {
 	int i;
-	for (i=0; account_policy_names[i].field; i++) {
-		if (account_policy_names[i].field == account_policy) {
+	for (i=0; account_policy_names[i].type; i++) {
+		if (account_policy_names[i].type == type) {
 			*val = account_policy_names[i].default_val;
 			return True;
 		}
 	}
 	DEBUG(0,("no default for account_policy index %d found. This should never happen\n",
-		account_policy));
+		type));
 	return False;
 }
 
 /*****************************************************************************
- Set default for a field if it is empty
+ Set default for a type if it is empty
 *****************************************************************************/
 
-static bool account_policy_set_default_on_empty(int account_policy)
+static bool account_policy_set_default_on_empty(enum pdb_policy_type type)
 {
 
 	uint32 value;
 
-	if (!account_policy_get(account_policy, &value) &&
-	    !account_policy_get_default(account_policy, &value)) {
+	if (!account_policy_get(type, &value) &&
+	    !account_policy_get_default(type, &value)) {
 		return False;
 	}
 
-	return account_policy_set(account_policy, value);
+	return account_policy_set(type, value);
 }
 
 /*****************************************************************************
@@ -255,9 +255,9 @@ bool init_account_policy(void)
 			goto cancel;
 		}
 
-		for (i=0; account_policy_names[i].field; i++) {
+		for (i=0; account_policy_names[i].type; i++) {
 
-			if (!account_policy_set_default_on_empty(account_policy_names[i].field)) {
+			if (!account_policy_set_default_on_empty(account_policy_names[i].type)) {
 				DEBUG(0,("failed to set default value in account policy tdb\n"));
 				goto cancel;
 			}
@@ -302,7 +302,7 @@ bool init_account_policy(void)
 Get an account policy (from tdb)
 *****************************************************************************/
 
-bool account_policy_get(int field, uint32 *value)
+bool account_policy_get(enum pdb_policy_type type, uint32_t *value)
 {
 	const char *name;
 	uint32 regval;
@@ -315,14 +315,14 @@ bool account_policy_get(int field, uint32 *value)
 		*value = 0;
 	}
 
-	name = decode_account_policy_name(field);
+	name = decode_account_policy_name(type);
 	if (name == NULL) {
-		DEBUG(1, ("account_policy_get: Field %d is not a valid account policy type!  Cannot get, returning 0.\n", field));
+		DEBUG(1, ("account_policy_get: Field %d is not a valid account policy type!  Cannot get, returning 0.\n", type));
 		return False;
 	}
 
 	if (!dbwrap_fetch_uint32(db, name, &regval)) {
-		DEBUG(1, ("account_policy_get: tdb_fetch_uint32 failed for field %d (%s), returning 0\n", field, name));
+		DEBUG(1, ("account_policy_get: tdb_fetch_uint32 failed for type %d (%s), returning 0\n", type, name));
 		return False;
 	}
 
@@ -339,7 +339,7 @@ bool account_policy_get(int field, uint32 *value)
 Set an account policy (in tdb)
 ****************************************************************************/
 
-bool account_policy_set(int field, uint32 value)
+bool account_policy_set(enum pdb_policy_type type, uint32_t value)
 {
 	const char *name;
 	NTSTATUS status;
@@ -348,16 +348,16 @@ bool account_policy_set(int field, uint32 value)
 		return False;
 	}
 
-	name = decode_account_policy_name(field);
+	name = decode_account_policy_name(type);
 	if (name == NULL) {
-		DEBUG(1, ("Field %d is not a valid account policy type!  Cannot set.\n", field));
+		DEBUG(1, ("Field %d is not a valid account policy type!  Cannot set.\n", type));
 		return False;
 	}
 
 	status = dbwrap_trans_store_uint32(db, name, value);
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(1, ("store_uint32 failed for field %d (%s) on value "
-			  "%u: %s\n", field, name, value, nt_errstr(status)));
+		DEBUG(1, ("store_uint32 failed for type %d (%s) on value "
+			  "%u: %s\n", type, name, value, nt_errstr(status)));
 		return False;
 	}
 
@@ -370,14 +370,14 @@ bool account_policy_set(int field, uint32 value)
 Set an account policy in the cache
 ****************************************************************************/
 
-bool cache_account_policy_set(int field, uint32 value)
+bool cache_account_policy_set(enum pdb_policy_type type, uint32_t value)
 {
 	const char *policy_name = NULL;
 	char *cache_key = NULL;
 	char *cache_value = NULL;
 	bool ret = False;
 
-	policy_name = decode_account_policy_name(field);
+	policy_name = decode_account_policy_name(type);
 	if (policy_name == NULL) {
 		DEBUG(0,("cache_account_policy_set: no policy found\n"));
 		return False;
@@ -407,14 +407,14 @@ bool cache_account_policy_set(int field, uint32 value)
 Get an account policy from the cache
 *****************************************************************************/
 
-bool cache_account_policy_get(int field, uint32 *value)
+bool cache_account_policy_get(enum pdb_policy_type type, uint32_t *value)
 {
 	const char *policy_name = NULL;
 	char *cache_key = NULL;
 	char *cache_value = NULL;
 	bool ret = False;
 
-	policy_name = decode_account_policy_name(field);
+	policy_name = decode_account_policy_name(type);
 	if (policy_name == NULL) {
 		DEBUG(0,("cache_account_policy_set: no policy found\n"));
 		return False;