From a0e2fa00f1005bf7d5853c83ff0f567663352e92 Mon Sep 17 00:00:00 2001 From: Kevin McCarthy Date: Fri, 17 Aug 2007 14:27:54 -0700 Subject: Manual merge changes in for the cidict/ipaclient add_user() --- ipa-server/xmlrpc-server/funcs.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'ipa-server/xmlrpc-server/funcs.py') diff --git a/ipa-server/xmlrpc-server/funcs.py b/ipa-server/xmlrpc-server/funcs.py index df8bceaa..22f52dae 100644 --- a/ipa-server/xmlrpc-server/funcs.py +++ b/ipa-server/xmlrpc-server/funcs.py @@ -171,14 +171,31 @@ class IPAServer: return self.convert_entry(ent) - def add_user (self, user, user_container="ou=users,ou=default",opts=None): + def add_user (self, args, user_container="ou=users,ou=default",opts=None): """Add a user in LDAP. Takes as input a dict where the key is the attribute name and the value is either a string or in the case of a multi-valued field a list of values. user_container sets where in the tree the user is placed.""" global _LDAPPool + + # The XML-RPC server marshals the arguments into one variable + # while the direct caller has them separate. So do a little + # bit of gymnastics to figure things out. There has to be a + # better way, so FIXME + if isinstance(args,tuple): + opts = user_container + if len(args) == 2: + user = args[0] + user_container = args[1] + else: + user = args + user_container = "ou=users,ou=default" + else: + user = args + if (isinstance(user, tuple)): user = user[0] + dn="uid=%s,%s,%s" % (user['uid'], user_container,self.basedn) entry = ipaserver.ipaldap.Entry(str(dn)) -- cgit