diff options
Diffstat (limited to 'src/lib/kadm5')
-rw-r--r-- | src/lib/kadm5/clnt/client_init.c | 2 | ||||
-rw-r--r-- | src/lib/kadm5/kadm_err.et | 2 | ||||
-rw-r--r-- | src/lib/kadm5/kadm_rpc_xdr.c | 2 | ||||
-rw-r--r-- | src/lib/kadm5/srv/pwqual_dict.c | 2 | ||||
-rw-r--r-- | src/lib/kadm5/srv/svr_principal.c | 2 | ||||
-rw-r--r-- | src/lib/kadm5/unit-test/api.current/chpass-principal.exp | 2 | ||||
-rw-r--r-- | src/lib/kadm5/unit-test/api.current/crte-principal.exp | 24 | ||||
-rw-r--r-- | src/lib/kadm5/unit-test/api.current/dlte-policy.exp | 2 | ||||
-rw-r--r-- | src/lib/kadm5/unit-test/api.current/mod-principal.exp | 6 | ||||
-rw-r--r-- | src/lib/kadm5/unit-test/config/unix.exp | 40 |
10 files changed, 42 insertions, 42 deletions
diff --git a/src/lib/kadm5/clnt/client_init.c b/src/lib/kadm5/clnt/client_init.c index aa08918..ff1580e 100644 --- a/src/lib/kadm5/clnt/client_init.c +++ b/src/lib/kadm5/clnt/client_init.c @@ -285,7 +285,7 @@ init_any(krb5_context context, char *client_name, enum init_type init_type, goto error; /* - * Bypass the remainder of the code and return straightaway + * Bypass the remainder of the code and return straight away * if the gss service requested is kiprop */ if (iprop_enable) { diff --git a/src/lib/kadm5/kadm_err.et b/src/lib/kadm5/kadm_err.et index 892a6fa..fbe2e76 100644 --- a/src/lib/kadm5/kadm_err.et +++ b/src/lib/kadm5/kadm_err.et @@ -23,7 +23,7 @@ error_code KADM5_BAD_CLASS, "Invalid number of character classes" error_code KADM5_BAD_LENGTH, "Invalid password length" error_code KADM5_BAD_POLICY, "Illegal policy name" error_code KADM5_BAD_PRINCIPAL, "Illegal principal name" -error_code KADM5_BAD_AUX_ATTR, "Invalid auxillary attributes" +error_code KADM5_BAD_AUX_ATTR, "Invalid auxiliary attributes" error_code KADM5_BAD_HISTORY, "Invalid password history count" error_code KADM5_BAD_MIN_PASS_LIFE, "Password minimum life is greater than password maximum life" error_code KADM5_PASS_Q_TOOSHORT, "Password is too short" diff --git a/src/lib/kadm5/kadm_rpc_xdr.c b/src/lib/kadm5/kadm_rpc_xdr.c index 8383e4e..0411c3f 100644 --- a/src/lib/kadm5/kadm_rpc_xdr.c +++ b/src/lib/kadm5/kadm_rpc_xdr.c @@ -244,7 +244,7 @@ static bool_t xdr_krb5_boolean(XDR *xdrs, krb5_boolean *kbool) bool_t xdr_krb5_key_data_nocontents(XDR *xdrs, krb5_key_data *objp) { /* - * Note that this function intentionally DOES NOT tranfer key + * Note that this function intentionally DOES NOT transfer key * length or contents! xdr_krb5_key_data in adb_xdr.c does, but * that is only for use within the server-side library. */ diff --git a/src/lib/kadm5/srv/pwqual_dict.c b/src/lib/kadm5/srv/pwqual_dict.c index f736eac..e3ac20e 100644 --- a/src/lib/kadm5/srv/pwqual_dict.c +++ b/src/lib/kadm5/srv/pwqual_dict.c @@ -87,7 +87,7 @@ word_compare(const void *s1, const void *s2) * success. * * Modifies: - * word_list to point to a chunck of allocated memory containing + * word_list to point to a chunk of allocated memory containing * pointers to words * word_block to contain the dictionary. * diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c index 53ecbe1..8a7ab6e 100644 --- a/src/lib/kadm5/srv/svr_principal.c +++ b/src/lib/kadm5/srv/svr_principal.c @@ -2005,7 +2005,7 @@ static int decrypt_key_data(krb5_context context, * kvnop (w) kvno to fill in, or NULL * * Effects: Searches the key_data array of entry, which must have been - * retrived with kadm5_get_principal with the KADM5_KEY_DATA mask, to + * retrieved with kadm5_get_principal with the KADM5_KEY_DATA mask, to * find a key with a specified enctype, salt type, and kvno in a * principal entry. If not found, return ENOENT. Otherwise, decrypt * it with the master key, and return the key in keyblock, the salt diff --git a/src/lib/kadm5/unit-test/api.current/chpass-principal.exp b/src/lib/kadm5/unit-test/api.current/chpass-principal.exp index 53a96e5..47a19dc 100644 --- a/src/lib/kadm5/unit-test/api.current/chpass-principal.exp +++ b/src/lib/kadm5/unit-test/api.current/chpass-principal.exp @@ -67,7 +67,7 @@ if { $RPC } { test1805 } # # admin with changepw service tickets try to change other principals -# password, failes with AUTH error +# password, fails with AUTH error test "chpass-principal 180.625" proc test180625 {} { global test diff --git a/src/lib/kadm5/unit-test/api.current/crte-principal.exp b/src/lib/kadm5/unit-test/api.current/crte-principal.exp index 52dda78..d6d6809 100644 --- a/src/lib/kadm5/unit-test/api.current/crte-principal.exp +++ b/src/lib/kadm5/unit-test/api.current/crte-principal.exp @@ -645,7 +645,7 @@ proc test28 {} { if {! [cmd [format { kadm5_get_principal $server_handle "%s/a" principal KADM5_PRINCIPAL_NORMAL_MASK } $test]]} { - fail "$test: can not retreive principal" + fail "$test: can not retrieve principal" return } send "lindex \$principal 10\n" @@ -689,7 +689,7 @@ proc test29 {} { if {! [cmd [format { kadm5_get_principal $server_handle "%s/a" principal KADM5_PRINCIPAL_NORMAL_MASK } $test]]} { - fail "$test: can not retreive principal" + fail "$test: can not retrieve principal" return; } send "lindex \$principal 1\n" @@ -733,7 +733,7 @@ proc test30 {} { if {! [cmd [format { kadm5_get_principal $server_handle "%s/a" principal KADM5_PRINCIPAL_NORMAL_MASK } $test]]} { - fail "$test: can not retreive principal" + fail "$test: can not retrieve principal" return; } send "lindex \$principal 3\n" @@ -778,7 +778,7 @@ proc test31 {} { if {! [cmd [format { kadm5_get_principal $server_handle "%s/a" principal KADM5_PRINCIPAL_NORMAL_MASK } $test]]} { - fail "$test: can not retreive principal" + fail "$test: can not retrieve principal" return; } send "lindex \$principal 3\n" @@ -823,7 +823,7 @@ proc test32 {} { if {! [cmd [format { kadm5_get_principal $server_handle "%s/a" principal KADM5_PRINCIPAL_NORMAL_MASK } $test]]} { - fail "$test: can not retreive principal" + fail "$test: can not retrieve principal" return; } if { ! [cmd {kadm5_get_policy $server_handle test-pol policy}]} { @@ -912,7 +912,7 @@ proc test33 {} { if {! [cmd [format { kadm5_get_principal $server_handle "%s/a" principal KADM5_PRINCIPAL_NORMAL_MASK } $test]]} { - fail "$test: can not retreive principal" + fail "$test: can not retrieve principal" return; } send "lindex \$principal 3\n" @@ -957,7 +957,7 @@ proc test34 {} { if {! [cmd [format { kadm5_get_principal $server_handle "%s/a" principal KADM5_PRINCIPAL_NORMAL_MASK } $test]]} { - fail "$test: can not retreive principal" + fail "$test: can not retrieve principal" return; } send "lindex \$principal 3\n" @@ -1002,7 +1002,7 @@ proc test35 {} { if {! [cmd [format { kadm5_get_principal $server_handle "%s/a" principal KADM5_PRINCIPAL_NORMAL_MASK } $test]]} { - fail "$test: can not retreive principal" + fail "$test: can not retrieve principal" return; } send "lindex \$principal 3\n" @@ -1047,7 +1047,7 @@ proc test36 {} { if {! [cmd [format { kadm5_get_principal $server_handle "%s/a" principal KADM5_PRINCIPAL_NORMAL_MASK } $test]]} { - fail "$test: can not retreive principal" + fail "$test: can not retrieve principal" return; } if { ! [cmd {kadm5_get_policy $server_handle test-pol policy} ]} { @@ -1135,7 +1135,7 @@ proc test37 {} { if {! [cmd [format { kadm5_get_principal $server_handle "%s/a" principal KADM5_PRINCIPAL_NORMAL_MASK } $test]]} { - fail "$test: can not retreive principal" + fail "$test: can not retrieve principal" return; } send "lindex \$principal 3\n" @@ -1179,7 +1179,7 @@ proc test38 {} { if {! [cmd [format { kadm5_get_principal $server_handle "%s/a" principal KADM5_PRINCIPAL_NORMAL_MASK } $test]]} { - fail "$test: can not retreive principal" + fail "$test: can not retrieve principal" return; } send "lindex \$principal 3\n" @@ -1308,7 +1308,7 @@ proc test40 {} { if {! [cmd [format { kadm5_get_principal $server_handle "%s/a" principal KADM5_PRINCIPAL_NORMAL_MASK } $test]]} { - fail "$test: can not retreive principal" + fail "$test: can not retrieve principal" return; } send "lindex \$principal 4\n" diff --git a/src/lib/kadm5/unit-test/api.current/dlte-policy.exp b/src/lib/kadm5/unit-test/api.current/dlte-policy.exp index 4ba40fd..ad2863d 100644 --- a/src/lib/kadm5/unit-test/api.current/dlte-policy.exp +++ b/src/lib/kadm5/unit-test/api.current/dlte-policy.exp @@ -158,7 +158,7 @@ proc test12 {} { $KADM5_STRUCT_VERSION $KADM5_API_VERSION_3 \ server_handle }]} { - perror "$test unexecpted failure in init" + perror "$test unexpected failure in init" return } if {! [cmd [format { diff --git a/src/lib/kadm5/unit-test/api.current/mod-principal.exp b/src/lib/kadm5/unit-test/api.current/mod-principal.exp index 44f8548..ac9f968 100644 --- a/src/lib/kadm5/unit-test/api.current/mod-principal.exp +++ b/src/lib/kadm5/unit-test/api.current/mod-principal.exp @@ -493,7 +493,7 @@ proc test22 {} { kadm5_modify_principal $server_handle [simple_principal "%s/a"] \ {KADM5_PW_EXPIRATION} } $test]]} { - fail "$test: modifiy failed" + fail "$test: modify failed" return } if {! [cmd [format { @@ -535,7 +535,7 @@ proc test23 {} { kadm5_modify_principal $server_handle [simple_principal "%s/a"] \ {KADM5_PW_EXPIRATION} } $test]]} { - fail "$test: modifiy failed" + fail "$test: modify failed" return } if {! [cmd [format { @@ -885,7 +885,7 @@ proc test29 {} { kadm5_modify_principal $server_handle [simple_principal "%s/a"] \ {KADM5_POLICY_CLR} } $test]]} { - fail "$test: modifiy failed" + fail "$test: modify failed" return } if {! [cmd [format { diff --git a/src/lib/kadm5/unit-test/config/unix.exp b/src/lib/kadm5/unit-test/config/unix.exp index ca67095..d7706ec 100644 --- a/src/lib/kadm5/unit-test/config/unix.exp +++ b/src/lib/kadm5/unit-test/config/unix.exp @@ -156,62 +156,62 @@ proc api_start {} { send "set current_struct_version \[expr \$KADM5_STRUCT_VERSION &~ \$KADM5_STRUCT_VERSION_MASK\]\n" expect { -re "$prompt$" {} - eof { perror "EOF setting API varibles"} - timeout { perror "timeout setting API varibles"} + eof { perror "EOF setting API variables"} + timeout { perror "timeout setting API variables"} } send "set current_api_version \[expr \$KADM5_API_VERSION_3 &~ \$KADM5_API_VERSION_MASK\]\n" expect { -re "$prompt$" {} - eof { perror "EOF setting API varibles"} - timeout { perror "timeout setting API varibles"} + eof { perror "EOF setting API variables"} + timeout { perror "timeout setting API variables"} } send "set bad_struct_version_mask \[expr 0x65432100 | \$current_struct_version\]\n" expect { -re "$prompt$" {} - eof { perror "EOF setting API varibles"} - timeout { perror "timeout setting API varibles"} + eof { perror "EOF setting API variables"} + timeout { perror "timeout setting API variables"} } send "set bad_api_version_mask \[expr 0x65432100 | \$current_api_version\]\n" expect { -re "$prompt$" {} - eof { perror "EOF setting API varibles"} - timeout { perror "timeout setting API varibles"} + eof { perror "EOF setting API variables"} + timeout { perror "timeout setting API variables"} } send "set no_api_version_mask \$current_api_version\n" expect { -re "$prompt$" {} - eof { perror "EOF setting API varibles"} - timeout { perror "timeout setting API varibles"} + eof { perror "EOF setting API variables"} + timeout { perror "timeout setting API variables"} } send "set no_struct_version_mask \$current_struct_version\n" expect { -re "$prompt$" {} - eof { perror "EOF setting API varibles"} - timeout { perror "timeout setting API varibles"} + eof { perror "EOF setting API variables"} + timeout { perror "timeout setting API variables"} } send "set old_api_version \[expr \$KADM5_API_VERSION_MASK | 0x00\]\n" expect { -re "$prompt$" {} - eof { perror "EOF setting API varibles"} - timeout { perror "timeout setting API varibles"} + eof { perror "EOF setting API variables"} + timeout { perror "timeout setting API variables"} } send "set old_struct_version \[expr \$KADM5_STRUCT_VERSION_MASK | 0x00\]\n" expect { -re "$prompt$" {} - eof { perror "EOF setting API varibles"} - timeout { perror "timeout setting API varibles"} + eof { perror "EOF setting API variables"} + timeout { perror "timeout setting API variables"} } send "set new_api_version \[expr \$KADM5_API_VERSION_MASK | 0xca\]\n" expect { -re "$prompt$" {} - eof { perror "EOF setting API varibles"} - timeout { perror "timeout setting API varibles"} + eof { perror "EOF setting API variables"} + timeout { perror "timeout setting API variables"} } send "set new_struct_version \[expr \$KADM5_STRUCT_VERSION_MASK | 0xca\]\n" expect { -re "$prompt$" {} - eof { perror "EOF setting API varibles"} - timeout { perror "timeout setting API varibles"} + eof { perror "EOF setting API variables"} + timeout { perror "timeout setting API variables"} } set api_pid $pid |