1
0
mirror of https://github.com/samba-team/samba.git synced 2025-04-29 14:50:26 +03:00

1399 Commits

Author SHA1 Message Date
Andrew Tridgell
17fa96b64a s4-samdb: added a few function comments for pydoc
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-09-05 11:19:25 +02:00
Andrew Tridgell
957e1ed2a7 s4-provision: these substitutuons are not used any more
we now create partitions dynamically

Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>
2011-09-05 11:19:25 +02:00
Andrew Bartlett
5422db82e3 s4-s3-upgrade Fix error handling in add_users_to_group 2011-09-05 11:19:25 +02:00
Andrew Bartlett
1316bc4b08 s4-provision handle a number of invalid but real-world upgrade cases
Real world databass have the wrong account flags (U and W at the same time) and have the wrong
group type in group mapping databases.  Cope with these.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Mon Sep  5 04:58:09 CEST 2011 on sn-devel-104
2011-09-05 04:58:09 +02:00
Andrew Bartlett
4a9f5d759f s4-provision Fix type error on existing idmap entries in s3 upgrade
This is already a DN object.

Andrew Bartlett
2011-09-05 11:25:38 +10:00
Andrew Bartlett
3d05a0856f s4-provision Use ProvisioningError and the eadb
The eadb flag tells us to avoid using system extended attributes, typcially if we
are not running as root (ie, in a test environment).

The ProvisioningError class allows us to return failures to the upgrade_from_s3 script
which can then be detected correctly by the selftest framework.

Andrew Bartlett
2011-09-05 11:25:38 +10:00
Andrew Bartlett
389cb93450 s4-provision Allow a missing idmap DB in upgrade.py
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Sun Sep  4 06:34:16 CEST 2011 on sn-devel-104
2011-09-04 06:34:16 +02:00
Andrew Bartlett
329ec81288 s4-provision cope with SID_NAME_WKN_GRP mappings in upgrade.py
Some incorrect LDAP backends have entries with this group type, but
due to the pdb_ldap code, we cannot read the group members, and we
already skip them in add_group_from_mapping_entry().

Andrew Bartlett
2011-09-04 13:00:10 +10:00
Andrew Tridgell
8ab3c843b1 pyldb: added OID_COMPARATOR constants
This also changes the other constants to remove the LDB_ prefix, which
is redundent

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-09-01 15:23:09 +10:00
Andrew Bartlett
607d7c5cdf s4-provision Use samba.dns_name_to_dn 2011-08-26 14:06:07 +02:00
Amitay Isaacs
099b9db404 py-samba3-test: Copy sample database in tempdir before running test
Samba3 python module using passdb api modifies the database files, to
upgrade them to latest version. So copy the sample database before
running tests on it.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Aug 26 07:04:15 CEST 2011 on sn-devel-104
2011-08-26 07:04:15 +02:00
Amitay Isaacs
76ff9bffd8 s3_upgrade: Set lock directory to correct directory
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:07:36 +10:00
Amitay Isaacs
eebb37c9b2 py-samba3-test: Set lock directory to the datadir
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:07:28 +10:00
Amitay Isaacs
d8465f2a91 s3_upgrade: Update commandline options and use updated samba3 python module
upgrade_from_s3 script now requires samba3 configuration file and target
directory for samba4 database. In addition, it either uses --libdir option
or --testparm option to correctly guess the paths for samba3 databases
(private dir and state directory).

Usage: upgrade_from_s3 [options] <configuration_file> <targetdir>

Input arguments are:
  <configuration_file> - path to existing smb.conf
  <targetdir>          - directory in which samba4 database will be created

In addition, specify either samba3 database directory (with --libdir) or
samba3 testparm utility (with --testparm).

Before using passdb interface, initialize s3 loadparm context using
correct path settings for private dir and state directory.

Export account policy from s3 to s4.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:06:33 +10:00
Amitay Isaacs
d2536b3120 py-samba3: Use passdb/param wrapper for samba3 module
Instead of parsing samba3 database files (password, group mapping,
account policy, secrets), use passdb python wrapper.

Similarly for parsing configuration, use samba3 param python wrapper.

Other databases (idmap, registry, wins) are still parsed in python.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:06:33 +10:00
Amitay Isaacs
7f67d7b5ca s3_upgrade: Let python generate backtrace for unknown exceptions
Catch known exceptions only.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:06:32 +10:00
Amitay Isaacs
886203f3bc s3_upgrade: Add document strings for python methods
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:06:32 +10:00
Andrew Tridgell
32c5e3b204 s4-join: fixed DNS hostname
we need the local hostname, not the remote name
2011-08-25 07:39:39 +10:00
Andrew Tridgell
68100e5a21 s4-join: setup DNS forest name on join context 2011-08-25 07:39:39 +10:00
Andrew Tridgell
219271bd15 s4-samdb: added host_dns_name(), domain_dns_name() and forest_dns_name()
these will make it easier to get python code right for multi-domain
support
2011-08-25 07:39:38 +10:00
Andrew Tridgell
53b08bfbdb s4-provision: pass the rootDN into guess_names()
this gets the correct forest DN during provision

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-08-25 07:39:38 +10:00
Andrew Tridgell
2c47f0a845 samba-tool: fixed use of base DNs in ldapcmp
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-08-25 07:39:38 +10:00
Amitay Isaacs
2ecb5003eb s3_upgrade: Set the administrator password on upgrade
In the upgrade process, set the administrator password from the
existing root or administrator account.

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-19 16:35:12 +10:00
Amitay Isaacs
149845fb18 s3_upgrade: Do not add administrator and root accounts from s3 to s4
Need to copy the password from s3 for administrator/root to s4.

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-19 16:35:10 +10:00
Amitay Isaacs
0ffb4e6f6f python-samba3: Secrets file loaded from private dir, not lib dir
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-19 16:35:09 +10:00
Amitay Isaacs
2a3f5c04bd s3upgrade: Add idmap migration, users/groups import
Added users/groups import from s3 using python wrapper for passdb.
Fix idmap entries for users/groups when migrating from s3 idmap.

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-19 16:35:06 +10:00
Amitay Isaacs
dfa1c751c6 provision: Add idmap database handle to the result of provision
It is required in s3_upgrade script to migrate idmap database from s3 to s4.

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-19 16:35:05 +10:00
Amitay Isaacs
57b9f1b502 samba3-python: Add methods to get any entry (user/group) and its sid from idmap
This is required in upgrade_s3 script to migrate idmap database from s3 to s4

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-19 16:35:04 +10:00
Andrew Tridgell
23b1d09a5f samba-tool: changed samba-tool user delete to use samdb instead of Net()
this makes it possible to use with -H, so you can delete users on
remote DCs or against local databases
2011-08-18 09:26:59 +10:00
Andrew Tridgell
75a90a952b s4-samdb: added deleteuser() to samdb
This is similar to deletegroup()
2011-08-18 09:26:59 +10:00
Andrew Bartlett
070b970a9d s4-provision Add support for fixing the DC rid to a particular value
This will allow an upgraded DC to keep its SID, while being upgraded
to AD.  We also watch for the highest RID in the existing DB to set
next_rid for other additional users.

Andrew Bartlett
2011-08-13 20:18:41 +10:00
Amitay Isaacs
305cb567f4 upgrade: Add missing bits for the s3 to s4 upgrade script
Use passdb backend to import/export users

Remove unused options for upgrade_from_s3 command (--blank) and credentials options
Config file is specified with -s/--configfile option and no need to specify as an argument.

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-08-13 20:18:40 +10:00
Amitay Isaacs
9a4a2b0f0d py-samba3: Create samba3 python package to hold other modules
This will include passdb and param.
2011-08-13 12:30:50 +10:00
Andrew Bartlett
93e8d3b381 s4-scripting Rename passdb upgrade routine to avoid conflict with upgradeprovision 2011-08-13 12:30:49 +10:00
Amitay Isaacs
4967b04ada samba-tool: Remove gpo setacl command 2011-08-13 10:25:06 +10:00
Stefan Metzmacher
f34f16f7f8 s3:samba-tool: add --domain-critical-only to "samba-tool domain join"
metze

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-08-12 12:39:05 +02:00
Stefan Metzmacher
5d6b848394 s4:py/samba/join: add domain_critical_only=False to join_DC/join_RODC
metze

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-08-12 12:39:05 +02:00
Stefan Metzmacher
a3f262182a s4:py/samba/drs_utils: pass down req/req_level to self.net.replicate_chunk()
metze

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-08-12 12:39:05 +02:00
Andrew Tridgell
f444eeb51c s4-dbcheck: offer to fix dsServiceName to be in GUID form
this fixes the dsServiceName so it can handle server renames

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-08-12 04:00:07 +02:00
Andrew Tridgell
bb6214d634 s4-join: make dsServiceName a GUID in @ROOTDSE on join
when joining another domain as a DC we should setup our dsServiceName
in @ROOTDSE to be a GUID so we can cope with later server renames

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-08-12 04:00:07 +02:00
Andrew Tridgell
d79ee18f98 s4-provision: create dsServiceName in @ROOTDSE in GUID form
this allows for handling of server renames as the GUID doesn't change

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-08-12 04:00:07 +02:00
Andrew Tridgell
ff58087a3f s4-pysamba: fixed double conversion of int32
if the number is already negative, we shouldn't convert it
2011-08-09 11:56:23 +02:00
Andrew Tridgell
4e4953dd48 s4-samdb: support relative paths in SamDB() connect
don't add the private path unless the database doesn't exist with the
supplied path
2011-08-09 11:56:23 +02:00
Andrew Tridgell
d994ef2056 pysamdb: move normalise_int32() to common module
this will be needed in quite a few places
2011-08-09 11:56:23 +02:00
Stefan Metzmacher
7542d8d03d s4:pyglue: PyArg_ParseTuple("I") requires an 'unsigned int' argument
If we pass variable references we don't get implicit casting!

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Aug  8 18:01:19 CEST 2011 on sn-devel-104
2011-08-08 18:01:19 +02:00
Jelmer Vernooij
24f6eaa8f4 sd_utils: Fix some formatting, add module docstring.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Aug  7 21:07:04 CEST 2011 on sn-devel-104
2011-08-07 21:07:04 +02:00
Stefan Metzmacher
10752c5b5b s4:netcmd/gpo.py: we don't need to set autogenerated attributes
metze
2011-08-06 10:35:40 +02:00
Andrew Tridgell
2331610a2e s4-samdb: save the url in the samdb class
this is useful for debugging, so we know which database we are dealing
with

Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>
2011-08-04 16:17:25 +10:00
Amitay Isaacs
cff7adb7ec samba-tool: Rename samba-tool command gpo2 --> gpo
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-03 14:26:15 +10:00
Amitay Isaacs
7d137f8bda samba-tool: Add implementation of gpo create command
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-03 14:26:09 +10:00