From 1407ad82a56d51da0466624d1eb3088458d18f12 Mon Sep 17 00:00:00 2001 From: bubulle Date: Tue, 11 May 2010 18:28:49 +0000 Subject: merge upstream 3.4.8 git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@3471 fc4039ab-9d04-0410-8cac-899223bdd6b0 --- docs/htmldocs/manpages/idmap_ad.8.html | 2 +- docs/htmldocs/manpages/net.8.html | 2 +- docs/htmldocs/manpages/smb.conf.5.html | 91 +++++++++++++++++----------------- 3 files changed, 47 insertions(+), 48 deletions(-) (limited to 'docs/htmldocs/manpages') diff --git a/docs/htmldocs/manpages/idmap_ad.8.html b/docs/htmldocs/manpages/idmap_ad.8.html index d1f831d002..298921c24c 100644 --- a/docs/htmldocs/manpages/idmap_ad.8.html +++ b/docs/htmldocs/manpages/idmap_ad.8.html @@ -18,7 +18,7 @@ in Windows 2003 R2 or the Service for Unix (SFU) schema.

EXAMPLES

The following example shows how to retrieve idmappings from our principal and - and trusted AD domains. If trusted domains are present id conflicts must be + trusted AD domains. If trusted domains are present id conflicts must be resolved beforehand, there is no guarantee on the order conflicting mappings would be resolved at this point. diff --git a/docs/htmldocs/manpages/net.8.html b/docs/htmldocs/manpages/net.8.html index c73c62d708..ad716d8380 100644 --- a/docs/htmldocs/manpages/net.8.html +++ b/docs/htmldocs/manpages/net.8.html @@ -297,7 +297,7 @@ To allow 100 usershare definitions. Now, members of the UNIX group "serverops" can create user defined shares on demand using the commands below.

The usershare commands are: -

net usershare add sharename path [comment] [acl] [guest_ok=[y|n]] - to add or change a user defined share.
net usershare delete sharename - to delete a user defined share.
net usershare info [-l|--long] [wildcard sharename] - to print info about a user defined share.
net usershare list [-l|--long] [wildcard sharename] - to list user defined shares.

+

net usershare add sharename path [comment [acl] [guest_ok=[y|n]]] - to add or change a user defined share.
net usershare delete sharename - to delete a user defined share.
net usershare info [-l|--long] [wildcard sharename] - to print info about a user defined share.
net usershare list [-l|--long] [wildcard sharename] - to list user defined shares.

USERSHARE ADD sharename path [comment] [acl] [guest_ok=[y|n]]

Add or replace a new user defined share, with name "sharename". diff --git a/docs/htmldocs/manpages/smb.conf.5.html b/docs/htmldocs/manpages/smb.conf.5.html index a2db005732..0424a2329e 100644 --- a/docs/htmldocs/manpages/smb.conf.5.html +++ b/docs/htmldocs/manpages/smb.conf.5.html @@ -6343,31 +6343,30 @@ winbind normalize names (G) winbind nss info (G)

This parameter is designed to control how Winbind retrieves Name - Service Information to construct a user's home directory and login shell. - Currently the following settings are available: + Service Information to construct a user's home directory and login shell. + Currently the following settings are available: -

  • template - - The default, using the parameters of template +

    • template + - The default, using the parameters of template shell and template homedir)

    • <sfu | rfc2307 > - When Samba is running in security = ads and your Active Directory Domain Controller does support the Microsoft "Services for Unix" (SFU) LDAP schema, winbind can retrieve the login shell and the home directory attributes directly from your Directory Server. Note that - retrieving UID and GID from your ADS-Server requires to - use idmap backend = ad - or idmap config DOMAIN:backend = ad + retrieving UID and GID from your ADS-Server requires to + use idmap config DOMAIN:backend = ad as well.

    Default: winbind nss info = template -

    Example: winbind nss info = template sfu +

    Example: winbind nss info = sfu -

+

winbind offline logon (G) -

This parameter is designed to control whether Winbind should +

This parameter is designed to control whether Winbind should allow to login with the pam_winbind module using Cached Credentials. If enabled, winbindd will store user credentials from successful logins encrypted in a local cache. @@ -6375,37 +6374,37 @@ winbind offline logon (G)

Example: winbind offline logon = true -

+

winbind reconnect delay (G) -

This parameter specifies the number of +

This parameter specifies the number of seconds the winbindd(8) daemon will wait between attempts to contact a Domain controller for a domain that is determined to be down or not contactable.

Default: winbind reconnect delay = 30 -

+

winbind refresh tickets (G) -

This parameter is designed to control whether Winbind should refresh Kerberos Tickets +

This parameter is designed to control whether Winbind should refresh Kerberos Tickets retrieved using the pam_winbind module.

Default: winbind refresh tickets = false

Example: winbind refresh tickets = true -

+

winbind rpc only (G) -

+

Setting this parameter to yes forces winbindd to use RPC instead of LDAP to retrieve information from Domain Controllers.

Default: winbind rpc only = no -

+

winbind separator (G) -

This parameter allows an admin to define the character +

This parameter allows an admin to define the character used when listing a username of the form of DOMAIN \user. This parameter is only applicable when using the pam_winbind.so @@ -6416,10 +6415,10 @@ winbind separator (G)

Example: winbind separator = + -

+

winbind trusted domains only (G) -

+

This parameter is designed to allow Samba servers that are members of a Samba controlled domain to use UNIX accounts distributed via NIS, rsync, or LDAP as the uid's for winbindd users in the hosts primary domain. @@ -6430,10 +6429,10 @@ winbind trusted domains only (G) Refer to the idmap_nss(8) man page for more information.

Default: winbind trusted domains only = no -

+

winbind use default domain (G) -

This parameter specifies whether the +

This parameter specifies whether the winbindd(8) daemon should operate on users without domain component in their username. Users without a domain component are treated as is part of the winbindd server's own @@ -6443,10 +6442,10 @@ winbind use default domain (G)

Example: winbind use default domain = yes -

+

wins hook (G) -

When Samba is running as a WINS server this +

When Samba is running as a WINS server this allows you to call an external program for all changes to the WINS database. The primary use for this option is to allow the dynamic update of external name resolution databases such as @@ -6467,17 +6466,17 @@ wins hook (G) addresses currently registered for that name. If this list is empty then the name should be deleted.

An example script that calls the BIND dynamic DNS update program nsupdate is provided in the examples - directory of the Samba source code.

No default

+ directory of the Samba source code.

No default

wins proxy (G) -

This is a boolean that controls if nmbd(8) will respond to broadcast name +

This is a boolean that controls if nmbd(8) will respond to broadcast name queries on behalf of other hosts. You may need to set this to yes for some older clients.

Default: wins proxy = no -

+

wins server (G) -

This specifies the IP address (or DNS name: IP +

This specifies the IP address (or DNS name: IP address for preference) of the WINS server that nmbd(8) should register with. If you have a WINS server on your network then you should set this to the WINS server's IP.

You should point this at your WINS server if you have a multi-subnetted network.

If you want to work in multiple namespaces, you can @@ -6496,19 +6495,19 @@ wins server (G)

Example: wins server = 192.9.200.1 192.168.2.61 -

+

wins support (G) -

This boolean controls if the nmbd(8) process in Samba will act as a WINS server. You should +

This boolean controls if the nmbd(8) process in Samba will act as a WINS server. You should not set this to yes unless you have a multi-subnetted network and you wish a particular nmbd to be your WINS server. Note that you should NEVER set this to yes on more than one machine in your network.

Default: wins support = no -

+

workgroup (G) -

This controls what workgroup your server will +

This controls what workgroup your server will appear to be in when queried by clients. Note that this parameter also controls the Domain name used with the security = domain @@ -6516,18 +6515,18 @@ workgroup (G)

Example: workgroup = MYGROUP -

+

writable -

This parameter is a synonym for writeable.

+

This parameter is a synonym for writeable.

writeable (S) -

Inverted synonym for read only.

Default: writeable = no +

Inverted synonym for read only.

Default: writeable = no -

+

write cache size (S) -

If this integer parameter is set to non-zero value, +

If this integer parameter is set to non-zero value, Samba will create an in-memory cache for each oplocked file (it does not do this for non-oplocked files). All writes that the client does not request @@ -6545,10 +6544,10 @@ write cache size (S)

Example: write cache size = 262144 # for a 256k cache size per file -

+

write list (S) -

+

This is a list of users that are given read-write access to a service. If the connecting user is in this list then they will be given write access, no matter what the read only option is set to. The list can @@ -6563,17 +6562,17 @@ write list (S)

Example: write list = admin, root, @staff -

+

write raw (G) -

This parameter controls whether or not the server +

This parameter controls whether or not the server will support raw write SMB's when transferring data from clients. You should never need to change this parameter.

Default: write raw = yes -

+

wtmp directory (G) -

+

This parameter is only available if Samba has been configured and compiled with the option --with-utmp. It specifies a directory pathname that is used to store the wtmp or wtmpx files (depending on the UNIX system) that record user connections to a Samba server. The difference with the utmp directory is the fact @@ -6585,7 +6584,7 @@ wtmp directory (G)

Example: wtmp directory = /var/log/wtmp -

WARNINGS

+

WARNINGS

Although the configuration file permits service names to contain spaces, your client software may not. Spaces will be ignored in comparisons anyway, so it shouldn't be a problem - but be aware of the possibility.

@@ -6598,8 +6597,8 @@ wtmp directory (G) for an administrator easy, but the various combinations of default attributes can be tricky. Take extreme care when designing these sections. In particular, ensure that the permissions on spool directories are correct. -

VERSION

This man page is correct for version 3 of the Samba suite.

SEE ALSO

- samba(7), smbpasswd(8), swat(8), smbd(8), nmbd(8), smbclient(1), nmblookup(1), testparm(1), testprns(1).

AUTHOR

+

VERSION

This man page is correct for version 3 of the Samba suite.

SEE ALSO

+ samba(7), smbpasswd(8), swat(8), smbd(8), nmbd(8), smbclient(1), nmblookup(1), testparm(1), testprns(1).

AUTHOR

The original Samba software and related utilities were created by Andrew Tridgell. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed.

-- cgit v1.2.3