summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmccarth@redhat.com <kmccarth@redhat.com>2007-08-02 15:01:59 -0700
committerkmccarth@redhat.com <kmccarth@redhat.com>2007-08-02 15:01:59 -0700
commit88ab86fa37f06348d50ca875ecd994d6b565484f (patch)
tree2c2115ee9e6ca67890b60a35d17f009ff30c3f6f
parentabdc56fb3aec851bfb29212e1a839623ea117455 (diff)
downloadfreeipa-88ab86fa37f06348d50ca875ecd994d6b565484f.tar.gz
freeipa-88ab86fa37f06348d50ca875ecd994d6b565484f.tar.xz
freeipa-88ab86fa37f06348d50ca875ecd994d6b565484f.zip
Rename 'gn' to 'givenName'
-rw-r--r--ipa-admintools/ipa-adduser2
-rw-r--r--ipa-python/rpcclient.py4
-rw-r--r--ipa-server/xmlrpc-server/funcs.py2
3 files changed, 3 insertions, 5 deletions
diff --git a/ipa-admintools/ipa-adduser b/ipa-admintools/ipa-adduser
index 5ce8d3ae7..8c308b084 100644
--- a/ipa-admintools/ipa-adduser
+++ b/ipa-admintools/ipa-adduser
@@ -60,7 +60,7 @@ def main():
if len(args) != 2:
usage()
- user['gn'] = options.gn
+ user['givenName'] = options.gn
user['sn'] = options.sn
user['uid'] = args[1]
if options.gecos:
diff --git a/ipa-python/rpcclient.py b/ipa-python/rpcclient.py
index f37096d8b..187b0b3ca 100644
--- a/ipa-python/rpcclient.py
+++ b/ipa-python/rpcclient.py
@@ -77,9 +77,7 @@ def add_user(user):
# FIXME: What is the default group for users?
user['gidNumber'] ='501'
user['krbPrincipalName'] = "%s@%s" % (user['uid'], realm)
- user['cn'] = "%s %s" % (user['gn'], user['sn'])
- if user.get('gn'):
- del user['gn']
+ user['cn'] = "%s %s" % (user['givenName'], user['sn'])
try:
result = server.add_user(user)
diff --git a/ipa-server/xmlrpc-server/funcs.py b/ipa-server/xmlrpc-server/funcs.py
index 9576df998..be95d4fab 100644
--- a/ipa-server/xmlrpc-server/funcs.py
+++ b/ipa-server/xmlrpc-server/funcs.py
@@ -146,7 +146,7 @@ def get_add_schema ():
fields.append(field1)
field1 = {
- "name": "gn" ,
+ "name": "givenName" ,
"label": "First name:",
"type": "text",
"validator": "string",