summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-05-22 00:10:39 +1000
committerAndrew Bartlett <abartlet@samba.org>2013-05-27 11:56:51 +1000
commit2a110aaecad5439534eacfc91b607a3c3653e81d (patch)
treee31adb92246bbe50c25d82f7b988f41a34091b34
parent2a4eaa3241fc4ccb79359ea4e4d511754a84d46b (diff)
downloadsamba-2a110aaecad5439534eacfc91b607a3c3653e81d.tar.gz
samba-2a110aaecad5439534eacfc91b607a3c3653e81d.tar.xz
samba-2a110aaecad5439534eacfc91b607a3c3653e81d.zip
examples: Move example smb.conf over to "server role"
Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
-rw-r--r--examples/smb.conf.default14
1 files changed, 10 insertions, 4 deletions
diff --git a/examples/smb.conf.default b/examples/smb.conf.default
index dad8c97d799..86e713f0042 100644
--- a/examples/smb.conf.default
+++ b/examples/smb.conf.default
@@ -28,10 +28,16 @@
# server string is the equivalent of the NT Description field
server string = Samba Server
-# Security mode. Defines in which mode Samba will operate. Possible
-# values are user, domain and ads. Most people will want
-# user level security. See the Samba-HOWTO-Collection for details.
- security = user
+# Server role. Defines in which mode Samba will operate. Possible
+# values are "standalone server", "member server", "classic primary
+# domain controller", "classic backup domain controller", "active
+# directory domain controller".
+#
+# Most people will want "standalone sever" or "member server".
+# Running as "active directory domain controller" will require first
+# running "samba-tool domain provision" to wipe databases and create a
+# new domain.
+ server role = standalone server
# This option is important for security. It allows you to restrict
# connections to machines which are on your local network. The