diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-04-08 20:28:11 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-04-08 23:20:36 +0200 |
| commit | cc6e2b8a819c6a1da4e6214be9607aab2de270bb (patch) | |
| tree | b7e23031a21be39c314f162e3eb5af80b4e1fdde /source4 | |
| parent | d7a46ee129c455cba95126e9c0f409522127894e (diff) | |
| download | samba-cc6e2b8a819c6a1da4e6214be9607aab2de270bb.tar.gz samba-cc6e2b8a819c6a1da4e6214be9607aab2de270bb.tar.bz2 samba-cc6e2b8a819c6a1da4e6214be9607aab2de270bb.zip | |
s4-python: Fix formatting, import of FLG_NOSYNC.
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/ldb/pyldb.c | 9 | ||||
| -rw-r--r-- | source4/scripting/python/samba/__init__.py | 2 | ||||
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c index 737d3fbdff..ce149ccd95 100644 --- a/source4/lib/ldb/pyldb.c +++ b/source4/lib/ldb/pyldb.c @@ -2579,11 +2579,10 @@ void initldb(void) PyModule_AddObject(m, "ERR_AFFECTS_MULTIPLE_DSAS", PyInt_FromLong(LDB_ERR_AFFECTS_MULTIPLE_DSAS)); PyModule_AddObject(m, "ERR_OTHER", PyInt_FromLong(LDB_ERR_OTHER)); - PyModule_AddObject(m, "FLG_RDONLY", PyInt_FromLong(LDB_FLG_RDONLY)); - PyModule_AddObject(m, "FLG_NOSYNC", PyInt_FromLong(LDB_FLG_NOSYNC)); - PyModule_AddObject(m, "FLG_RECONNECT", PyInt_FromLong(LDB_FLG_RECONNECT)); - PyModule_AddObject(m, "FLG_NOMMAP", PyInt_FromLong(LDB_FLG_NOMMAP)); - + PyModule_AddObject(m, "FLG_RDONLY", PyInt_FromLong(LDB_FLG_RDONLY)); + PyModule_AddObject(m, "FLG_NOSYNC", PyInt_FromLong(LDB_FLG_NOSYNC)); + PyModule_AddObject(m, "FLG_RECONNECT", PyInt_FromLong(LDB_FLG_RECONNECT)); + PyModule_AddObject(m, "FLG_NOMMAP", PyInt_FromLong(LDB_FLG_NOMMAP)); PyModule_AddObject(m, "__docformat__", PyString_FromString("restructuredText")); diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py index fc369290f9..a513541da8 100644 --- a/source4/scripting/python/samba/__init__.py +++ b/source4/scripting/python/samba/__init__.py @@ -103,7 +103,7 @@ class Ldb(_Ldb): if lp is not None: nosync_p = lp.get("nosync", "ldb") if nosync_p is not None and nosync_p == True: - flags |= FLG_NOSYNC + flags |= ldb.FLG_NOSYNC self.set_create_perms() diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index eb89ee9f3a..71c04cfef9 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -493,13 +493,13 @@ def setup_name_mappings(samdb, idmap, sid, domaindn, root_uid, nobody_uid, :param nobody_uid: uid of the UNIX nobody user. :param users_gid: gid of the UNIX users group. :param wheel_gid: gid of the UNIX wheel group.""" - idmap.setup_name_mapping("S-1-5-7", idmap.TYPE_UID, nobody_uid) idmap.setup_name_mapping("S-1-5-32-544", idmap.TYPE_GID, wheel_gid) idmap.setup_name_mapping(sid + "-500", idmap.TYPE_UID, root_uid) idmap.setup_name_mapping(sid + "-513", idmap.TYPE_GID, users_gid) + def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info, provision_backend, names, schema, serverrole, |