diff options
Diffstat (limited to 'src/lib/kadm5/srv/svr_policy.c')
| -rw-r--r-- | src/lib/kadm5/srv/svr_policy.c | 61 |
1 files changed, 7 insertions, 54 deletions
diff --git a/src/lib/kadm5/srv/svr_policy.c b/src/lib/kadm5/srv/svr_policy.c index 69d2fea..1f794e4 100644 --- a/src/lib/kadm5/srv/svr_policy.c +++ b/src/lib/kadm5/srv/svr_policy.c @@ -17,41 +17,6 @@ #define MAX_PW_CLASSES 5 #define MIN_PW_LENGTH 1 -/* - * Function: kadm5_create_policy - * - * Purpose: Create Policies in the policy DB. - * - * Arguments: - * entry (input) The policy entry to be written out to the DB. - * mask (input) Specifies which fields in entry are to ge written out - * and which get default values. - * <return value> 0 if successful otherwise an error code is returned. - * - * Requires: - * Entry must be a valid principal entry, and mask have a valid value. - * - * Effects: - * Verifies that mask does not specify that the refcount should - * be set as part of the creation, and calls - * kadm5_create_policy_internal. If the refcount *is* - * specified, returns KADM5_BAD_MASK. - */ - -kadm5_ret_t -kadm5_create_policy(void *server_handle, - kadm5_policy_ent_t entry, long mask) -{ - CHECK_HANDLE(server_handle); - - krb5_clear_error_message(((kadm5_server_handle_t)server_handle)->context); - - if (mask & KADM5_REF_COUNT) - return KADM5_BAD_MASK; - else - return kadm5_create_policy_internal(server_handle, entry, mask); -} - /* Validate allowed_keysalts. */ static kadm5_ret_t validate_allowed_keysalts(const char *allowed_keysalts) @@ -71,7 +36,7 @@ validate_allowed_keysalts(const char *allowed_keysalts) } /* - * Function: kadm5_create_policy_internal + * Function: kadm5_create_policy * * Purpose: Create Policies in the policy DB. * @@ -91,8 +56,7 @@ validate_allowed_keysalts(const char *allowed_keysalts) */ kadm5_ret_t -kadm5_create_policy_internal(void *server_handle, - kadm5_policy_ent_t entry, long mask) +kadm5_create_policy(void *server_handle, kadm5_policy_ent_t entry, long mask) { kadm5_server_handle_t handle = server_handle; osa_policy_ent_rec pent; @@ -101,6 +65,8 @@ kadm5_create_policy_internal(void *server_handle, CHECK_HANDLE(server_handle); + krb5_clear_error_message(handle->context); + if ((entry == (kadm5_policy_ent_t) NULL) || (entry->policy == NULL)) return EINVAL; if(strlen(entry->policy) == 0) @@ -233,20 +199,6 @@ kadm5_delete_policy(void *server_handle, kadm5_policy_t name) return (ret == 0) ? KADM5_OK : ret; } -kadm5_ret_t -kadm5_modify_policy(void *server_handle, - kadm5_policy_ent_t entry, long mask) -{ - CHECK_HANDLE(server_handle); - - krb5_clear_error_message(((kadm5_server_handle_t)server_handle)->context); - - if (mask & KADM5_REF_COUNT) - return KADM5_BAD_MASK; - else - return kadm5_modify_policy_internal(server_handle, entry, mask); -} - /* Allocate and form a TL data list of a desired size. */ static int alloc_tl_data(krb5_int16 n_tl_data, krb5_tl_data **tldp) @@ -291,8 +243,7 @@ copy_tl_data(krb5_int16 n_tl_data, krb5_tl_data *tl_data, } kadm5_ret_t -kadm5_modify_policy_internal(void *server_handle, - kadm5_policy_ent_t entry, long mask) +kadm5_modify_policy(void *server_handle, kadm5_policy_ent_t entry, long mask) { kadm5_server_handle_t handle = server_handle; krb5_tl_data *tl; @@ -302,6 +253,8 @@ kadm5_modify_policy_internal(void *server_handle, CHECK_HANDLE(server_handle); + krb5_clear_error_message(handle->context); + if((entry == (kadm5_policy_ent_t) NULL) || (entry->policy == NULL)) return EINVAL; if(strlen(entry->policy) == 0) |