From cde9ec4af673a658777596f56dcba055458a4b35 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Sun, 9 May 2010 10:54:19 +0200 Subject: s4:samdb python bindings - remove idmap creation stuff from this call The id mapping should now be handled automatically by the s4 daemon. --- source4/scripting/python/samba/samdb.py | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py index dd3824db0c..991c678c7c 100644 --- a/source4/scripting/python/samba/samdb.py +++ b/source4/scripting/python/samba/samdb.py @@ -109,15 +109,11 @@ pwdLastSet: 0 """ % (user_dn) self.modify_ldif(mod) - def newuser(self, username, unixname, password, + def newuser(self, username, password, force_password_change_at_next_login_req=False): """Adds a new user - Note: This call adds also the ID mapping for winbind; therefore it works - *only* on SAMBA 4. - :param username: Name of the new user - :param unixname: Name of the unix user to map to :param password: Password for the new user :param force_password_change_at_next_login_req: Force password change """ @@ -135,23 +131,6 @@ pwdLastSet: 0 self.setpassword("(dn=" + user_dn + ")", password, force_password_change_at_next_login_req) - # Gets the user SID (for the account mapping setup) - res = self.search(user_dn, scope=ldb.SCOPE_BASE, - expression="objectclass=*", - attrs=["objectSid"]) - assert len(res) == 1 - user_sid = self.schema_format_value("objectSid", res[0]["objectSid"][0]) - - try: - idmap = IDmapDB(lp=self.lp) - - user = pwd.getpwnam(unixname) - - # setup ID mapping for this UID - idmap.setup_name_mapping(user_sid, idmap.TYPE_UID, user[2]) - - except KeyError: - pass except: self.transaction_cancel() raise -- cgit