Embed origiginal values inside user, and have update_user pass in a user

object.  Based on rcrit's original patch.
Push scalar to list value conversion inside funcs.py.

1 files changed, 5 insertions, 9 deletions

diff --git a/ipa-admintools/ipa-usermod b/ipa-admintools/ipa-usermod
index cb221e446..bcd06821d 100644
--- a/ipa-admintools/ipa-usermod
+++ b/ipa-admintools/ipa-usermod
@@ -48,27 +48,23 @@ def parse_options():
     return options, args
 
 def main():
-    olduser={}
-    newuser={}
     options, args = parse_options()
 
     if len(args) != 2:
         usage()
 
     client = ipaclient.IPAClient()
-    u = client.get_user(args[1])
-    olduser = u.toDict()
-    newuser = u.toDict()
+    user = client.get_user(args[1])
 
     if options.gecos:
-        newuser['gecos'] = [options.gecos]
+        user.setValue('gecos', options.gecos)
     if options.directory:
-        newuser['homedirectory'] = [options.directory]
+        user.setValue('homedirectory', options.directory)
     if options.shell:
-        newuser['loginshell'] = [options.shell]
+        user.setValue('loginshell', options.shell)
 
     try:
-        client.update_user(olduser, newuser)
+        client.update_user(user)
         print args[1] + " successfully modified"
     except xmlrpclib.Fault, f:
         print f.faultString