From 71de8878bd3c2aadf61ebefc91f5b50a3f73c9d2 Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jcholast@redhat.com>
Date: Jun 20 2016 14:39:12 +0000
Subject: passwd: handle sort order of passwd argument on the client


https://fedorahosted.org/freeipa/ticket/4739

Reviewed-By: David Kupka <dkupka@redhat.com>

---

diff --git a/ipaclient/plugins/passwd.py b/ipaclient/plugins/passwd.py
new file mode 100644
index 0000000..7382306
--- /dev/null
+++ b/ipaclient/plugins/passwd.py
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2016  FreeIPA Contributors see COPYING for license
+#
+
+from ipaclient.frontend import CommandOverride
+from ipalib.plugable import Registry
+
+register = Registry()
+
+
+@register(override=True)
+class passwd(CommandOverride):
+    def get_args(self):
+        for arg in super(passwd, self).get_args():
+            if arg.name == 'current_password':
+                arg = arg.clone(sortorder=-1)
+            yield arg
diff --git a/ipaserver/plugins/passwd.py b/ipaserver/plugins/passwd.py
index 8f6b80d..253a0d3 100644
--- a/ipaserver/plugins/passwd.py
+++ b/ipaserver/plugins/passwd.py
@@ -85,7 +85,6 @@ class passwd(Command):
                  confirm=False,
                  default_from=lambda principal: get_current_password(principal),
                  autofill=True,
-                 sortorder=-1,
         ),
     )