1
0
mirror of https://github.com/samba-team/samba.git synced 2025-04-30 18:53:31 +03:00

19 Commits

Author SHA1 Message Date
Andrew Bartlett
c6cf070df0 s4-s3-upgrade Improve samba-tool domain samba3upgrade behaviour
The --realm argument is again optional (the previous code would take the default
from the default smb.conf, not the one specified) and --targetdir is now a
named argument much like it is to provision.

We now test the --testparm option to ensure it behaves the way we expect.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue Sep 13 16:30:31 CEST 2011 on sn-devel-104
2011-09-13 16:30:31 +02:00
Matthias Dieter Wallnöfer
4e87a8419c s4:upgrade_from_s3 - restore "get_testparm_var" method
This has accidentally been removed by commit 8268c2d4e231b05b439bc70331b75342b35daa4e.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-13 14:53:24 +02:00
Andrew Bartlett
6635bb70d3 s4-provision Add initial support for joining as a new subdomain
To do this we need to reorganise a lot of the provision code, so that
we can create the framework for the inbound replicaton of the config
and schema partitions and then add in the new subdomain locally.

Andrew Bartlett
2011-09-13 15:37:11 +10:00
Jelmer Vernooij
4c7acab5fc domain.py: Remove tab characters. 2011-09-13 02:24:03 +02:00
Amitay Isaacs
e223a65b10 samba-tool: Add "domain samba3upgrade" subcommand
Added new command to upgrade from samba3 to samba4.

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-12 20:42:21 +10:00
Matthias Dieter Wallnöfer
6f4264a72e s4:samba-tool/domain.py - rename arguments "domain" -> "domain-level", "forest" -> "forest-level"
This should clarify the scope of them.

Reviewed-by: Jelmer

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Sun Sep 11 20:12:52 CEST 2011 on sn-devel-104
2011-09-11 20:12:52 +02:00
Matthias Dieter Wallnöfer
7e460a04f7 s4:samba-tool/domain.py - restore domain raise functionality
The samba-tool command has accidentally been damaged by commit
2d4988c3d79e501003875cd26b7f9aaa72402b31.

Reviewed-by: Jelmer
2011-09-11 17:33:12 +02:00
Giampaolo Lauria
6a7679cdd4 samba-tool: Fixed "domain" subcommands syntax
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:03 +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
Andrew Tridgell
03f92508ef samba-tool: use ldb.binary_encode() on search expression elements
this allows us to deal with search elements containing characters that
must be escaped in LDAP

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>
2011-07-29 18:17:44 +10:00
Giampaolo Lauria
41f073eb60 samba-tool: add -H or --URL where necessary
To improve consistency, I've made sure all the commands take either a -H
or --URL when specifying a URL

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-28 15:20:51 +10:00
Andrew Tridgell
a8cba72119 samba-tool: nicer error in passwordsettings with no settings
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-07-21 11:44:32 +10:00
Andrew Tridgell
7d399376b8 samba-tool: use 'exportkeytab' instead of 'dumpkeys'
a 'keytab' is a particular format known to administrators, whereas
'keys' is a bit too vague

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-07-21 11:44:31 +10:00
Giampaolo Lauria
f6fa868489 samba-tool: moved takes_optiongroups definition to Command base class
The option groups should be defined at the Command base class level as they are in common across all samba-tool commands.
Major move advantages:
1. more OOP approach
2. enforcing consistency across commands
3. avoiding the need of declaring for every new command

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 10:32:24 +10:00
Giampaolo Lauria
2cca4a44fe samba-tool: moved join to domain join
This is part of the samba-tool work to fit the object-action model

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 10:32:24 +10:00
Giampaolo Lauria
c049b14dc1 samba-tool: moved export to domain dumpkeys
This is part of the samba-tool work to fit the object-action model

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 10:32:23 +10:00
Giampaolo Lauria
2d4988c3d7 samba-tool: moved domainlevel to domain level
This is part of the samba-tool work to fit the object-action model

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 10:32:23 +10:00
Giampaolo Lauria
41b2b7e160 samba-tool: moved machinepw to domain machinepassword
This is part of the samba-tool work to fit the object-action model

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 10:32:23 +10:00
Giampaolo Lauria
e5255f0920 samba-tool: created domain object, moved pwsettings to user passwordsettings
This is part of the samba-tool work to fit the object-action model

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 10:32:22 +10:00