From: Ken Raeburn <raeburn@mit.edu>
Date: Sat, 26 Feb 2000 03:24:44 +0000 (+0000)
Subject: * kadmin.c (kadmin_modprinc): Complain if -pw option is given,
X-Git-Tag: krb5-1.2-beta1~43
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=119f6303edd683d6f20d04deaa6e25d5940434bd;p=krb5.git

* 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 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) {