pull up r22323 from trunk

 ------------------------------------------------------------------------
 r22323 | ghudson | 2009-05-07 15:51:46 -0400 (Thu, 07 May 2009) | 8 lines
 Changed paths:
    M /trunk/src/lib/kadm5/srv/svr_policy.c
    M /trunk/src/lib/kadm5/unit-test/api.0/crte-policy.exp
    M /trunk/src/lib/kadm5/unit-test/api.2/crte-policy.exp

 ticket: 6482
 subject: Allow more than 10 past keys to be stored by a policy
 target_version: 1.7
 tags: pullup

 Remove the arbitrary limit of 10 past keys in policies.  We were not
 taking advantage of that limit in any other code.

ticket: 6482
version_fixed: 1.7

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22338 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/kadm5/srv/svr_policy.c b/src/lib/kadm5/srv/svr_policy.c
index 650cadf57a0a7a5eeccc422d66419a0810a75dca..7add6714a4b77ed6dbd53b8650f12e92ff462ad4 100644 (file)
--- a/src/lib/kadm5/srv/svr_policy.c
+++ b/src/lib/kadm5/srv/svr_policy.c
@@ -15,7 +15,6 @@ static char *rcsid = "$Header$";
 #include       <string.h>
 #include       <errno.h>
 
-#define MAX_PW_HISTORY 10
 #define MIN_PW_HISTORY 1
 #define        MIN_PW_CLASSES  1
 #define MAX_PW_CLASSES 5
@@ -132,8 +131,7 @@ kadm5_create_policy_internal(void *server_handle,
     if (!(mask & KADM5_PW_HISTORY_NUM))
        pent.pw_history_num = MIN_PW_HISTORY;
     else {
-       if(entry->pw_history_num < MIN_PW_HISTORY ||
-          entry->pw_history_num > MAX_PW_HISTORY)
+       if(entry->pw_history_num < MIN_PW_HISTORY)
            return KADM5_BAD_HISTORY;
        else
            pent.pw_history_num = entry->pw_history_num;
@@ -242,8 +240,7 @@ kadm5_modify_policy_internal(void *server_handle,
        p->pw_min_classes = entry->pw_min_classes;
     }
     if ((mask & KADM5_PW_HISTORY_NUM)) {
-       if(entry->pw_history_num < MIN_PW_HISTORY ||
-          entry->pw_history_num > MAX_PW_HISTORY) {
+       if(entry->pw_history_num < MIN_PW_HISTORY) {
             krb5_db_free_policy(handle->context, p);
             return KADM5_BAD_HISTORY;
        }

diff --git a/src/lib/kadm5/unit-test/api.0/crte-policy.exp b/src/lib/kadm5/unit-test/api.0/crte-policy.exp
index e2d02a37f896879de3918172590673a3b8eee4e4..e2185c76a58d20d41c1f7e47ffbf28680d9dcf77 100644 (file)
--- a/src/lib/kadm5/unit-test/api.0/crte-policy.exp
+++ b/src/lib/kadm5/unit-test/api.0/crte-policy.exp
@@ -743,41 +743,6 @@ proc test21 {} {
 }
 test21
     
-# Description: (21.5) Rejects 11 for pw_history_num.
-# 01/24/94: pshuang: untried.
-
-test "create-policy 21.5"
-proc test215 {} {
-    global test
-    global prompt
-
-    if {! (( ! [policy_exists "$test/a"]) ||
-          [delete_policy "$test/a"])} {
-           error_and_restart "$test: couldn't delete principal \"$test/a\""
-           return
-    }
-
-    if {! [cmd {
-       ovsec_kadm_init admin admin $OVSEC_KADM_ADMIN_SERVICE null \
-               $OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
-               server_handle
-    }]} {
-       perror "$test: unexpected failure in init"
-       return
-    }
-
-    one_line_fail_test [format {
-       ovsec_kadm_create_policy $server_handle {"%s/a" 0 0 0 0 11 0} \
-               {OVSEC_KADM_POLICY OVSEC_KADM_PW_HISTORY_NUM}
-    } $test] "BAD_HISTORY"
-    if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-       perror "$test: unexpected failure in destroy"
-       return
-    }
-}
-test215
-
-
 # Description: (22) Fails for user with no access bits.
 test "create-policy 22"
 proc test22 {} {

diff --git a/src/lib/kadm5/unit-test/api.2/crte-policy.exp b/src/lib/kadm5/unit-test/api.2/crte-policy.exp
index f11253c2c3320f01e6c0f7f1a3786fdc1ec45062..2c42cb43fc9f2d59399d2cce8e3c1b27b796952a 100644 (file)
--- a/src/lib/kadm5/unit-test/api.2/crte-policy.exp
+++ b/src/lib/kadm5/unit-test/api.2/crte-policy.exp
@@ -743,41 +743,6 @@ proc test21 {} {
 }
 test21
     
-# Description: (21.5) Rejects 11 for pw_history_num.
-# 01/24/94: pshuang: untried.
-
-test "create-policy 21.5"
-proc test215 {} {
-    global test
-    global prompt
-
-    if {! (( ! [policy_exists "$test/a"]) ||
-          [delete_policy "$test/a"])} {
-           error_and_restart "$test: couldn't delete principal \"$test/a\""
-           return
-    }
-
-    if {! [cmd {
-       kadm5_init admin admin $KADM5_ADMIN_SERVICE null \
-               $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
-               server_handle
-    }]} {
-       perror "$test: unexpected failure in init"
-       return
-    }
-
-    one_line_fail_test [format {
-       kadm5_create_policy $server_handle {"%s/a" 0 0 0 0 11 0} \
-               {KADM5_POLICY KADM5_PW_HISTORY_NUM}
-    } $test] "BAD_HISTORY"
-    if { ! [cmd {kadm5_destroy $server_handle}]} {
-       perror "$test: unexpected failure in destroy"
-       return
-    }
-}
-test215
-
-
 # Description: (22) Fails for user with no access bits.
 test "create-policy 22"
 proc test22 {} {