1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00

1176 Commits

Author SHA1 Message Date
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
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
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 1cbce84683ef4fa49b85d87988c5e8db7057530a.
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 f8275bae5d7b471967be7222170d049c18b8882f.
Wrong assumption about a segmentation fault.
2011-01-05 16:14:14 +02: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
Anatoliy Atanasov
f8275bae5d s4/ldapcmp: Check if creds2 is actualy set by the command line
When parsing the command line for the second set of credentials
the parser returns wrong user if the second set of parameters isn't set.
So check if the password is set instead.

Autobuild-User: Anatoliy Atanasov <anatoliy.atanasov@postpath.com>
Autobuild-Date: Tue Jan  4 18:11:26 CET 2011 on sn-devel-104
2011-01-04 18:11:26 +01:00
Anatoliy Atanasov
1cbce84683 s4/ldapcmp: Fix the parsing of the second set of credentials
We need this second set of credentials so we can do comparison
between DCs in two different domains.

Autobuild-User: Anatoliy Atanasov <anatoliy.atanasov@postpath.com>
Autobuild-Date: Tue Jan  4 16:36:06 CET 2011 on sn-devel-104
2011-01-04 16:36:06 +01:00
Jelmer Vernooij
d107e959b7 pyglue: Add prototype for init function. 2010-12-18 02:20:21 +01:00
Jelmer Vernooij
186c3474c4 join: Properly cancel transaction on exceptions. 2010-12-15 16:40:59 +01:00
Jelmer Vernooij
f98d9e06cf Move get_loadparm() and get_credentials() to samba.tests.TestCase. 2010-12-15 14:57:43 +01:00
Matthias Dieter Wallnöfer
4c373d2013 s4:scripting/python/pyglue.c - add a OOM handling
Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Sun Dec 12 20:50:55 CET 2010 on sn-devel-104
2010-12-12 20:50:55 +01:00
Matthias Dieter Wallnöfer
13da83be60 s4:scripting/python/pyglue.c - optimise includes 2010-12-12 20:06:24 +01:00
Nadezhda Ivanova
c5480e659e s4-tests: Moved some commonly redefined security descriptor methods to a utils class
These methods are used in more than one testsuite now so they are now in a utility class instead of being defined everywhere.
2010-12-10 10:19:25 +01:00
Jelmer Vernooij
10441ed83d subunitrun: Use unittest.TestProgram if subunit.TestProgram is not
available.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Fri Dec 10 03:49:03 CET 2010 on sn-devel-104
2010-12-10 03:49:03 +01:00
Jelmer Vernooij
636d8cfb42 s4-python: Add convenience function for forcibly importing bundled
package.
2010-12-10 03:04:06 +01:00
Jelmer Vernooij
408a99e3bb s4-python: Fix use of bundled modules. 2010-12-10 03:04:06 +01:00
Jelmer Vernooij
4571b94e7b s4-python: Split up ensure_external_module. 2010-12-10 03:04:06 +01:00
Matthieu Patou
2771266def build: do not duplicate the checks for python in samba4
Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Thu Dec  9 00:47:23 CET 2010 on sn-devel-104
2010-12-09 00:47:23 +01:00
Andrew Tridgell
545932fda5 samba-tools: more reasonable defaults for samba-tool commands
- fallback to machine account where possible

- default to local hostname where this is reasonable
2010-12-08 05:26:05 +01:00
Andrew Tridgell
249afc8906 samba-tools: export doesn't need any credentials
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2010-12-08 05:26:05 +01:00
Andrew Bartlett
d7cd2ad438 s4-provision Always run slaptest to convert the config file
If the directory exists, it does not mean that it is configured - we
may be on a re-run of the provision.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Wed Dec  8 05:19:12 CET 2010 on sn-devel-104
2010-12-08 05:19:12 +01:00
Andrew Bartlett
87e2d68305 s4-provision Add an invalid names check for 'domain == netbiosname'
(This is also invalid)

Andrew Bartlett
2010-12-08 14:15:37 +11:00
Jelmer Vernooij
71671a84bb s4-python: Add more module docstrings. 2010-12-05 17:27:05 +01:00
Jelmer Vernooij
52d64c53b9 s4-python: Add some more module docstrings. 2010-12-05 17:27:05 +01:00
Matthias Dieter Wallnöfer
573389c8cc s4:password_hash LDB module - allow empty ("") passwords
This seems to have been broken some time ago - till someone on the
mailing list noticed it.

I've also added a testsuite (and some additional SamDB python helpers) which
should prove this.
2010-12-02 11:51:06 +01:00