1
0
mirror of https://github.com/samba-team/samba.git synced 2025-06-19 23:17:05 +03:00

414 Commits

Author SHA1 Message Date
Giampaolo Lauria
1a6a626a45 samba-tool: Changed fsmo implementation
Changed fsmo code to fit the object <action> model

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:01 +10:00
Giampaolo Lauria
ca30b9ff3e samba-tool: Expanded acronym descriptions
Expanded command acronym descriptions
Added footnote for "server connection needed"

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:01 +10:00
Giampaolo Lauria
ef01932fdb samba-tool: Formatted subcommand list output
Formatted output of subcommand list to be a function of the
max number of chars in the longest string

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:01 +10:00
Giampaolo Lauria
fb5e27e4c8 samba-tool: Moved command definition to sambatool command
Moved subcommand definition from __init__.py to cmd_sambatool class

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:01 +10:00
Giampaolo Lauria
e309c782ba samba-tool: Add long_description and epilog to Command class
long_description and epilog should now be defined for each command.
Their string value will be printed whenever the user invokes the
command w/ the -h or --help
long_desciption will be printed after the usage statement.
epilog will be printed after the options are defined

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:01 +10:00
Giampaolo Lauria
f5e173284a samba-tool: Redefined samba-tool as a SuperCommand
Removed MainCommand class as samba-tool is a SuperCommand
Redefined samba-tool as a SuperCommand
Fixed error handling in SuperCommand _run

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:01 +10:00
Giampaolo Lauria
02650acac3 samba-tool: Removed SuperCommand usage method
Removed usage method as it is not being used anywhere

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:00 +10:00
Giampaolo Lauria
0f580c0705 samba-tool: Removed attribute name from Command class
Removed name as it is not used anywhere
Moved all the attributes on top of the class declaration

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:00 +10:00
Amitay Isaacs
47f7e3c525 samba-tool: Add --filter option to ldapcmp to ignore specified attributes 2011-09-07 12:16:40 +02: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
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
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
10752c5b5b s4:netcmd/gpo.py: we don't need to set autogenerated attributes
metze
2011-08-06 10:35:40 +02: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
Amitay Isaacs
fb798d35df samba-tool: Add functions to create directories and copy files over SMB share
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-03 14:26:07 +10:00
Amitay Isaacs
c670465c23 samba-tool: Rename copy_directory_recurse to copy_directory_remote_to_local
gpo fetch is remote->local and gpo create is local->remote
local is local filesystem and remote is smb share.
Need two functions to copy local->remote and remote->local.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-03 14:25:55 +10:00
Amitay Isaacs
1e3667934b samba-tool: Addd functions to print GPO flags and GPlink options
Use methods from python wrapper to convert gpo flags and gplink
options to string.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-03 14:25:53 +10:00
Jelmer Vernooij
6eb496cf45 dbcheck: Cancel transaction if operation fails.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Tue Aug  2 01:41:07 CEST 2011 on sn-devel-104
2011-08-02 01:41:07 +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
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
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
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
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
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
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