1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-15 23:24:37 +03:00

94 Commits

Author SHA1 Message Date
Jelmer Vernooij
e3d000f3bf Some more PEP improvements.
(This used to be commit 015ca850df9b4c8112b033130023909b1d0b78b7)
2008-05-23 16:29:08 +02:00
Jelmer Vernooij
cceac63aaa Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-wsgi
Conflicts:

	source/scripting/python/samba/provision.py
(This used to be commit d27de633656f8a699222df77c4c58326890889a2)
2008-05-23 16:24:07 +02:00
Jelmer Vernooij
c401aa9357 Use restructuredText formatting for docstrings.
(This used to be commit 0cc58decd74d20f3d7dff93ddef1c8bce4d49ad0)
2008-05-23 00:37:22 +02:00
Andrew Kroeger
bf3f3af926 provision: Generate krb5.conf template separate from named.conf template.
(This used to be commit ebf130e9e57b640129cf0d05dbd7d210b71ea371)
2008-05-21 20:46:15 -05:00
Andrew Kroeger
25ea110c38 provision: Create instructions for enabling DNS GSS-TSIG updates.
Added code to the python provisioning to create the named.conf file that was
previously generated by the EJS provisioning.

Updated the named.conf template to provide the additional details necessary
to get things working.
(This used to be commit 0b7a6bfcba1b906dc4d461882b4c3fe3c91c44e0)
2008-05-18 01:54:57 -05:00
Jelmer Vernooij
251f6bd991 make sure to always use string version of uuid rather than object.
(This used to be commit bcd5fc7dc9899deb9fa84fdeeb21ed2ddb921308)
2008-05-11 04:36:37 +02:00
Jelmer Vernooij
5319d9620b Use consistent function names with the standard Python uuid module that is available in >= 2.4.
(This used to be commit 60d458e3195eef6baf655fee0da7c3f68517e8e6)
2008-05-11 03:31:26 +02:00
Andrew Bartlett
2ddd23a875 Re-add 'db' subdirectory for LDAP backend provision
Andrew Bartlett
(This used to be commit 19890c0d15adf4f099365f276a4bfdd3f4de52b6)
2008-04-15 17:10:47 +02:00
Andrew Bartlett
f8f4856ab7 Fix provision-backend script
Andrew Bartlett
(This used to be commit ee6e4f8da229ddeca856a6db94236367aae06f63)
2008-04-15 15:52:52 +02:00
Andrew Bartlett
e44f0e7b75 Don't reopen the sam.ldb again
Andrew Bartlett
(This used to be commit b51b8a2d846284de4dff736fc18cf747c188de96)
2008-04-11 19:33:52 +10:00
Andrew Bartlett
393007315d Far less cryptic traceback when you have an existing smb.conf
When the user has an existing smb.conf, but no [netlogon] or [sysvol]
share, the provision script would trigger a traceback.  While we still
need to abort in this situation, we do so now with a useful error.

Andrew Bartlett
(This used to be commit 10a8b7ea487f9725f69b02c4dd9cf5e1f67a23ab)
2008-04-11 19:04:43 +10:00
Andrew Bartlett
ae977ef247 Fix merge errors on C provision interface after jelmer's good work.
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet

Conflicts:

	source/torture/local/torture.c
(This used to be commit 5bf1c89cf8af08fbcf4f5089079920840daad7b8)
2008-04-11 11:11:42 +10:00
Jelmer Vernooij
ad8e3e4192 Add infrastructure for returning ProvisionResult in C provision code.
(This used to be commit 98c3d34eb233be284e8c8994cca337be25c72968)
2008-04-10 05:23:17 +02:00
Andrew Bartlett
b202b6e7d4 Fix up provision to specify SERVERDN in more places.
Andrew Bartlett
(This used to be commit d01d542502f25d6c731204ecb3d33720a1706581)
2008-04-09 15:32:49 +10:00
Andrew Bartlett
9d2948f4bd Don't fill in the secrets DB unless we make the entries.
Leave filling in (we still initialise it) the secrets DB for the join
or vampire code.

Andrew Bartlett
(This used to be commit c93208c13ce91b334eadf0ea02fa41354e761e97)
2008-04-09 14:57:57 +10:00
Jelmer Vernooij
ac10ac62c1 Add docstring, PEP8.
(This used to be commit f8cac3735c9a19baa313c4b61abee144da303ce1)
2008-04-09 03:51:41 +02:00
Andrew Bartlett
b2805c50ee Re-add support for the --ldap-backend-port option to provision-backend
This option allows Fedora DS multi-master replication to work.  I've
tried to update the wiki and scripts to the largely consistant with
each other.

Andrew Bartlett
(This used to be commit 42393c830733b2cc99ebccdafe944fcf3d82734f)
2008-04-08 17:28:25 +10:00
Jelmer Vernooij
7c7880695b More PEP8 compliancy.
(This used to be commit d16b30d005933c9cc73f9196a3b77829d23687a0)
2008-04-06 00:40:01 +02:00
Jelmer Vernooij
3e97aa73c2 Simplify some code, fix style.
(This used to be commit 1c983e4e4dfb93387791c36dc96696c4fffcfeb7)
2008-04-05 16:32:28 +02:00
Jelmer Vernooij
14e443b868 Improve PEP8 (Python code style) compliancy a bit.
(This used to be commit c7d388a6e2153234fe67daf1af094fc346e1da61)
2008-04-05 16:13:42 +02:00
Andrew Bartlett
c764791100 Clean up provision and rootdse module to hard-code less stuff.
In particular, allow for the server DN to be in a different site
(possible outcome of a DRS replication).

Andrew Bartlett
(This used to be commit 9ee4e39fe178317f42fd9a0adceea24b55dfe0f1)
2008-04-04 12:25:19 +11:00
Kai Blin
c26387a473 provision: Remove backup group mapping
Some distros seem to neither have a backup nor a staff group.
(This used to be commit 21fcf7c419658b3ae296428ca7a4ccf2288c17fe)
2008-04-03 00:01:34 +02:00
Kai Blin
8ac91d9132 provision: Set up id mappings in the idmap db, only map Administrator.
(This used to be commit 206b7d387c6d17e5cc40fd45b489abac9235a7a4)
2008-04-02 23:07:53 +02:00
Andrew Bartlett
4ccb384327 Fix merge of my host GUID removal and the IPv6 addition to provision
Merge branch 'v4-0-ipv6' of git://git.id10ts.net/samba into 4-0-abartlet

Andrew Bartlett
(This used to be commit d3336684f084f984500dd0893dd01bcfc5be0ab1)
2008-04-02 12:03:03 +11:00
Andrew Kroeger
3c0c6acc59 provision: Add support for IPv6 (bz #4593).
(This used to be commit 8585a3c77d5dfe97bca3f08716fc06ac2819f578)
2008-04-01 19:51:24 -05:00
Andrew Bartlett
2ab6dd9ea5 Remove references to setting the host GUID, as the repl_meta_data
module prohibits it anyway.

Andrew Bartlett
(This used to be commit c5b287c056855892f30fbbf32efe7d65da31ce91)
2008-04-02 11:38:58 +11:00
Andrew Bartlett
238a1a52f1 Rework 'compleated' message in provision to be more useful.
In particular, this should draw attention to accidential 'standalone'
server provisions and therefore cause less frustration.

Andrew Bartlett
(This used to be commit e906ae041a2b589ffceff97b74f7c4b01386382a)
2008-03-29 17:17:56 +11:00
Andrew Bartlett
4ddce8c28c Don't specify what should be a default option in the generated smb.conf
Instead, sub in "", so that the default continued to come from the code.

Andrew Bartlett
(This used to be commit b1829da8f75175fcc569a3a9195f2358731055a9)
2008-03-28 10:38:12 +11:00
Kai Blin
677dc6aa89 provision: Initialize uninitialized variables if "targetdir" is not
defined and there is no smb.conf file
(This used to be commit 19c29f473883be0a17fa740de9feb226f347df4a)
2008-03-27 17:49:56 +01:00
Andrew Bartlett
d7299d82c3 Rework memberof handling in slapd.conf (used for OpenLDAP backend)
Instead of using an include file, put the generated configurationd
directly into slapd.conf.

Andrew Bartlett
(This used to be commit 95ac786136aebfe5ededeb3fb81cbd4e296e3988)
2008-03-15 19:03:04 +11:00
Andrew Bartlett
0c88240236 Rework to have member server 'domains' be CN=NETBIOSNAME
This reworks quite a few parts of our provision system to use
CN=NETBIOSNAME as the domain for member servers.

This makes it clear that these domains are not in the DNS structure,
while complying with our own schema (found by OpenLDAP's schema
validation).

Andrew Bartlett
(This used to be commit bda6a38b055fed2394e65cdc0b308a1442116402)
2008-03-13 11:36:58 +11:00
Andrew Bartlett
07a7c8fa0d Update the provision scripts and selftest for LDAP
This should allow us to provision onto an OpenLDAP backend again.

Also ensure we always have a sysvol and netlogon share in the selftest
environment.

Andrew Bartlett
(This used to be commit b2d9b03ba3434e76d4d476233a198728523d17f9)
2008-03-13 09:55:06 +11:00
Andrew Bartlett
69d66e6fb0 Upgrade provision-backend to python.
This required a large rework of the provision code, so as to move much
of the 'guess' logic into subprocedures, rather than just inline in
the provision code.

Andrew Bartlett
(This used to be commit a0754c2a857217ca831c2295b17255d8f38dfbc2)
2008-03-13 08:08:05 +11:00
Andrew Bartlett
9703948850 Fix provision script to work without smb.conf location specified.
Andrew Bartlett
(This used to be commit b4da374a998caac18c288a0a6e3fcd2c50cbffa7)
2008-03-11 14:41:10 +11:00
Andrew Bartlett
a7e1fa0bef Try to fix up part of the upgrade test.
There are still problems with the upgrade test, but these are not
related to the provision system.

Andrew Bartlett
(This used to be commit d331bc400fb138bc43be88d0ca8ab3bcd590d2cd)
2008-03-07 19:20:39 +11:00
Andrew Bartlett
14c5f968e1 Rework provision scripts for more testing
This fixes up some issues with testdir (was not honoured) and
increases test coverage.

We now check all the major provision modes.  In doing so, to make it
possible to call from the multiple layers of 'sh', I have allowed 'dc'
to alias 'domain controller' and 'member' to alias 'member server'.
Fighting shell quoting in the test system was just too hard...

Also fix upgrade.py

Andrew Bartlett
(This used to be commit 0923de12282b0e063dd73bc3e056dd5c3663c190)
2008-03-07 10:57:52 +11:00
Andrew Bartlett
449c0c5242 Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit a6997c333cdd68dfba8a069df448836ff487787f)
2008-03-07 07:38:44 +11:00
Andrew Bartlett
8b24d248b7 Start to rework provision for LDAP backends
This is the start of the rework of the provision script to handle an
LDAP backend correctly.  For example, we must not set the 'tdb
modules' against an LDAP backend such as OpenLDAP that handles subtree
renames.

Andrew Bartlett
(This used to be commit e462a107d3bafcc546ca4d53dcc8eb32e4280745)
2008-03-07 07:33:14 +11:00
Andrew Bartlett
7e0ef3fd0e Make Samba4 pass the NET-API-BECOMEDC test against Win2k3 (again).
To make Samba4, using the python provision system, pass this test
required some major rework.  Untested code is broken code, and some of
the refactoring for a seperate provision test (which also now passes)
broke things.

Similarly, the iconv work has compiled, but these codepaths have never
been run (NULL pointer de-reference).

In working to use a local, rather than global, loadparm context, and
to support using a target directory, a few things needed to be
reworked, particularly around path handling.

Andrew Bartlett
(This used to be commit 1169e8d7bee20477b0efbfea3534ac63c83fb3d6)
2008-03-06 21:55:26 +11:00
Andrew Bartlett
4d4a898742 Fix failure to re-provision.
Somewhere in the conversion from ejs we lost calling the 'delete
partitions' code.  However, we have to be careful not to wipe
partitions when we are the second client connecting to an LDAP server.

Andrew Bartlett
(This used to be commit 272eb765b81e3eab216a07249334f9b7d20e530b)
2008-03-03 13:03:19 +11:00
Douglas VanLeuven
c20cf59768 Fix member server provision
Can't add "member server" because the script aborts with null
reference when no match on serverrole.  This is fixed by checking for
the keyword "member server".
(This used to be commit 62536750ae06248a49c6b56c86d01b0062bb54f0)
2008-03-03 11:08:59 +11:00
Andrew Bartlett
9b7baec42b Reorder modules to have rdn_name before objectclass.
This ensures the relative DN is placed in the correct case into the
DB.

Andrew Bartlett
(This used to be commit 16378219fbf9e8a26621f848e85426180822ea29)
2008-02-28 08:39:45 +11:00
Kai Blin
895874d966 idmap: Handle uid->SID mapping
(This used to be commit 6ac6de8476ba036eb041e054bc37e4503dc2fde8)
2008-02-21 11:21:59 +01:00
Jelmer Vernooij
7c96ca88c4 Formatting fixes.
(This used to be commit bc0fab89e325ebb6ab870b1c3f4b263c50631b70)
2008-02-16 15:23:26 +01:00
Jelmer Vernooij
85fe22a85f Use struct for provision parameters since there are so many of them.
(This used to be commit 4b9d5bc57ca4ee14c142ea720dce5e4ee97f8c16)
2008-02-15 15:14:55 +01:00
Jelmer Vernooij
08e3f99f14 Initial work on a test for samba.tests.samdb
(This used to be commit 8b33860954ca03be1ea45fd8d40963dbbd5b162f)
2008-02-13 02:18:45 +01:00
Jelmer Vernooij
2fa4c15858 Fix syntax of docstrings, set project name when generating Python API documentation.
(This used to be commit 68f13d87eb034fdbc712169f2d1b1a0475751ec5)
2008-02-09 17:37:42 +01:00
Jelmer Vernooij
bd0bfe6833 Fix provision python test.
(This used to be commit b173fa6bd2b24b5a3e7b4fbcb926f6c9771c10ba)
2008-02-09 03:09:56 +01:00
Jelmer Vernooij
2aac2a5df8 Add tests for findnss(), add some docstrings.
(This used to be commit 4eec2bbc9a139e927ce21c615ebfbb3026b26384)
2008-02-09 02:10:49 +01:00
Jelmer Vernooij
c1d8ac0ab1 Remove unused class members.
(This used to be commit 373ef4287f998b79bf9ba6364d6a67e5c522833d)
2008-02-09 01:42:38 +01:00