diff options
Diffstat (limited to 'src/kadmin/cli')
| -rw-r--r-- | src/kadmin/cli/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kadmin/cli/kadmin.c | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog index 4ac649d1d..1e806339d 100644 --- a/src/kadmin/cli/ChangeLog +++ b/src/kadmin/cli/ChangeLog @@ -1,3 +1,8 @@ +2000-02-25 Ken Raeburn <raeburn@mit.edu> + + * kadmin.c (kadmin_modprinc): Complain if -pw option is given, + since it's ignored. Patch from Matt Crawford. + 2000-02-18 Tom Yu <tlyu@mit.edu> * keytab.c (add_usage): Update usage message. diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c index 23a2e4b93..5ce94ef15 100644 --- a/src/kadmin/cli/kadmin.c +++ b/src/kadmin/cli/kadmin.c @@ -1090,6 +1090,13 @@ void kadmin_modprinc(argc, argv) free(canon); return; } + if (pass) { + fprintf(stderr, + "modify_principal: -pw not allowed; use change_password\n"); + krb5_free_principal(context, princ.principal); + free(canon); + return; + } retval = kadm5_modify_principal(handle, &princ, mask); krb5_free_principal(context, princ.principal); if (retval) { |