1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Commit Graph

2238 Commits

Author SHA1 Message Date
Andrew Tridgell
949427c208 python: use os.environ[] instead of os.putenv()
using os.putenv() causes too much confusion, as it doesn't update
os.getenv()

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-02-22 02:51:10 +01:00
Matthias Dieter Wallnöfer
5135e40277 s4:scripting/python/modules.[ch] - explicitly say that "py_update_path" takes no argument
This quiets some build warnings.

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Mon Feb 21 14:42:00 CET 2011 on sn-devel-104
2011-02-21 14:42:00 +01:00
Matthieu Patou
6d48a6ddb3 s4-unittests: replace assertEquals(res, []) by assertEquals(len(res), 0) 2011-02-21 10:55:59 +03:00
Kamen Mazdrashki
bfb0adf0b4 s4/samba.tests: Raise BlackboxProcessError exception in case check_output method fails
This way the caller gets the chance to receive STDOUT and STDERR for
a failed process.
We may use this info to check if a process has failed properly,
e.g. with expected output
2011-02-20 23:13:12 +02:00
Kamen Mazdrashki
348295bf8a s4/samba.tests: Extend CalledProcessError class to store STDOUT and STDERR for a failed rocess call 2011-02-20 23:13:11 +02:00
Matthias Dieter Wallnöfer
aa3f749575 s4:scripting/python/modules.c - remove a really unnecessary variable
Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Thu Feb 17 16:01:44 CET 2011 on sn-devel-104
2011-02-17 16:01:44 +01:00
Stefan Metzmacher
b423d83729 s4:ldapcmp: cope with range retrivals of multivalued attributes
A Windows Server returns a 'member;range=0-1499' attribute
with the first 1500 values of the 'member' attribute.

The client can do a BASE search on the given object
and ask for the 'member;range=1500-*' attribute.
It needs to loop until the high part of the returned
range is '*'.

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Feb 14 16:26:46 CET 2011 on sn-devel-104
2011-02-14 16:26:46 +01:00
Michael Wood
877e0ef5f2 s4/upgradeprovision: Fix help for --debugguess.
Signed-off-by: Matthieu Patou <mat@matws.net>

Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Sun Feb 13 16:38:13 CET 2011 on sn-devel-104
2011-02-13 16:38:13 +01:00
Michael Wood
249ba1ed11 s4/upgradeprovision: Typo and better word.
Signed-off-by: Matthieu Patou <mat@matws.net>
2011-02-13 17:49:01 +03:00
Michael Wood
7db5c10f1a s4: samba_backup: Fix typos.
Signed-off-by: Matthieu Patou <mat@matws.net>
2011-02-13 17:45:05 +03:00
Nadezhda Ivanova
a38d04a7a8 s4-tools: Added --sddl option, which allows the user to add an ACE to an object's security descriptor in SDDL format
Useful for testing purposes.

Autobuild-User: Nadezhda Ivanova <nivanova@samba.org>
Autobuild-Date: Thu Feb 10 15:28:04 CET 2011 on sn-devel-104
2011-02-10 15:28:04 +01:00
Kamen Mazdrashki
4d058ca7c0 s4/tests: Implement a blackbox test for 'samba-tool drs' command
Autobuild-User: Kamen Mazdrashki <kamenim@samba.org>
Autobuild-Date: Wed Feb  9 11:45:30 CET 2011 on sn-devel-104
2011-02-09 11:45:30 +01:00
Kamen Mazdrashki
099644f0a7 s4/tests: Move command line processing into separate method to be reused 2011-02-09 11:57:13 +02:00
Kamen Mazdrashki
6b1574636a s4/tests: Implement BlackboxTestCase.check_output() method
I am going to need this to check if output is OK (kind of)
2011-02-09 11:57:13 +02:00
Kamen Mazdrashki
d0867e5c6c s4/samba-tool/drs: Make use of Command.message() method instead of using 'print' 2011-02-09 11:57:12 +02:00
Kamen Mazdrashki
ad48c70db6 s4/samba-tool/drs: Move get_dsServiceName function at module level to be re-used 2011-02-09 11:57:12 +02:00
Kamen Mazdrashki
f3db67e14f s4/samba-tool: 'drs options' command implementation
Current implementation handle only one flag change per call
2011-02-09 11:57:11 +02:00
Andrew Tridgell
1f533bff17 s4-provision: added setup_path() import in two more places
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-02-07 13:22:02 +11:00
Andrew Tridgell
edd8c9ea2a s4-python: get ordering right on python paths
we need to have PYTHONARCHDIR first, as that is where we currently
install. That will minimise problems with upgrades from old installs.

We also don't need to add the path twice if PYTHONDIR is the same as
PYTHONARCHDIR (as happens on debian based systems)

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-02-07 13:22:02 +11:00
Andrew Bartlett
15d0166340 s4-python Don't force "bin" into the python sys.path
This patch uses the fact that dyn_PYTHONDIR and dyn_PYTHONARCHDIR is
now set properly at all times, incluidng for installed and
build-directory binaries.  So we don't need to make assumptions about
bin being magic any more.

Andrew Bartlett
2011-02-07 13:22:02 +11:00
Andrew Bartlett
d1e5a73806 s4-provision Remove setup_path, setup_dir and find_setup_dir
We now have a reliable way to know the current location of the
templates: dyn_SETUPDIR, which is updated for both the in-build and
installed binaries.

This replaces the function arguments and the distributed resolution of
the setup directory with one 'global' function (imported as required).

This also removes the ability to specify an alternate setup directory
on the command line, as this was rarely if ever used and never tested.

Andrew Bartlett
2011-02-07 13:22:01 +11:00
Andrew Tridgell
5d15f28fc1 s4-upgradeprovision: renames need a relax to avoid subtree_rename checks 2011-02-07 13:22:01 +11:00
Andrew Tridgell
9eaca88a35 s4-provision: removed spurious os.chdir() from upgradehelpers.py
this breaks make test with a top level build, and is not needed

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-02-07 13:22:01 +11:00
Andrew Tridgell
b84c0a9ed6 s4-test: fixed ndrdump test for top level build
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-02-07 13:22:01 +11:00
Andrew Tridgell
677f28d8b2 s4-test: fixed setup/ assumption for top level build
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-02-07 13:22:01 +11:00
Andrew Tridgell
b038aca5c8 s4-loadparm: removed "setup directory" option
the correct setup directory is known at both build time and install
time using dyn_SETUPDIR, so we no longer have any need to override it

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-02-07 13:22:00 +11:00
Andrew Tridgell
e7b2e06130 s4-provision: cope with top level directory for provision
to allow for top level 'make test' we need to cope with two in-tree
directory layouts

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-02-07 13:22:00 +11:00
Kamen Mazdrashki
da3a2c68b0 s4/samba-tool: Add --sync-forced flag to 'drs replicate' command
We are going to need this to trigger replication when
inbound replication is disabled for a given DC

Autobuild-User: Kamen Mazdrashki <kamenim@samba.org>
Autobuild-Date: Wed Feb  2 09:03:22 CET 2011 on sn-devel-104
2011-02-02 09:03:22 +01:00
Andrew Bartlett
a3e99356ab s4-waf Don't install any Samba packages into PYTHONDIR
This causes the parts of Samba installed into PYTHONARCHDIR to then be
missed in mixed python/C module namespaces.

Andrew Bartlett
2011-02-02 15:21:13 +11:00
Andrew Bartlett
dbe0b07849 s4-python Remove manipuation of python path from samba module
This manipulation should be done by top level scripts, otherwise we
won't find samba in the first place (and these can be munged correctly
for the install).

Andrew Bartlett
2011-02-02 15:21:13 +11:00
Andrew Bartlett
7faa3be453 s4-python Ensure we add the Samba python path first.
This exact form of the construction is important, and we match on it
in the installation scripts.

Andrew Bartlett
2011-02-02 15:21:12 +11:00
Andrew Bartlett
5d4dc6cbd5 s4-python Remove unused missing.py (used by old build system) 2011-02-02 15:19:03 +11:00
Andrew Tridgell
bc0230be1d pygensec: remove special case handling for None for buffers
always returning a buffer makes life easier for callers

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-01-19 01:35:22 +01:00
Andrew Bartlett
a1e1f02efe s4-gensec Extend python bindings for GENSEC and the associated test
This now tests a real GENSEC exchange, including wrap and unwrap,
using GSSAPI.  Therefore, it now needs to access a KDC.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue Jan 18 11:41:26 CET 2011 on sn-devel-104
2011-01-18 11:41:26 +01:00
Nadezhda Ivanova
622ef6aed8 s4-provision: Fixed owner/group for hard-coded Sites descriptor.
We must not specify explicitly owner and group. As there is a difference between WIN_2003 and WIN_2008, we should let descriptor
module compute the correct default ones. Also removed inherited ACEs, they are ignored during SD creation anyway.

Autobuild-User: Nadezhda Ivanova <nivanova@samba.org>
Autobuild-Date: Mon Jan 17 18:23:24 CET 2011 on sn-devel-104
2011-01-17 18:23:24 +01:00
Nadezhda Ivanova
35d8b80800 s4-tools: Fixed a bug in ldapcmp - DACL was not retrieved correctly if the object had no SACL.
--Pair-Programmed-With: Zahari Zahariev
2011-01-17 17:38:04 +01:00
Nadezhda Ivanova
3ecce7f2ee s4-tools: Added a --sort-aces option to ldapcmp
This option sorts the ACE lists during SD comparison in collision view to make it easier to
determine of a difference is only in ACE order, and if not, where do differences start.

Autobuild-User: Nadezhda Ivanova <nivanova@samba.org>
Autobuild-Date: Mon Jan 17 14:09:09 CET 2011 on sn-devel-104
2011-01-17 14:09:09 +01:00
Jelmer Vernooij
e665fce31c web_server: Display trivial placeholder page if SWAT could not be found.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Mon Jan 17 01:27:10 CET 2011 on sn-devel-104
2011-01-17 01:27:10 +01:00
Jelmer Vernooij
04abf2cc8d web_server: Avoid references to swat. Load samba.web_server instead. 2011-01-17 00:25:42 +01:00
Andrew Tridgell
46a3588d3f waf: use PYTHONARCHDIR for installing python shared libs
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Fri Jan 14 08:19:40 CET 2011 on sn-devel-104
2011-01-14 08:19:39 +01:00
Andrew Tridgell
a0bc538a8f s4-samba-tool: fixed the gpo command to use the right DN for access checks 2011-01-14 16:39:33 +11:00
Andrew Bartlett
29fb42a48b s4-samba_tool Added ACL checking to python GPO management tool 2011-01-14 16:39:32 +11:00
Michael Wood
3a14c97459 s4: upgradeprovision: Improve wording, punctuation
Signed-off-by: Matthieu Patou <mat@matws.net>

Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Sat Jan  8 00:25:08 CET 2011 on sn-devel-104
2011-01-08 00:25:08 +01:00
Zahari Zahariev
6a0a0478ad s4/ldapcmp: Two new options are added to the tool
The new ones are --base and --scope they give us the opportunity to
compare DN subsets of the partitions. Now we are also able to compare
any two objects even if they have different DNs. This is exteremely
helpful when you are after nasty nTSecurityDescriptor bug.

Signed-off-by: Anatoliy Atanasov <anatoliy.atanasov@postpath.com>

Autobuild-User: Anatoliy Atanasov <anatoliy.atanasov@postpath.com>
Autobuild-Date: Fri Jan  7 13:22:26 CET 2011 on sn-devel-104
2011-01-07 13:22:26 +01:00
Jelmer Vernooij
b44fe4e3bb Use new style objects. 2011-01-06 15:21:21 +01:00
Anatoliy Atanasov
c9757371db s4/ldapcmp: Correct fix for creds2
We need to set domain and workstation to creds2 otherwise we get Segfault
because they are not initialized correctly.
2011-01-05 16:16:59 +02:00
Anatoliy Atanasov
2e30897503 Revert "s4/ldapcmp: Fix the parsing of the second set of credentials"
This reverts commit 1cbce84683.
Wrong assumption about a segmentation fault
2011-01-05 16:14:14 +02:00
Anatoliy Atanasov
3f0db2e53b Revert "s4/ldapcmp: Check if creds2 is actualy set by the command line"
This reverts commit f8275bae5d.
Wrong assumption about a segmentation fault.
2011-01-05 16:14:14 +02:00
Jelmer Vernooij
26c8a520f3 upgradeprovision: Fix use of dict.get().
Avoid modifying list while iterating over it.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Wed Jan  5 03:37:35 CET 2011 on sn-devel-104
2011-01-05 03:37:35 +01:00
Jelmer Vernooij
e80b322077 s4-python: Allow setting TEST_DEBUG_LEVEL to override debug level for tests.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Wed Jan  5 01:58:44 CET 2011 on sn-devel-104
2011-01-05 01:58:44 +01:00