1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-14 19:24:43 +03:00

2439 Commits

Author SHA1 Message Date
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
Andrew Tridgell
8dda0ef57f samba-tool: fixed binary encoding of usernames in setpassword
Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-07-29 18:17:44 +10:00
Andrew Tridgell
427805b87a samba-tool: ensure prompting of passwords is in the right order
ask the creds object for the password before prompting for the new
password in the user password change code, to ensure the user is asked
for the old password first

Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Thu Jul 28 08:35:45 CEST 2011 on sn-devel-104
2011-07-28 08:35:45 +02:00
Amitay Isaacs
2b6ea7975b samba-tool: Added gpo fetch command implementation using python smb module.
To copy the GPO files, use libcli python interface list() to get directory
listing and loadfile() to read the contents of the file.

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-28 15:20:54 +10:00
Amitay Isaacs
d6db6614dd samba-tool: Change samba-tool gpo semantics (use gpo name instead of dn)
Instead of using gpo dn as the key to refer to a gpo, use the gpo name
as the key.

If no URL is specified (-H option), find a writable DC and use that.

Extract a commonly used method as get_gpo_info() to find details of a GPO.

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-28 15:20:54 +10:00
Amitay Isaacs
9e7d8edc06 samba-tool: Add user password command to change user's own password
This command is a user-level command and differs from setpassword
command which is administrator command.

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-28 15:20:53 +10:00
Amitay Isaacs
d885280818 samba-tool: Python routine to find writable/ldap-capable DC
Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-28 15:20:53 +10:00
Amitay Isaacs
48d905f281 samba-tool: Catch exceptions at top-level and exit with correct return value
Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-28 15:20:52 +10:00
Amitay Isaacs
e79040cc72 samba-tool: Display usage for main commands and list them alphabetically
This makes the MainCommand class similar to SuperCommand class in netcmd.

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-28 15:20:52 +10:00
Amitay Isaacs
1a444004dd samba-tool: Raise exception on errors and report using base class
Exceptions are captured at top-level samba-tool and reported using
the base class (Command) method show_command_error().

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-28 15:20:52 +10:00
Amitay Isaacs
d4c1149e3e samba-tool: Display Usage line and list commands alphabetically
Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-28 15:20:52 +10:00
Amitay Isaacs
02667cbe26 samba-tool: Replace C version of samba-tool with python version
C version of samba-tool is now called samba-tool-c, which will be
removed as soon as all the samba-tool commands are ported to python.

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-28 15:20:52 +10:00
Amitay Isaacs
35747fe6f0 samba-tool: Added python version of samba-tool
Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-28 15:20:52 +10:00
Amitay Isaacs
e74661066b samba-tool: Reimplement GPO functions in python
Implementation of subcommands - show, getlink, setlink, dellink,
getinheritance, setinheritance

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-28 15:20:51 +10:00
Giampaolo Lauria
8de3f98ef2 samba-tool: Removed newuser
Removed newuser as its functionality has been moved to "user add"

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-28 15:20:51 +10:00
Giampaolo Lauria
31ade9c122 samba-tool: Changed "user add" implementation
Changed "user add" to use SamDB instead of Net
Also, added the set of Options available in newuser

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-28 15:20:51 +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
Matthieu Patou
5f1f153998 s4-upgradeprovision: Detect recent provision in a more reliable way 2011-07-26 23:34:24 +02:00
Stefan Metzmacher
14d5983d4d s4:samba-tool: ldapcmp needs CredentialsOptionsDouble
metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Tue Jul 26 17:09:32 CEST 2011 on sn-devel-104
2011-07-26 17:09:32 +02:00
Jelmer Vernooij
845d5add3c scripting/bin: Some formatting fixes. 2011-07-23 22:08:08 +02:00
Björn Baumbach
bed50f04cb s4-param: use "state directory" and "cache directory" options
instead of "state dir" and "cache dir" in order be compatible
with the source3 code.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-07-21 08:51:54 +02:00
Andrew Tridgell
7f9d45bf10 samba-tool: make sure we exit with an error on a bad command
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Thu Jul 21 04:58:01 CEST 2011 on sn-devel-104
2011-07-21 04:58:01 +02:00
Andrew Tridgell
e593939da1 samba-tool: fixed some more calls to samba_tool join to be 'domain join' 2011-07-21 11:44:38 +10:00
Andrew Tridgell
6257994848 dbcheck: use string DN in delete when fixing broken strings DNs
this prevents the extended_dn_in module from 'fixing' the DN for us

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-07-21 11:44:37 +10:00
Andrew Tridgell
a656b189b8 s4-provision: run dbcheck on a minimal set of objects in provision
this speeds up the dbcheck in provision to fix only the objects that
we know will need fixing

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-07-21 11:44:36 +10:00
Matthieu Patou
9117a2fa3c samba_backup: check that directory really exists 2011-07-21 11:44:35 +10:00
Andrew Tridgell
76b165778d s4-dsdb: change the samba3sam test to add the show_deleted module
this is needed now that the samldb module adds the show deleted
control

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-07-21 11:44:34 +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
bfd94a1515 samba-tool: testparm doesn't take any credentials
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
6e7b8aaf1d samba-tool: Fix __doc_ in base classes
Changed prog to samba-tool as prog is only meaningful in Parser

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 11:44:31 +10:00
Giampaolo Lauria
5f5eb1b003 samba-tool: removed synopsis code in base class
As it is not always possible to determine the usage of a command solely based on the list of required and optional args, it is best
to have the subclasses always define it, rather than displaying an incorrect usage statement. Currently, all commands are subclassing the synopsis.

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 11:44:31 +10:00
Giampaolo Lauria
452e50919e samba-tool: Fixed bugs to determine min and max # of allowed arguments
Fixed the bugs in the code to determine both the min and the max # of allowed arguments
Changed the argument suffix convention from "*" to "+" to represent one or more arguments as:
 1. It follows the Regular expression convention ("*" means 0 or more)
 2. It is what was missing in terms of functionality
NB Currently, no command is using the "*/+", but it is a good thing to have to help out the validation of the args if/when in the future
we have such need

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 11:44:31 +10:00
Giampaolo Lauria
f03a059814 samba-tool: Improved --help functionality
Added a new --help msg
Return an error when no subcommand is specified

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 11:44:30 +10:00
Giampaolo Lauria
a2e2c130b0 samba-tool: fixed __doc__ in base classes
Replaced the "net" word with %prog in all instances

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 11:44:30 +10:00
Giampaolo Lauria
903ec440c4 samba-tool: Fix error handling in SuperCommand class
Created show_command_error method to handle errors in SuperCommand
Removed statement in SuperCommand to raise exception

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 11:44:30 +10:00
Giampaolo Lauria
8e0a860561 samba-tool: improved Option list for all user commands
Added metavar values for -H and added some default values for other options

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 11:44:30 +10:00
Giampaolo Lauria
7c8b53a49e samba-tool: added error handling for the user command
Caught exception whenever possible, added new check for newpassword to make sure it contains some chars

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 11:44:30 +10:00
Giampaolo Lauria
a10e231b3b samba-tool: fixed drs commands synopsis
Added [options] as needed

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 11:44:29 +10:00
Giampaolo Lauria
f1a079f8dd samba-tool: fixed synopsis on user commands
Fixed all synopsis to contain [options], filter, and username

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 10:32:24 +10:00
Giampaolo Lauria
c9bf7022fd samba-tool: fixed synopsis on all "user" commands
Added [options] where needed, fixed others where filter or username was needed, renamed name to username

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 10:32:24 +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
1dfcb019d2 samba-tool: removed the assignment to parser.prog
The prog should only be set if we want it to be different than the name of the program that executed it. I think that for better portability we should not set it and let it default to samba-tool.

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 10:32:24 +10:00
Giampaolo Lauria
35d534b026 samba-tool: fixed prog name in samba-tool
Changed the prog name from net to samba-tool so that the usage statement is now correct

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 10:32:24 +10:00
Giampaolo Lauria
df6fae2f13 samba-tool: update vampire.py message
The update was necessary to reflect the move from join to domain join as part of the object-action work

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 10:32:24 +10:00
Giampaolo Lauria
b8b20f7a46 samba-tool: removed join as it has been replaced by 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
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
8f274af3f8 samba-tool: removed export as it has been moved to domain dumpkeys
The functionality of export has been moved to domain dumpkeys to fit the object-action model

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-21 10:32:23 +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
0cef2bff9c samba-tool: removed domainlevel as it has been moved to domain level
The functionality of domainlevel has been moved the "domain level" to fit the object-action model

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