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

268 Commits

Author SHA1 Message Date
Andrew Bartlett
5f11615810 s4-s3-upgrade: Give a better clue when we cannot open secrets.tdb
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-10-18 13:13:31 +11:00
Matthieu Patou
a1767f74af s4: check that the xattr are supported in the folder where we want to provision
By default we were checking this on the default folder for
tempfile.NamedTemporaryFile (usualy /tmp) but this folder can be mounted
on tmpfs (which didn't support xattr currently). Now we should check on
the filesystem where the provision will be done.
2011-10-16 00:01:36 +02:00
Jelmer Vernooij
37a4bcd28b samba-tool: Add test to make sure all commands have a synopsis set. 2011-10-14 00:22:57 +02:00
Jelmer Vernooij
9e1ef61b34 samba-tool: Move main command implementation to samba.netcmd.main, so it is accessible by the testsuite. 2011-10-14 00:22:57 +02:00
Jelmer Vernooij
9213f398ad samba-tool: Don't require full prog line to be in synopsis. 2011-10-14 00:22:57 +02:00
Jelmer Vernooij
b5d5945801 samba.netcmd: Reintroduce Command.name. 2011-10-14 00:22:57 +02:00
Jelmer Vernooij
be7a75b29a samba-tool: Determine long option from docstring. 2011-10-14 00:22:56 +02:00
Jelmer Vernooij
60de9b7bbf creds: Remove unnecessary calls to credopts.get_credentials. 2011-10-14 00:22:56 +02:00
Jelmer Vernooij
36e3c15f54 python: Remove extra newlines. 2011-10-14 00:22:56 +02:00
Jelmer Vernooij
88d997a63e samba-tool: Use self.outf in a few more places.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Thu Oct 13 05:06:52 CEST 2011 on sn-devel-104
2011-10-13 05:06:52 +02:00
Jelmer Vernooij
0e70e26d92 samba-tool delegation: Use self.outf, simplify some code. 2011-10-13 03:33:21 +02:00
Jelmer Vernooij
6f9a3177d4 netcmd: Add Command.get_logger() method. 2011-10-13 00:23:39 +02:00
Jelmer Vernooij
63c9186e92 netcmd: Add errf stream to command instances. 2011-10-13 00:23:39 +02:00
Jelmer Vernooij
fba4b7a5b9 samba-tool/testparm: Fix traceback when checking client name/ip against hosts allowed. 2011-10-13 00:23:39 +02:00
Jelmer Vernooij
ba5b8a1056 samba-tool/testparm: Fix handling of command-line options. 2011-10-13 00:23:39 +02:00
Jelmer Vernooij
d7d5858b74 netcmd/domain: Remove unused imports. 2011-10-08 22:28:25 +02:00
Jelmer Vernooij
8111001977 netcmd: Avoid catching all exceptions, avoid using ';' at the end of lines.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sat Oct  8 15:46:46 CEST 2011 on sn-devel-104
2011-10-08 15:46:46 +02:00
Andrew Tridgell
2fbdaab331 samba-tool: cope with GC compares in ldapcmp
the two base DNs do not need to match when doing GC replica compares
2011-10-04 15:08:56 +11:00
Andrew Tridgell
aed0d2e5eb samba-tool: added --full-sync and --sync-all options to samba-tool drs replicate 2011-10-04 15:08:56 +11:00
Andrew Tridgell
0921e75001 s4-dbcheck: fixed transaction nesting in dbcheck
ensure we don't cancel a transaction we didn't start

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Thu Sep 22 03:39:59 CEST 2011 on sn-devel-104
2011-09-22 03:39:59 +02:00
Andrew Tridgell
966b5d5de2 pyldb: fixed places where we try to concatenate a Dn with a string
you need to either use str(dn) or use %s in a format string
2011-09-19 10:57:03 +10:00
Andrew Tridgell
579fd43057 samba-tool: use get_config_basedn() to get configuration NC DN
this allows these commands to work for subdomains

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-09-19 10:57:03 +10:00
Matthias Dieter Wallnöfer
4117c29138 s4:upgrade_from_s3 - old s3 versions < 3.4.x don't have a "state directory" param
Hence the "lock directory" path has to be used instead.

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Fri Sep 16 00:07:30 CEST 2011 on sn-devel-104
2011-09-16 00:07:30 +02:00
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
762102f054 testparm.py: Use standard formatting of header. 2011-09-13 02:24:03 +02:00
Jelmer Vernooij
62670d43b8 group.py: Remove tab characters. 2011-09-13 02:24:03 +02:00
Jelmer Vernooij
375a92c302 drs.py: Remove tab characters. 2011-09-13 02:24:03 +02:00
Jelmer Vernooij
4c7acab5fc domain.py: Remove tab characters. 2011-09-13 02:24:03 +02:00
Jelmer Vernooij
dc26067a6f delegation.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
Amitay Isaacs
46754e9665 samba-tool: epilog option to OptionParser available in python >= 2.6
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:05 +10:00
Amitay Isaacs
4d0ead86e1 samba-tool: Provide feedback if synopsis is not defined for a command
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:05 +10:00
Amitay Isaacs
e9f155f52d samba-tool: max() with key option is available in python >= 2.6
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:04 +10:00
Giampaolo Lauria
abd7368e76 samba-tool: Fixed "ldapcmp" command synopsis
Fixed "ldapcmp" command syntax

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:04 +10:00
Giampaolo Lauria
342146e0b4 samba-tool: Fixed "dbcheck" subcommand syntax
Fixed syntax for "dbcheck" subcommand

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:04 +10:00
Giampaolo Lauria
69a2e4b360 samba-tool: Moved _get_user_realm_domain fcn to common
_get_user_realm_domain is used by both delegation and spn commands

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:04 +10:00
Giampaolo Lauria
f4f77bb954 samba-tool: Fixed "testparm" syntax
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:04 +10:00
Giampaolo Lauria
dd3ebbffe8 samba-tool: Fixed "user" command syntax
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:04 +10:00
Giampaolo Lauria
59caf70824 samba-tool: Fixed "rodc" syntax
Remove options from syntax to be consistent w/ the rest of commands

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:03 +10:00
Giampaolo Lauria
4f26c52614 samba-tool: Fixed "ntacl" subcommands syntax
Removed options from 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
Giampaolo Lauria
87a6102c62 samba-tool: Fixed "group" 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
Giampaolo Lauria
4bf1bcfaeb samba-tool: Fixed "dsacl" command syntax
Removed option from syntax to be consistent w/ the rest of commands

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:03 +10:00
Giampaolo Lauria
54aa286b9a samba-tool: Fixed "drs" 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
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
Giampaolo Lauria
de8e47a4e3 samba-tool: Fixed "spn" command syntax
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:02 +10:00
Giampaolo Lauria
8a6f3fc3b4 samba-tool: Fixed "delegation" command syntax
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:02 +10:00