From 6c84ecb55657ae28eb739a72164f6d7251dc627f Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Sat, 12 Feb 2005 00:51:31 +0000 Subject: r5349: After talking with Jerry, reverted the addition of account policies to passdb in 3_0 (they are still in trunk). Guenther (This used to be commit fdf9bdbbac1d8d4f3b3e1fc7e49c1e659b9301b1) --- source3/include/passdb.h | 12 ------------ source3/include/smbldap.h | 4 ---- 2 files changed, 16 deletions(-) (limited to 'source3/include') diff --git a/source3/include/passdb.h b/source3/include/passdb.h index eed3be1ff9..42f38e5b6a 100644 --- a/source3/include/passdb.h +++ b/source3/include/passdb.h @@ -334,12 +334,6 @@ typedef struct pdb_context DOM_SID **aliases, int *num_aliases); - NTSTATUS (*pdb_get_account_policy)(struct pdb_context *context, - int policy_index, int *value); - - NTSTATUS (*pdb_set_account_policy)(struct pdb_context *context, - int policy_index, int value); - void (*free_fn)(struct pdb_context **); TALLOC_CTX *mem_ctx; @@ -431,12 +425,6 @@ typedef struct pdb_methods int num_members, DOM_SID **aliases, int *num); - NTSTATUS (*get_account_policy)(struct pdb_methods *methods, - int policy_index, int *value); - - NTSTATUS (*set_account_policy)(struct pdb_methods *methods, - int policy_index, int value); - void *private_data; /* Private data of some kind */ void (*free_private_data)(void **); diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h index 9a116ab7e7..adb51430dc 100644 --- a/source3/include/smbldap.h +++ b/source3/include/smbldap.h @@ -38,7 +38,6 @@ #define LDAP_OBJ_IDPOOL "sambaUnixIdPool" #define LDAP_OBJ_IDMAP_ENTRY "sambaIdmapEntry" #define LDAP_OBJ_SID_ENTRY "sambaSidEntry" -#define LDAP_OBJ_ACCOUNT_POLICY "sambaAccountPolicy" #define LDAP_OBJ_ACCOUNT "account" #define LDAP_OBJ_POSIXACCOUNT "posixAccount" @@ -98,8 +97,6 @@ #define LDAP_ATTR_SID_LIST 40 #define LDAP_ATTR_MOD_TIMESTAMP 41 #define LDAP_ATTR_LOGON_HOURS 42 -#define LDAP_ATTR_ACCOUNT_POLICY_NAME 43 -#define LDAP_ATTR_ACCOUNT_POLICY_VAL 44 typedef struct _attrib_map_entry { int attrib; @@ -118,7 +115,6 @@ extern ATTRIB_MAP_ENTRY groupmap_attr_list[]; extern ATTRIB_MAP_ENTRY groupmap_attr_list_to_delete[]; extern ATTRIB_MAP_ENTRY idpool_attr_list[]; extern ATTRIB_MAP_ENTRY sidmap_attr_list[]; -extern ATTRIB_MAP_ENTRY acctpol_attr_list[]; /* Function declarations -- not included in proto.h so we don't have to worry about LDAP structure types */ -- cgit