diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2000-02-26 03:24:44 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2000-02-26 03:24:44 +0000 |
| commit | 119f6303edd683d6f20d04deaa6e25d5940434bd (patch) | |
| tree | 36d0038f7de835ae1b0b960f64c6ca3152ba1995 /src/kadmin/cli | |
| parent | fe8ee2d8ff839d142f51b3d7818daa936e5a92aa (diff) | |
| download | krb5-119f6303edd683d6f20d04deaa6e25d5940434bd.tar.gz krb5-119f6303edd683d6f20d04deaa6e25d5940434bd.tar.xz krb5-119f6303edd683d6f20d04deaa6e25d5940434bd.zip | |
* kadmin.c (kadmin_modprinc): Complain if -pw option is given,
since it's ignored. Patch from Matt Crawford.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12080 dc483132-0cff-0310-8789-dd5450dbe970
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) { |