From 765e5d2282959770ea9648e0f2b72e51e5b4cdd8 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Tue, 23 Sep 2008 16:54:05 -0700 Subject: printing: Add new parameter "cups timeout". The default timeout for connections to CUPS servers is set to 5 minutes in the CUPS libraries. The smbd hangs on startup until the timeout is reached if the CUPS server is unreachable. This parameter makes the timeout configurable. The default value is set to 30 seconds. Karolin --- docs-xml/smbdotconf/printing/cupstimeout.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 docs-xml/smbdotconf/printing/cupstimeout.xml (limited to 'docs-xml') diff --git a/docs-xml/smbdotconf/printing/cupstimeout.xml b/docs-xml/smbdotconf/printing/cupstimeout.xml new file mode 100644 index 0000000000..727ccce67b --- /dev/null +++ b/docs-xml/smbdotconf/printing/cupstimeout.xml @@ -0,0 +1,17 @@ + + + + + This parameter determines the timeout for connections to a CUPS server + in seconds. + + + +30 +cups timeout = 10 + -- cgit From 9cf1a68977d56d342ca7dbe8f07c725221dc1148 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Wed, 24 Sep 2008 09:53:21 -0700 Subject: printing: Rename new parameter "cups timeout" to "cups connection timeout". Karolin --- docs-xml/smbdotconf/printing/cupstimeout.xml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 docs-xml/smbdotconf/printing/cupstimeout.xml (limited to 'docs-xml') diff --git a/docs-xml/smbdotconf/printing/cupstimeout.xml b/docs-xml/smbdotconf/printing/cupstimeout.xml deleted file mode 100644 index 727ccce67b..0000000000 --- a/docs-xml/smbdotconf/printing/cupstimeout.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - This parameter determines the timeout for connections to a CUPS server - in seconds. - - - -30 -cups timeout = 10 - -- cgit From 73769e136e85fd1f6d39dad89bd84cdb7d758764 Mon Sep 17 00:00:00 2001 From: "Gerald W. Carter" Date: Tue, 23 Sep 2008 11:40:28 -0700 Subject: Document how to enable the name aliasing support in Winbind. (cherry picked from commit 6dc81eb85b11851794619a1f2769d68cd9a54fb6) --- .../smbdotconf/winbind/winbindnormalizenames.xml | 27 +++++++++++++++------- 1 file changed, 19 insertions(+), 8 deletions(-) (limited to 'docs-xml') diff --git a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml index 28826cf5f3..5b68bca912 100644 --- a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml +++ b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml @@ -5,14 +5,25 @@ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> This parameter controls whether winbindd will replace - whitespace in user and group names with an underscore (_) character. - For example, whether the name "Space Kadet" should be - replaced with the string "space_kadet". - Frequently Unix shell scripts will have difficulty with usernames - contains whitespace due to the default field separator in the shell. - Do not enable this option if the underscore character is used in - account names within your domain - + whitespace in user and group names with an underscore (_) character. + For example, whether the name "Space Kadet" should be + replaced with the string "space_kadet". + Frequently Unix shell scripts will have difficulty with usernames + contains whitespace due to the default field separator in the shell. + If your domain possesses names containing the underscore character, + this option may cause problems unless the name aliasing feature + is supported by your nss_info plugin. + + + This feature also enables the name aliasing API which can + be used to make domain user and group names to a non-qlaified + version. Please refer to the manpage for the configured + idmap and nss_info plugin for the specifics on how to configure + name aliasing for a specific configuration. Name aliasing takes + precendence (and is mutually exclusive) over the whitespace + replacement mechanism discussed previsouly. + + no -- cgit From a089b3bb99a226e8f99884867a677672cc028f1c Mon Sep 17 00:00:00 2001 From: "Gerald W. Carter" Date: Tue, 23 Sep 2008 11:43:05 -0700 Subject: Document the new hash and adex idmap/nss_info plugins. (cherry picked from commit 77bc0be0536bcd6a3ce8283a708828bebbbffee3) --- docs-xml/manpages-3/idmap_adex.8.xml | 89 ++++++++++++++++++++++++++++++++++++ docs-xml/manpages-3/idmap_hash.8.xml | 76 ++++++++++++++++++++++++++++++ 2 files changed, 165 insertions(+) create mode 100644 docs-xml/manpages-3/idmap_adex.8.xml create mode 100644 docs-xml/manpages-3/idmap_hash.8.xml (limited to 'docs-xml') diff --git a/docs-xml/manpages-3/idmap_adex.8.xml b/docs-xml/manpages-3/idmap_adex.8.xml new file mode 100644 index 0000000000..9eb2ff7d46 --- /dev/null +++ b/docs-xml/manpages-3/idmap_adex.8.xml @@ -0,0 +1,89 @@ + + + + + + idmap_adex + 8 + Samba + System Administration tools + 3.2 + + + + + idmap_adex + Samba's idmap_adex Backend for Winbind + + + + DESCRIPTION + + The idmap_adex plugin provides a way for Winbind to read + id mappings from an AD server that uses RFC2307 schema + extensions. This module implements both the idmap and nss_info + APIs and supports domain trustes as well as two-way cross + forest trusts. It is a read-only plugin requiring that the + administrator provide mappings in advance by adding the + POSIX attribute information to the users and groups objects + in AD. The most common means of doing this is using "Identity + Services for Unix" support on Windows 2003 R2 and later. + + + + Note that you must add the uidNumber, gidNumber, and uid + attributes to the partial attribute set of the forest global + catalog servers. This can be done using the Active Directory Schema + Management MMC plugin (schmmgmt.dll). + + + + + NSS_INFO + + The nss_info plugin supports reading the unixHomeDirectory, + gidNumber, loginShell, and uidNumber attributes from the user + object and the gidNumber attribute from the group object to + fill in information required by the libc getpwnam() and + getgrnam() family of functions. Group membership is filled in + according to the Windows group membership and not the + msSFU30PosixMember attribute. + + + + Username aliases are implement by setting the uid attribute + on the user object. While group name aliases are implemented + by reading the displayname attribute from the group object. + + + + + EXAMPLES + + The following example shows how to retrieve idmappings and NSS data + from our principal and trusted AD domains. + + + + [global] + idmap backend = adex + idmap uid = 1000-4000000000 + idmap gid = 1000-4000000000 + + winbind nss info = adex + winbind normalize names = yes + + + + + 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. + + + + diff --git a/docs-xml/manpages-3/idmap_hash.8.xml b/docs-xml/manpages-3/idmap_hash.8.xml new file mode 100644 index 0000000000..8e452b3c89 --- /dev/null +++ b/docs-xml/manpages-3/idmap_hash.8.xml @@ -0,0 +1,76 @@ + + + + + + idmap_hash + 8 + Samba + System Administration tools + 3.2 + + + + + idmap_hash + Samba's idmap_hash Backend for Winbind + + + + DESCRIPTION + The idmap_hash plugin implements a hashing algorithm used + map SIDs for domain users and groups to a 31-bit uid and gid. + This plugin also implements the nss_info API and can be used + to support a local name mapping files if enabled via the + "winbind normlaize names" and "winbind nss info" + parameters in smb.conf. + + + + + IDMAP OPTIONS + + + + name_map + + Specifies the absolute path to the name mapping + file used by the nss_info API. Entries in the file + are of the form "unix name + = qualified domain name"e;. + Mapping of both user and group names is supported. + + + + + + + EXAMPLES + The following example utilizes the idmap_hash plugin for + the idmap and nss_info information. + + + + [global] + idmap backend = hash + idmap uid = 1000-4000000000 + idmap gid = 1000-4000000000 + + winbind nss info = hash + winbind normalize names = yes + idmap_hash:name_map = /etc/samba/name_map.cfg + + + + + 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 From b9ccf0dc6f34fe3d63b8272f61f9e1fef7f5d885 Mon Sep 17 00:00:00 2001 From: Holger Hetterich Date: Mon, 29 Sep 2008 14:34:36 +0200 Subject: Add an initial version of a manpage for the vfs_smb_traffic_analyzer module. (cherry picked from commit 7857b783049b19d32a078927a46cb1070e863b45) --- docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml | 157 +++++++++++++++++++++ 1 file changed, 157 insertions(+) create mode 100644 docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml (limited to 'docs-xml') diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml new file mode 100644 index 0000000000..c0b1ef89e0 --- /dev/null +++ b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml @@ -0,0 +1,157 @@ + + + + + + smb_traffic_analyzer + 8 + Samba + System Administration tools + 3.2 + + + + + vfs_smb_traffic_analyzer + log Samba VFS read and write operations through a socket + to a helper application + + + + + vfs objects = smb_traffic_analyzer + + + + + DESCRIPTION + + This VFS module is part of the + samba + 7 suite. + + The vfs_smb_traffic_analyzer VFS module logs + client write and read operations on a Samba server and sends this data + over a socket to a helper program, which feeds a SQL database. More + information on the helper programs can be obtained from the + homepage of the project at: + http://holger123.wordpress.com/smb-traffic-analyzer/ + + vfs_smb_traffic_analyzer currently is aware + of the following VFS operations: + + + write + pwrite + read + pread + + + vfs_smb_traffic_analyzer sends the following data + in a fixed format seperated by a comma through either an internet or a + unix domain socket: + + BYTES|USER|DOMAIN|READ/WRITE|SHARE|FILENAME|TIMESTAMP + + + Description of the records: + + + BYTES - the length in bytes of the VFS operation + USER - the user who initiated the operation + DOMAIN - the domain of the user + READ/WRITE - either "W" for a write operation or "R" for read + SHARE - the name of the share on which the VFS operation occured + FILENAME - the name of the file that was used by the VFS operation + TIMESTAMP - a timestamp, formatted as "yyyy-mm-dd hh-mm-ss.ms" indicating when the VFS operation occured + + + + + This module is stackable. + + + + + + OPTIONS + + + + + smb_traffic_analyzer:mode = STRING + + If STRING matches to "unix_domain_socket", the module will + use a unix domain socket located at /var/tmp/stadsocket, if + STRING contains an different string or is not defined, the module will + use an internet domain socket for data transfer. + + + + + + + smb_traffic_analyzer:host = STRING + + The module will send the data to the system named with + the hostname STRING. + + + + + + smb_traffic_analyzer:port = STRING + + The module will send the data using the TCP port given + in STRING + + + + + + + + + + + EXAMPLES + + The module running on share "example_share", using a unix domain socket + + + /data/example + smb_traffic_analyzer + unix_domain_socket + + + The module running on share "example_share", using an internet domain socket, + connecting to host "examplehost" on port 3491. + + + /data/example + smb_traffic_analyzer + examplehost + 3490 + + + + + + VERSION + This man page is correct for version 3.2.0 of the Samba suite. + + + + + 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. + + The original version of the VFS module and the + helper tools were created by Holger Hetterich. + + + -- cgit From ec63cd6a7f87ebbc969fa270fefdde47385217b4 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Mon, 29 Sep 2008 15:39:43 +0200 Subject: docs: Adapt version strings in man vfs_smb_traffic_analyzer. Karolin (cherry picked from commit 662eda8458a304b224b6bc502f8030a07030b7c2) --- docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs-xml') diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml index c0b1ef89e0..28c8413231 100644 --- a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml +++ b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml @@ -7,7 +7,7 @@ 8 Samba System Administration tools - 3.2 + 3.3 @@ -138,7 +138,7 @@ VERSION - This man page is correct for version 3.2.0 of the Samba suite. + This man page is correct for version 3.3 of the Samba suite. -- cgit From 4b9cc7d478438e34217add83b2647d47d52268a7 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 3 Oct 2008 14:05:33 -0700 Subject: Document "cups connection timeout". Jeremy. --- .../smbdotconf/printing/cupsconnectiontimeout.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml (limited to 'docs-xml') diff --git a/docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml b/docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml new file mode 100644 index 0000000000..1c7df15c3c --- /dev/null +++ b/docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml @@ -0,0 +1,20 @@ + + + + This parameter is only applicable if is set to cups. + + + + If set, this option specifies the number of seconds that smbd will wait + whilst trying to contact to the CUPS server. The connection will fail + if it takes longer than this number of seconds. + + + +30 +60 + -- cgit From 5b75aa34069d488d23e880393d4280cbe85cc5c6 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 14 Aug 2008 14:41:50 +0200 Subject: pam_winbind: document mkhomedir option. Guenther --- docs-xml/manpages-3/pam_winbind.7.xml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'docs-xml') diff --git a/docs-xml/manpages-3/pam_winbind.7.xml b/docs-xml/manpages-3/pam_winbind.7.xml index cf7fd5a0f6..7f233c1386 100644 --- a/docs-xml/manpages-3/pam_winbind.7.xml +++ b/docs-xml/manpages-3/pam_winbind.7.xml @@ -134,6 +134,14 @@ + + mkhomedir + + Create homedirectory for a user on-the-fly, option is valid in + PAM session block. + + + -- cgit