diff options
author | Kevin McCarthy <kmccarth@redhat.com> | 2007-10-11 12:19:42 -0700 |
---|---|---|
committer | Kevin McCarthy <kmccarth@redhat.com> | 2007-10-11 12:19:42 -0700 |
commit | 06b107ed5f8a867cec9066796657b1cb72b2ba58 (patch) | |
tree | 11a122e06d70850f54a6573006d9253e905819c6 | |
parent | 52a57a9639e085205bab99582aa9b93d0bf46b38 (diff) | |
download | freeipa-06b107ed5f8a867cec9066796657b1cb72b2ba58.tar.gz freeipa-06b107ed5f8a867cec9066796657b1cb72b2ba58.tar.xz freeipa-06b107ed5f8a867cec9066796657b1cb72b2ba58.zip |
Add inetUser objectclass. Remove test-users ldif.
-rw-r--r-- | ipa-server/ipa-install/test/test-users-template.ldif | 22 | ||||
-rw-r--r-- | ipa-server/ipaserver/dsinstance.py | 9 | ||||
-rw-r--r-- | ipa-server/xmlrpc-server/funcs.py | 8 |
3 files changed, 5 insertions, 34 deletions
diff --git a/ipa-server/ipa-install/test/test-users-template.ldif b/ipa-server/ipa-install/test/test-users-template.ldif deleted file mode 100644 index f5573d839..000000000 --- a/ipa-server/ipa-install/test/test-users-template.ldif +++ /dev/null @@ -1,22 +0,0 @@ -# test, users, default, $REALM -dn: uid=test,cn=users,cn=accounts,$SUFFIX -changetype: add -uidNumber: 1003 -uid: test -gecos: test -homeDirectory: /home/test -loginShell: /bin/bash -gidNumber: 1002 -objectclass: krbPrincipalAux -objectclass: inetOrgPerson -objectClass: posixAccount -objectClass: account -objectClass: top -cn: Test User -sn: User -krbPrincipalName: test@$REALM - -dn: cn=ipausers,cn=groups,cn=accounts,$SUFFIX -changetype: modify -add: uniqueMember -uniqueMember: uid=test,cn=users,cn=accounts,$SUFFIX diff --git a/ipa-server/ipaserver/dsinstance.py b/ipa-server/ipaserver/dsinstance.py index 30691115e..16552393c 100644 --- a/ipa-server/ipaserver/dsinstance.py +++ b/ipa-server/ipaserver/dsinstance.py @@ -97,7 +97,6 @@ class DsInstance: # TODO: roll back here? print "Failed to restart the ds instance" self.__add_default_layout() - self.__create_test_users() def config_dirname(self): if not self.serverid: @@ -193,14 +192,6 @@ class DsInstance: except subprocess.CalledProcessError, e: print "Failed to add default ds layout", e logging.debug("Failed to add default ds layout %s" % e) - - def __create_test_users(self): - logging.debug("create test users ldif") - txt = template_file(SHARE_DIR + "test-users-template.ldif", self.sub_dict) - user_fd = open(SHARE_DIR+"test-users.ldif", "w") - user_fd.write(txt) - user_fd.close() - logging.debug("done creating test users ldif") def __certmap_conf(self): logging.debug("configuring certmap.conf for ds instance") diff --git a/ipa-server/xmlrpc-server/funcs.py b/ipa-server/xmlrpc-server/funcs.py index 4ba83bc1a..86c12065f 100644 --- a/ipa-server/xmlrpc-server/funcs.py +++ b/ipa-server/xmlrpc-server/funcs.py @@ -448,8 +448,9 @@ class IPAServer: del user['gn'] # some required objectclasses - entry.setValues('objectClass', 'top', 'person', 'organizationalPerson', 'inetOrgPerson', 'posixAccount', 'krbPrincipalAux') - + entry.setValues('objectClass', 'top', 'person', 'organizationalPerson', + 'inetOrgPerson', 'inetUser', 'posixAccount', 'krbPrincipalAux') + # fill in our new entry with everything sent by the user for u in user: entry.setValues(u, user[u]) @@ -709,7 +710,8 @@ class IPAServer: entry = ipaserver.ipaldap.Entry(dn) # some required objectclasses - entry.setValues('objectClass', 'top', 'groupofuniquenames', 'posixGroup') + entry.setValues('objectClass', 'top', 'groupofuniquenames', 'posixGroup', + 'inetUser') # FIXME, need a gidNumber generator if group.get('gidnumber') is None: |