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

50 Commits

Author SHA1 Message Date
Björn Baumbach
ea27879dd0 s4-scripting: samba-tool: Fix domain info usage message
Signed-off-by: Michael Adam <obnox@samba.org>
2012-02-16 12:07:32 +01:00
Jelmer Vernooij
f2903e0c4f provision: Make sure target directory is created early.
This is necessary when using the target directory to store temporary
files.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Tue Feb  7 02:45:37 CET 2012 on sn-devel-104
2012-02-07 02:45:36 +01:00
Jelmer Vernooij
7c8476b434 samba-tool: Add optiongroups, necessary for 'samba-tool domain ...' 2012-02-07 01:11:08 +01:00
Jelmer Vernooij
a0ff4c349c Revert "samba-tool: moved takes_optiongroups definition to Command base class"
This reverts commit f6fa8684896b8f3f9f8b7bd3742c99906973274c.

This keeps the main command class fairly slim, and makes it a bit
more obvious where the arguments to run() are coming from.

Conflicts:

	source4/scripting/python/samba/netcmd/__init__.py
	source4/scripting/python/samba/netcmd/domain.py
	source4/scripting/python/samba/netcmd/gpo.py
	source4/scripting/python/samba/netcmd/newuser.py
	source4/scripting/python/samba/netcmd/testparm.py
	source4/scripting/python/samba/netcmd/user.py
	source4/scripting/python/samba/tests/samba_tool/__init__.py
2012-02-07 01:11:08 +01:00
Horacio G. de Oro
fa0c2ab5c5 Use named argument 'dir' instead of 'prefix' on NamedTemporaryFile for domain.py
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
2012-02-07 01:11:07 +01:00
Amitay Isaacs
1f0298dd1b python: Change except: statement to except Exception:
This way we only catch true exceptions and keyboard interrupts
are not caught here.

Autobuild-User: Amitay Isaacs <amitay@samba.org>
Autobuild-Date: Tue Jan 24 03:32:40 CET 2012 on sn-devel-104
2012-01-24 03:32:40 +01:00
Matthieu Patou
a8c89fa7d2 samba-tool: refuse to demote if the current DC has still roles 2011-12-05 18:23:07 +01:00
Matthieu Patou
f44e1a753a samba-tool: add a function to cleanly demote a DC
samba-tool domain demote allow the local DC to properly demote against
Microsoft and Samba DC.
2011-12-05 18:23:07 +01:00
Stefan Metzmacher
f9f261cb60 s4:python: add --machinepass option to 'samba-tool domain join'
metze
2011-11-29 09:21:25 +01:00
Andrew Bartlett
2bff209128 s4-samba-tool: Add --principal argument to samba-tool domain exportkeytab
This allows only a particular principal to be exported to the keytab.
This is useful when setting up unix servers in a Samba controlled
domain.

Based on a request by Gémes Géza <geza@kzsdabas.hu>

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue Nov 29 09:20:55 CET 2011 on sn-devel-104
2011-11-29 09:20:54 +01:00
Matthias Dieter Wallnöfer
f57f009bc6 samba-tool: domain info - add basic exception handling
It is nicer to get an error message rather than a stacktrace on wrong IP
addresses.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-11-27 12:51:57 +01:00
Matthieu Patou
08ca7d1634 samba-tool: add a domain info command to get basic info
Signed-off-by: Matthias Dieter Wallnöfer <mdw@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-11-27 12:51:56 +01:00
Amitay Isaacs
244ecc844d s4-s3-upgrade: Add --verbose option to print extra details 2011-11-18 14:38:28 +11:00
Amitay Isaacs
6a2a2dfa5f samba-tool: Fix the domain account policy max_pwd_age calculation
Windows sets maxPwdAge to -0x8000000000000000 when maximum password
age is set to 0 days.
2011-11-18 14:38:27 +11:00
Giampaolo Lauria
f057cb4f84 samba-tool: Remove "domain machinepassword" command
As per Andrew Bartlett's comment:
"we should remove it.  This was originally a script to support some
interactions between samba3 and samba4, when they were in distinct build
systems.  We now can call between the two systems without difficulty at
runtime, so this command has no value."

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
2011-11-15 11:12:07 +11:00
Jelmer Vernooij
c529c12c7d upgrade: use logger.warning. 2011-11-13 18:06:06 +01:00
Giampaolo Lauria
da21ff82a5 samba-tool: Change internal argument name in domain machinepassword 2011-11-10 14:24:21 +11:00
Giampaolo Lauria
53fc437d05 samba-tool: Fix domain machinepassword secret db search
pair programmed with Jelmer Vernooij
Add search to include secrets.ldb
2011-11-10 14:24:21 +11:00
Giampaolo Lauria
ec5afae292 samba-tool: Fix domain machinepassword name search
Append '$' to name provided by user to search for a machine account
when necessary
2011-11-10 14:24:21 +11:00
Giampaolo Lauria
fe6913ada3 samba-tool: Fix short description and error msgs in domain level
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Thu Nov  3 16:53:16 CET 2011 on sn-devel-104
2011-11-03 16:53:16 +01:00
Giampaolo Lauria
64e7e448fb samba-tool: Fix --quiet option in domain samba3upgrade
--quiet option does not require an argument
2011-11-03 15:12:27 +01:00
Andrew Bartlett
43f23b55c4 s4-s3-upgrade rename samba-tool domain samba3upgrade --libdir to --dbdir for clarity
The things pointed at are not typically in a directory called lib,
so avoid confusing our administrators.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Wed Oct 19 15:43:04 CEST 2011 on sn-devel-104
2011-10-19 15:43:04 +02:00
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
9213f398ad samba-tool: Don't require full prog line to be in synopsis. 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
6f9a3177d4 netcmd: Add Command.get_logger() method. 2011-10-13 00:23:39 +02:00
Jelmer Vernooij
d7d5858b74 netcmd/domain: Remove unused imports. 2011-10-08 22:28:25 +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
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