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

132 Commits

Author SHA1 Message Date
Andrew Bartlett
c983ea8e5d s4-join: Setup correct DNS configuration
This means we do not need to run samba_upgradedns any more.

Andrew Bartlett

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Sun Jun 24 18:10:10 CEST 2012 on sn-devel-104
2012-06-24 18:10:10 +02:00
Andrew Bartlett
33ff033204 s4-provision: Give better clues on what Samba needs for s3fs ACL support
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Thu Jun 21 14:07:55 CEST 2012 on sn-devel-104
2012-06-21 14:07:55 +02:00
Andrew Bartlett
352dbddb6d s4-idmap: Add parameter 'idmap_ldb:use rfc2307' and correct implementation errors 2012-06-20 16:22:41 +10:00
Andrew Bartlett
2b50e8c534 s4-provision: Remove --slapd-path option
This just leaves a default enough for the test code to still check the start
of the provision.  This may well be removed in future, and we wish to reduce
the extra options to provision.

Andrew Bartlett
2012-06-20 16:22:41 +10:00
Andrew Bartlett
706a998c1f s4-provision: Remove last unused remenants of the 'sid generator' configuration
This was part of the now-abandoned S4 AD LDAP backend project.

Andrew Bartlett
2012-06-20 16:22:41 +10:00
Andrew Bartlett
39766b75a4 s4-lib/param: FLAG DAY for the default FILE SERVER
This commit changes the default file server to be s3fs.  Existing
installs wishing to keep the ntvfs file server need to set this in
their smb.conf:

server services = +smb -s3fs
dcerpc endpoint services = +winreg +srvsvc

Andrew Bartlett
2012-06-16 08:18:10 +02:00
Andrew Bartlett
67bdf4fa11 lib/param: Use server role = 'standalone server' to be consistant with member server
standalne is left as an alias.

Andrew Bartlett
2012-06-15 09:18:33 +02:00
Andrew Bartlett
b8815dc23d lib/param: Create a seperate server role for "active directory domain controller"
This will allow us to detect from the smb.conf if this is a Samba4 AD
DC which will allow smarter handling of (for example) accidentially
starting smbd rather than samba.

To cope with upgrades from existing Samba4 installs, 'domain
controller' is a synonym of 'active directory domain controller' and
new parameters 'classic primary domain controller' and 'classic backup
domain controller' are added.

Andrew Bartlett
2012-06-15 09:18:33 +02:00
Michael Adam
cec6ebf4c3 s4:provision: fix use of non-existent word (existant) 2012-06-12 07:21:44 +02:00
Andrew Bartlett
dc799d4b42 s4-provision: Test for posix ACLs in the actual sysvol path
This avoids issues in the previous location where lp may not be initialised at this point
and instead simply waits until we have a known sysvol path, and test for ACL support
there.

Andrew Bartlett
2012-06-05 04:27:36 +02:00
Andrew Bartlett
d2b635cc2f s4-provision: Place xattr.tdb in the actual state directory
This patch does two things: it fixes up the spelling of "state dir" to
"state directory" so that we actually find the smb.conf parameter, and
we move it to after we process the global settings in case this is
changed in the future.

Andrew Bartlett
2012-06-05 04:27:36 +02:00
Andrew Bartlett
3e92bff13d s4-provision: Use the s3fs file server by default in migrations
This covers both migrations from s3 and joining a domain as a new DC.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Wed May 30 14:57:22 CEST 2012 on sn-devel-104
2012-05-30 14:57:22 +02:00
Andrew Bartlett
0678eb6cdf s4-provision Ensure we have posix ACLs before we permit a s3fs-based Samba4 to be configured 2012-05-08 04:51:59 +02:00
Jelmer Vernooij
7ed9ebab83 provision: remove reference to no longer existing template files. 2012-05-03 13:41:24 +02:00
Andrew Bartlett
7b55ec290e s4-provision: Fix up --use-s3fs to create the directory for xattr.tdb
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Wed May  2 04:45:05 CEST 2012 on sn-devel-104
2012-05-02 04:45:03 +02:00
Andrew Bartlett
051042229d s4-provision: set 'dcerpc endpoint servers' but not 'vfs objects'
The VFS objects are now set in the fileserver.conf, but this is only read by smbd, so
the provision-time smb.conf needs to turn off the extra Samba4 DCE/RPC services.

Andrew Bartlett
2012-05-02 10:53:50 +10:00
Andrew Bartlett
538893d183 s3fs: Use xattr_tdb format for xattr storage
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Wed Apr 18 05:39:01 CEST 2012 on sn-devel-104
2012-04-18 05:39:01 +02:00
Matthieu Patou
f35d20119a Add an option to have s3fs as file server for samba4
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Mon Apr 16 09:38:18 CEST 2012 on sn-devel-104
2012-04-16 09:38:17 +02:00
Amitay Isaacs
06a0101082 s4-provision: Update configuration lines for dlz_bind9
This adds configuration lines for BIND versions 9.8.x and 9.9.x.

Autobuild-User: Amitay Isaacs <amitay@samba.org>
Autobuild-Date: Mon Apr 16 03:52:14 CEST 2012 on sn-devel-104
2012-04-16 03:52:14 +02:00
Matthias Dieter Wallnöfer
438971e214 LDB/s4 - do not use the "(dn=...)" syntax on filters anymore
Make it AD-compatible using "(distinguishedName=...)".

Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2012-03-26 00:57:29 +02:00
Amitay Isaacs
bcaa278e32 provision: dns: TXT Records need a list of strings as input 2012-03-02 00:24:50 +11:00
Amitay Isaacs
00a5366fdb s4-provision: Use "state directory" from lp, as it is always set
This fixes new provisions when --targetdir is not provided.

Autobuild-User: Amitay Isaacs <amitay@samba.org>
Autobuild-Date: Thu Mar  1 11:41:02 CET 2012 on sn-devel-104
2012-03-01 11:41:02 +01:00
Jelmer Vernooij
687e065036 provision: Write configuration without help of templates.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Mon Feb 27 00:52:46 CET 2012 on sn-devel-104
2012-02-27 00:52:46 +01:00
Jelmer Vernooij
852418133e provision: Simplify make_smbconf a bit. 2012-02-26 23:19:07 +01:00
Jelmer Vernooij
3bfccdfbc8 provision: Fix order for error formatting. 2012-02-26 23:19:07 +01:00
Jelmer Vernooij
e27e519bb8 provision: Raise proper error when shares are missing rather than AssertionError. 2012-02-26 23:19:07 +01:00
Jelmer Vernooij
411119db50 provision: Share more code for determine_netbios_name() with samba.valid_netbios_name().
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Feb 26 22:24:42 CET 2012 on sn-devel-104
2012-02-26 22:24:42 +01:00
Jelmer Vernooij
d5485a1e56 provision/backend: Properly close all opened files. 2012-02-26 20:52:05 +01:00
Jelmer Vernooij
6b320d63f3 provision: Properly close opened files. 2012-02-26 20:52:05 +01:00
Jelmer Vernooij
171dc5ad4f provision: Reuse determine_netbios_name. 2012-02-26 20:52:05 +01:00
Jelmer Vernooij
16a4fa9704 provision: Factor out determination of new netbios name. 2012-02-26 20:52:05 +01:00
Jelmer Vernooij
6664541156 provision: Split out result reporting for backends. 2012-02-26 16:27:06 +01:00
Jelmer Vernooij
eeb5f66d90 provision: Put adminpass details in ProvisionResult. 2012-02-26 16:27:06 +01:00
Jelmer Vernooij
3e6fa054f9 provision/tests: Test for phpldapadminconfig path. 2012-02-26 16:27:06 +01:00
Jelmer Vernooij
21f443eb82 provision: Leave result reporting up to caller. 2012-02-26 16:27:06 +01:00
Jelmer Vernooij
fe3274d9cb provision: Start splitting out provision result reporting from actual provisioning.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sat Feb 25 22:13:10 CET 2012 on sn-devel-104
2012-02-25 22:13:10 +01:00
Jelmer Vernooij
2fd10469c1 provision: Properly close ldb transactions. 2012-02-25 20:39:05 +01:00
Jelmer Vernooij
d06eeb7949 Factor out sanitize_server_role. 2012-02-25 20:39:05 +01:00
Jelmer Vernooij
66f13ea1e9 Partially revert 1f0298dd1b1a939cb215e7b474178b217f8347f4
It's fine to catch keyboard interrupts and other kinds of errors when it's done just for resource management, where the error is reraised later.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sat Feb 25 17:29:34 CET 2012 on sn-devel-104
2012-02-25 17:29:34 +01:00
Jelmer Vernooij
f5d706b0ee provision: Remove unused imports. 2012-02-25 15:58:07 +01:00
Andrew Bartlett
c623b4bbb8 s4-provision: Fix typo in 9b9fdeefb47f2657c9bb4c2f48318550da510209
This was not found to to a bug in the selftest system.

Andrew Bartlett
2012-02-23 19:19:54 +11:00
Amitay Isaacs
6daf04eb6e s4-provision: dns: Add txt DNS record 2012-02-21 23:08:35 +11:00
Amitay Isaacs
597449235e s4-provision: dns: Do not re-calculate ntdsguid, use from names 2012-02-21 23:08:35 +11:00
Amitay Isaacs
9b9fdeefb4 s4-provision: dns: Refactor population of dns data code
Code is split in 4 functions
 - create_dns_legacy
 - fill_dns_data_legacy
 - create_dns_partitions
 - fill_dns_data_partitions

This is useful to upgrade dns provision from file based DNS backend
to AD based DNS backend.
2012-02-21 23:08:35 +11:00
Michael Adam
8ca39dfbe1 s4:provision: only print the adminpass if it was generated (not user-provided) 2012-02-16 12:07:50 +01:00
Michael Adam
09b865b2f0 s4:provision: generate the adminpass provision() instead of provision_fill()
so that the adminpass can be logged at the end
(otherwise we get "None")
2012-02-16 12:07:49 +01:00
Michael Adam
32cf164d99 s4:provision: don't log the ldap admin password - it is internal only 2012-02-16 12:07:49 +01:00
Amitay Isaacs
1f0298dd1b python: Change except: statement to except Exception:
This way we only catch true exceptions and keyboard interrupts
are not caught here.

Autobuild-User: Amitay Isaacs <amitay@samba.org>
Autobuild-Date: Tue Jan 24 03:32:40 CET 2012 on sn-devel-104
2012-01-24 03:32:40 +01:00
Michael Adam
803dc389d1 s4:provision: add "+dns" to server services if the dns backend is SAMBA_INTERNAL
Signed-off-by: Kai Blin <kai@samba.org>

Autobuild-User: Kai Blin <kai@samba.org>
Autobuild-Date: Tue Jan 10 21:17:45 CET 2012 on sn-devel-104
2012-01-10 21:17:45 +01:00
Michael Adam
f489c681ea s4:provision: add the possibility to provision "server services" in smb.conf
Signed-off-by: Kai Blin <kai@samba.org>
2012-01-10 19:19:21 +01:00