summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-06-20 01:28:39 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-06-20 01:30:51 +0200
commit1d86414eb022bd8c4d86bdab094a06f43e4eb10c (patch)
tree2078c546de51abcf7aa8a9e2b4501e587ef8a0cc
parentb48182007c53faebb0a57cefb5e1923a3bef5851 (diff)
downloadsamba-1d86414eb022bd8c4d86bdab094a06f43e4eb10c.tar.gz
samba-1d86414eb022bd8c4d86bdab094a06f43e4eb10c.tar.bz2
samba-1d86414eb022bd8c4d86bdab094a06f43e4eb10c.zip
samdb: Fix formatting, move get_oid_from_attid from Ldb to SamDB.
-rw-r--r--source4/scripting/python/samba/__init__.py3
-rw-r--r--source4/scripting/python/samba/samdb.py37
-rw-r--r--source4/scripting/python/samba/tests/dsdb.py2
3 files changed, 20 insertions, 22 deletions
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index c9bb59ee37..8f5ff83614 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -280,9 +280,6 @@ class Ldb(_Ldb):
def set_schema_from_ldif(self, pf, df):
dsdb.dsdb_set_schema_from_ldif(self, pf, df)
- def get_oid_from_attid(self, attid):
- return dsdb.dsdb_get_oid_from_attid(self, attid)
-
def set_schema_from_ldb(self, ldb):
dsdb.dsdb_set_schema_from_ldb(self, ldb)
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 3e29f04ed3..a47db9680a 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
# Unix SMB/CIFS implementation.
-# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007-2008
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007-2010
# Copyright (C) Matthias Dieter Wallnoefer 2009
#
# Based on the original in EJS:
@@ -26,8 +26,6 @@
import dsdb
import samba
import ldb
-from samba.idmap import IDmapDB
-import pwd
import time
import base64
@@ -127,11 +125,11 @@ pwdLastSet: 0
# The new user record. Note the reliance on the SAMLDB module which
# fills in the default informations
- ldbmessage = {"dn": group_dn,
+ ldbmessage = {"dn": group_dn,
"sAMAccountName": groupname,
"objectClass": "group"}
- if grouptype is not None:
+ if grouptype is not None:
ldbmessage["groupType"] = "%d" % ((grouptype)-2**32)
if description is not None:
@@ -234,11 +232,11 @@ member: %s
def newuser(self, username, password,
force_password_change_at_next_login_req=False,
- useusernameascn=False, userou=None, surname=None, givenname=None, initials=None,
- profilepath=None, scriptpath=None, homedrive=None, homedirectory=None,
- jobtitle=None, department=None, company=None, description=None,
- mailaddress=None, internetaddress=None, telephonenumber=None,
- physicaldeliveryoffice=None):
+ useusernameascn=False, userou=None, surname=None, givenname=None, initials=None,
+ profilepath=None, scriptpath=None, homedrive=None, homedirectory=None,
+ jobtitle=None, department=None, company=None, description=None,
+ mailaddress=None, internetaddress=None, telephonenumber=None,
+ physicaldeliveryoffice=None):
"""Adds a new user with additional parameters
:param username: Name of the new user
@@ -261,7 +259,7 @@ member: %s
:param internetaddress: Home page of the new user
:param telephonenumber: Phone number of the new user
:param physicaldeliveryoffice: Office location of the new user
- """
+ """
displayname = "";
if givenname is not None:
@@ -273,7 +271,7 @@ member: %s
if surname is not None:
displayname += ' %s' % surname
- cn = username
+ cn = username
if useusernameascn is None and displayname is not "":
cn = displayname
@@ -281,24 +279,24 @@ member: %s
# The new user record. Note the reliance on the SAMLDB module which
# fills in the default informations
- ldbmessage = {"dn": user_dn,
+ ldbmessage = {"dn": user_dn,
"sAMAccountName": username,
"objectClass": "user"}
- if surname is not None:
+ if surname is not None:
ldbmessage["sn"] = surname
- if givenname is not None:
+ if givenname is not None:
ldbmessage["givenName"] = givenname
- if displayname is not "":
+ if displayname is not "":
ldbmessage["displayName"] = displayname
ldbmessage["name"] = displayname
- if initials is not None:
+ if initials is not None:
ldbmessage["initials"] = '%s.' % initials
- if profilepath is not None:
+ if profilepath is not None:
ldbmessage["profilePath"] = profilepath
if scriptpath is not None:
@@ -452,6 +450,9 @@ accountExpires: %u
"""
dsdb.dsdb_set_ntds_invocation_id(self, invocation_id)
+ def get_oid_from_attid(self, attid):
+ return dsdb.dsdb_get_oid_from_attid(self, attid)
+
def get_invocation_id(self):
"Get the invocation_id id"
return dsdb.samdb_ntds_invocation_id(self)
diff --git a/source4/scripting/python/samba/tests/dsdb.py b/source4/scripting/python/samba/tests/dsdb.py
index 24a2888bf3..00dc6644cb 100644
--- a/source4/scripting/python/samba/tests/dsdb.py
+++ b/source4/scripting/python/samba/tests/dsdb.py
@@ -38,5 +38,5 @@ class DsdbTests(TestCase):
session = system_session()
test_ldb = SamDB(os.path.join(self._baseprovpath(), "private", "sam.ldb"),
session_info=session, credentials=creds,lp=lp)
- oid = test_ldb.dsdb_get_oid_from_attid(591614)
+ oid = test_ldb.get_oid_from_attid(591614)
self.assertEquals(oid, "1.2.840.113556.1.4.1790")