Merge branch 'master' of git://git.engineering.redhat.com/users/rcritten/freeipa2

1 files changed, 12 insertions, 1 deletions

diff --git a/ipalib/cli.py b/ipalib/cli.py
index 0bab952bf..518b71298 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -697,14 +697,25 @@ class CLI(object):
         if self.options.interactive:
             self.prompt_interactively(cmd, kw)
         self.prompt_for_passwords(cmd, kw)
+        self.set_defaults(cmd, kw)
         result = cmd(**kw)
         if callable(cmd.output_for_cli):
             for param in cmd.params():
                 if param.ispassword():
-                    del kw[param.name]
+                    try:
+                        del kw[param.name]
+                    except KeyError:
+                        pass
             (args, options) = cmd.params_2_args_options(kw)
             cmd.output_for_cli(self.api.Backend.textui, result, *args, **options)
 
+    def set_defaults(self, cmd, kw):
+        for param in cmd.params():
+            if not kw.get(param.name):
+                value = param.get_default(**kw)
+                if value:
+                    kw[param.name] = value
+
     def prompt_for_passwords(self, cmd, kw):
         for param in cmd.params():
             if 'password' not in param.flags: