19 + krb5_verify_init_creds_opt_set_ap_req_nofail(&opt, FALSE); |
19 + krb5_verify_init_creds_opt_set_ap_req_nofail(&opt, FALSE); |
20 } |
20 } |
21 if (*argv != NULL) |
21 if (*argv != NULL) |
22 check(krb5_parse_name(context, *argv, &princ)); |
22 check(krb5_parse_name(context, *argv, &princ)); |
23 diff -pur old/src/lib/krb5/krb/t_vfy_increds.py new/src/lib/krb5/krb/t_vfy_increds.py |
23 diff -pur old/src/lib/krb5/krb/t_vfy_increds.py new/src/lib/krb5/krb/t_vfy_increds.py |
24 --- old/src/lib/krb5/krb/t_vfy_increds.py 2015-05-28 14:42:17.100176857 -0600 |
24 --- old/src/lib/krb5/krb/t_vfy_increds.py 2016-03-31 16:44:48.483714940 -0700 |
25 +++ new/src/lib/krb5/krb/t_vfy_increds.py 2015-05-28 18:03:03.977698328 -0600 |
25 +++ patched/src/lib/krb5/krb/t_vfy_increds.py 2016-03-31 19:34:30.816360770 -0700 |
26 @@ -53,29 +53,31 @@ realm.run(['./t_vfy_increds']) |
26 @@ -53,29 +53,31 @@ realm.run(['./t_vfy_increds']) |
27 realm.run(['./t_vfy_increds', '-n']) |
27 realm.run(['./t_vfy_increds', '-n']) |
28 |
28 |
29 # Remove the keytab and verify again. This should succeed if nofail |
29 # Remove the keytab and verify again. This should succeed if nofail |
30 -# is not set, and fail if it is set. |
30 -# is not set, and fail if it is set. |
53 |
53 |
54 # Add an NFS service principal to keytab. Verify should ignore it by |
54 # Add an NFS service principal to keytab. Verify should ignore it by |
55 -# default (succeeding unless nofail is set), but should verify with it |
55 -# default (succeeding unless nofail is set), but should verify with it |
56 +# default (succeeding only when nofail is unset), but should verify with it |
56 +# default (succeeding only when nofail is unset), but should verify with it |
57 # when it is specifically requested. |
57 # when it is specifically requested. |
58 realm.run_kadminl('addprinc -randkey ' + realm.nfs_princ) |
58 realm.run([kadminl, 'addprinc', '-randkey', realm.nfs_princ]) |
59 realm.run_kadminl('ktadd ' + realm.nfs_princ) |
59 realm.run([kadminl, 'ktadd', realm.nfs_princ]) |
60 -realm.run(['./t_vfy_increds']) |
60 -realm.run(['./t_vfy_increds']) |
61 +realm.run(['./t_vfy_increds'], expected_code=1) |
61 +realm.run(['./t_vfy_increds'], expected_code=1) |
62 realm.run(['./t_vfy_increds', '-n'], expected_code=1) |
62 realm.run(['./t_vfy_increds', '-n'], expected_code=1) |
63 realm.run(['./t_vfy_increds', realm.nfs_princ]) |
63 realm.run(['./t_vfy_increds', realm.nfs_princ]) |
64 realm.run(['./t_vfy_increds', '-n', realm.nfs_princ]) |
64 realm.run(['./t_vfy_increds', '-n', realm.nfs_princ]) |
65 @@ -84,7 +86,7 @@ realm.run(['./t_vfy_increds', '-n', real |
65 @@ -84,7 +86,7 @@ realm.run(['./t_vfy_increds', '-n', real |
66 # results with the default principal argument, but verification should |
66 # results with the default principal argument, but verification should |
67 # now fail if we request it specifically. |
67 # now fail if we request it specifically. |
68 realm.run_kadminl('change_password -randkey ' + realm.nfs_princ) |
68 realm.run([kadminl, 'change_password', '-randkey', realm.nfs_princ]) |
69 -realm.run(['./t_vfy_increds']) |
69 -realm.run(['./t_vfy_increds']) |
70 +realm.run(['./t_vfy_increds'], expected_code=1) |
70 +realm.run(['./t_vfy_increds'], expected_code=1) |
71 realm.run(['./t_vfy_increds', '-n'], expected_code=1) |
71 realm.run(['./t_vfy_increds', '-n'], expected_code=1) |
72 realm.run(['./t_vfy_increds', realm.nfs_princ], expected_code=1) |
72 realm.run(['./t_vfy_increds', realm.nfs_princ], expected_code=1) |
73 realm.run(['./t_vfy_increds', '-n', realm.nfs_princ], expected_code=1) |
73 realm.run(['./t_vfy_increds', '-n', realm.nfs_princ], expected_code=1) |