3 files changed, 11 insertions, 3 deletions
diff --git a/ipa-admintools/ipa-deluser b/ipa-admintools/ipa-deluser
index c6d5a8d7..10d24806 100644
--- a/ipa-admintools/ipa-deluser
+++ b/ipa-admintools/ipa-deluser
@@ -49,8 +49,11 @@ def main():
 
     try:
         client = ipaclient.IPAClient()
-        client.mark_user_deleted(args[1])
-        print args[1] + " successfully deleted"
+        ret = client.mark_user_deleted(args[1])
+        if (ret == "Success"):
+            print args[1] + " successfully deleted"
+        else:
+            print args[1] + " " + ret
     except xmlrpclib.Fault, f:
         print f.faultString
         return 1
diff --git a/ipa-admintools/ipa-finduser b/ipa-admintools/ipa-finduser
index 4b1651c0..167ac23d 100644
--- a/ipa-admintools/ipa-finduser
+++ b/ipa-admintools/ipa-finduser
@@ -49,6 +49,11 @@ def main():
     try:
         client = ipaclient.IPAClient()
         users = client.find_users(args[1], sattrs=['dn','uid','cn','homeDirectory'])
+
+        if len(users) == 0:
+            print "No entries found for", args[1]
+            return 0
+
         for ent in users:
             attr = ent.attrList()
 
diff --git a/ipa-admintools/ipa-usermod b/ipa-admintools/ipa-usermod
index bcd06821..3c9f8adc 100644
--- a/ipa-admintools/ipa-usermod
+++ b/ipa-admintools/ipa-usermod
@@ -54,7 +54,7 @@ def main():
         usage()
 
     client = ipaclient.IPAClient()
-    user = client.get_user(args[1])
+    user = client.get_user_by_uid(args[1])
 
     if options.gecos:
         user.setValue('gecos', options.gecos)