* 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

diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index 4ac649d1d538d03bba5c7e26c152d604e854e63c..1e806339d1f2b088fdcbd7ac8ee0d9551badcedd 100644 (file)
--- 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 23a2e4b93c4fef7447a91a1b74cfb2b48fbd7fb2..5ce94ef15ed5bccd74674324b5bd2f5242eddf10 100644 (file)
--- 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) {