From 76bf420754d5dc38ad71f56be456505115e18357 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcrit@ipa.greyoak.com>
Date: Thu, 21 Aug 2008 10:32:40 -0400
Subject: [PATCH] Display name as separate attributes instead of showing common
 name.

We allow one to individually set first and last name but we do not
automatically update the common name so changes don't seem to happen.

451318
---
 ipa-admintools/ipa-finduser | 14 +++++++++++++-
 ipa-python/ipaadminutil.py  |  5 ++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ipa-admintools/ipa-finduser b/ipa-admintools/ipa-finduser
index 40384a3bd..919c4b92c 100644
--- a/ipa-admintools/ipa-finduser
+++ b/ipa-admintools/ipa-finduser
@@ -93,7 +93,7 @@ def main():
 
     client = ipaclient.IPAClient(verbose=options.verbose)
     if options.all is None:
-        users = client.find_users(args[1], sattrs=['uid','cn','homeDirectory','loginshell'])
+        users = client.find_users(args[1], sattrs=['uid','givenname','sn','homeDirectory','loginshell'])
     else:
         users = client.find_users(args[1], sattrs=None)
 
@@ -121,6 +121,18 @@ def main():
     for ent in users:
         attr = ent.attrList()
         attr.sort()
+
+        # Always have sn following givenname
+        try:
+            l = attr.index('givenname')
+            try:
+                attr.remove('sn')
+                attr.insert(l+1, 'sn')
+            except ValueError:
+                pass
+        except ValueError:
+            pass
+
         if options.notranslate:
             labels = {}
             for a in attr:
diff --git a/ipa-python/ipaadminutil.py b/ipa-python/ipaadminutil.py
index 27337642c..5f0b2fa98 100644
--- a/ipa-python/ipaadminutil.py
+++ b/ipa-python/ipaadminutil.py
@@ -33,7 +33,10 @@ def select_user(counter, users):
     i = 1
     print "%s entries were found. Which one would you like to display?" % counter
     for ent in users:
-        print "%s: %s (%s)" % (i, ent.getValues('cn'), ent.getValues('uid'))
+        if (ent.getValues('givenname')) is not None:
+            print "%s: %s %s (%s)" % (i, ent.getValues('givenname'), ent.getValues('sn'), ent.getValues('uid'))
+        else:
+            print "%s: %s (%s)" % (i, ent.getValues('sn'), ent.getValues('uid'))
         i += 1
     while True:
         resp = raw_input("Choose one: (1 - %s), 0 for all, q to quit: " % counter)