Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(8)

Unified Diff: Lib/test/cfgparser.2

Issue 15550: Trailing white spaces
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Lib/lib2to3/Grammar.txt ('k') | Lib/test/cfgparser.3 » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
--- a/Lib/test/cfgparser.2 Sat Aug 04 16:17:10 2012 +0200
+++ b/Lib/test/cfgparser.2 Sat Aug 04 22:46:03 2012 +0300
@@ -3,19 +3,19 @@
# here. Samba has a huge number of configurable options (perhaps too
# many!) most of which are not shown in this example
#
-# Any line which starts with a ; (semi-colon) or a # (hash)
+# Any line which starts with a ; (semi-colon) or a # (hash)
# is a comment and is ignored. In this example we will use a #
# for commentry and a ; for parts of the config file that you
# may wish to enable
#
-# NOTE: Whenever you modify this file you should run the command #"testparm" # to check that you have not made any basic syntactic #errors.
+# NOTE: Whenever you modify this file you should run the command #"testparm" # to check that you have not made any basic syntactic #errors.
#
#======================= Global Settings =====================================
[global]
# 1. Server Naming Options:
# workgroup = NT-Domain-Name or Workgroup-Name
-
+
workgroup = MDKGROUP
# netbios name is the name you will see in "Network Neighbourhood",
@@ -24,7 +24,7 @@
; netbios name = <name_of_this_server>
# server string is the equivalent of the NT Description field
-
+
server string = Samba Server %v
# Message command is run by samba when a "popup" message is sent to it.
@@ -36,20 +36,20 @@
# (as cups is now used in linux-mandrake 7.2 by default)
# if you want to automatically load your printer list rather
# than setting them up individually then you'll need this
-
+
printcap name = lpstat
load printers = yes
# It should not be necessary to spell out the print system type unless
# yours is non-standard. Currently supported print systems include:
# bsd, sysv, plp, lprng, aix, hpux, qnx, cups
-
+
printing = cups
# Samba 2.2 supports the Windows NT-style point-and-print feature. To
# use this, you need to be able to upload print drivers to the samba
# server. The printer admins (or root) may install drivers onto samba.
-# Note that this feature uses the print$ share, so you will need to
+# Note that this feature uses the print$ share, so you will need to
# enable it below.
# This parameter works like domain admin group:
# printer admin = @<group> <user>
@@ -92,7 +92,7 @@
# Use password server option only with security = server or security = # domain
# When using security = domain, you should use password server = *
-; password server =
+; password server =
; password server = *
# Password Level allows matching of _n_ characters of the password for
@@ -122,7 +122,7 @@
# enable pam password change
; pam password change = yes
; passwd program = /usr/bin/passwd %u
-; passwd chat = *New*UNIX*password* %n\n *ReType*new*UNIX*password*
+; passwd chat = *New*UNIX*password* %n\n *ReType*new*UNIX*password*
# %n\n
;*passwd:*all*authentication*tokens*updated*successfully*
@@ -137,7 +137,7 @@
# Options for using winbind. Winbind allows you to do all account and
# authentication from a Windows or samba domain controller, creating
# accounts on the fly, and maintaining a mapping of Windows RIDs to
-# unix uid's
+# unix uid's
# and gid's. winbind uid and winbind gid are the only required
# parameters.
#
@@ -163,8 +163,8 @@
; template homedir = /home/%D/%U
# When using winbind, you may want to have samba create home
-# directories on the fly for authenticated users. Ensure that
-# /etc/pam.d/samba is using 'service=system-auth-winbind' in pam_stack
+# directories on the fly for authenticated users. Ensure that
+# /etc/pam.d/samba is using 'service=system-auth-winbind' in pam_stack
# modules, and then enable obedience of pam restrictions below:
; obey pam restrictions = yes
@@ -181,7 +181,7 @@
# Configure Samba to use multiple interfaces
# If you have multiple network interfaces then you must list them
# here. See the man page for details.
-; interfaces = 192.168.12.2/24 192.168.13.2/24
+; interfaces = 192.168.12.2/24 192.168.13.2/24
# Configure remote browse list synchronisation here
# request announcement to, or browse list sync from:
@@ -201,14 +201,14 @@
# Domain Master specifies Samba to be the Domain Master Browser. This
# allows Samba to collate browse lists between subnets. Don't use this
# if you already have a Windows NT domain controller doing this job
-; domain master = yes
+; domain master = yes
# Preferred Master causes Samba to force a local browser election on
# startup and gives it a slightly higher chance of winning the election
; preferred master = yes
# 6. Domain Control Options:
-# Enable this if you want Samba to be a domain logon server for
+# Enable this if you want Samba to be a domain logon server for
# Windows95 workstations or Primary Domain Controller for WinNT and
# Win2k
@@ -232,16 +232,16 @@
; logon home = \\%L\%U\.profile
# The add user script is used by a domain member to add local user
-# accounts that have been authenticated by the domain controller, or by
-# the domain controller to add local machine accounts when adding
+# accounts that have been authenticated by the domain controller, or by
+# the domain controller to add local machine accounts when adding
# machines to the domain.
# The script must work from the command line when replacing the macros,
-# or the operation will fail. Check that groups exist if forcing a
+# or the operation will fail. Check that groups exist if forcing a
# group.
# Script for domain controller for adding machines:
; add user script = /usr/sbin/useradd -d /dev/null -g machines –c
# 'Machine Account' -s /bin/false -M %u
-# Script for domain controller with LDAP backend for adding machines
+# Script for domain controller with LDAP backend for adding machines
#(please
# configure in /etc/samba/smbldap_conf.pm first):
; add user script = /usr/share/samba/scripts/smbldap-useradd.pl -w –d
@@ -264,7 +264,7 @@
# LDAP configuration for Domain Controlling:
# The account (dn) that samba uses to access the LDAP server
# This account needs to have write access to the LDAP tree
-# You will need to give samba the password for this dn, by
+# You will need to give samba the password for this dn, by
# running 'smbpasswd -w mypassword'
; ldap admin dn = cn=root,dc=mydomain,dc=com
; ldap ssl = start_tls
@@ -277,16 +277,16 @@
# 7. Name Resolution Options:
# All NetBIOS names must be resolved to IP Addresses
# 'Name Resolve Order' allows the named resolution mechanism to be
-# specified the default order is "host lmhosts wins bcast". "host"
-# means use the unix system gethostbyname() function call that will use
-# either /etc/hosts OR DNS or NIS depending on the settings of
+# specified the default order is "host lmhosts wins bcast". "host"
+# means use the unix system gethostbyname() function call that will use
+# either /etc/hosts OR DNS or NIS depending on the settings of
# /etc/host.config, /etc/nsswitch.conf
-# and the /etc/resolv.conf file. "host" therefore is system
-# configuration dependant. This parameter is most often of use to
+# and the /etc/resolv.conf file. "host" therefore is system
+# configuration dependant. This parameter is most often of use to
# prevent DNS lookups
# in order to resolve NetBIOS names to IP Addresses. Use with care!
# The example below excludes use of name resolution for machines that
-# are NOT on the local network segment - OR - are not deliberately to
+# are NOT on the local network segment - OR - are not deliberately to
# be known via lmhosts or via WINS.
; name resolve order = wins lmhosts bcast
@@ -296,7 +296,7 @@
; wins support = yes
# WINS Server - Tells the NMBD components of Samba to be a WINS Client
-# Note: Samba can be either a WINS Server, or a WINS Client, but
+# Note: Samba can be either a WINS Server, or a WINS Client, but
# NOT both
; wins server = w.x.y.z
@@ -305,11 +305,11 @@
# at least one WINS Server on the network. The default is NO.
; wins proxy = yes
-# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS
-# names via DNS nslookups. The built-in default for versions 1.9.17 is
+# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS
+# names via DNS nslookups. The built-in default for versions 1.9.17 is
# yes, this has been changed in version 1.9.18 to no.
- dns proxy = no
+ dns proxy = no
# 8. File Naming Options:
# Case Preservation can be handy - system default is _no_
@@ -325,7 +325,7 @@
# you can match a Windows code page with a UNIX character set.
# Windows: 437 (US), 737 (GREEK), 850 (Latin1 - Western European),
# 852 (Eastern Eu.), 861 (Icelandic), 932 (Cyrillic - Russian),
-# 936 (Japanese - Shift-JIS), 936 (Simpl. Chinese), 949 (Korean
+# 936 (Japanese - Shift-JIS), 936 (Simpl. Chinese), 949 (Korean
# Hangul),
# 950 (Trad. Chin.).
# UNIX: ISO8859-1 (Western European), ISO8859-2 (Eastern Eu.),
@@ -373,7 +373,7 @@
; guest ok = yes
-# NOTE: If you have a CUPS print system there is no need to
+# NOTE: If you have a CUPS print system there is no need to
# specifically define each individual printer.
# You must configure the samba printers with the appropriate Windows
# drivers on your Windows clients. On the Samba server no filtering is
@@ -395,9 +395,9 @@
# print command: see above for details.
# =====================================
- print command = lpr-cups -P %p -o raw %s -r
+ print command = lpr-cups -P %p -o raw %s -r
# using client side printer drivers.
-; print command = lpr-cups -P %p %s
+; print command = lpr-cups -P %p %s
# using cups own drivers (use generic PostScript on clients).
# The following two commands are the samba defaults for printing=cups
# change them only if you need different options:
@@ -406,11 +406,11 @@
# This share is used for Windows NT-style point-and-print support.
# To be able to install drivers, you need to be either root, or listed
-# in the printer admin parameter above. Note that you also need write
-# access to the directory and share definition to be able to upload the
+# in the printer admin parameter above. Note that you also need write
+# access to the directory and share definition to be able to upload the
# drivers.
# For more information on this, please see the Printing Support Section
-# of /usr/share/doc/samba-/docs/Samba-HOWTO-Collection.pdf
+# of /usr/share/doc/samba-/docs/Samba-HOWTO-Collection.pdf
[print$]
path = /var/lib/samba/printers
@@ -419,7 +419,7 @@
write list = @adm root
# A useful application of samba is to make a PDF-generation service
-# To streamline this, install windows postscript drivers (preferably
+# To streamline this, install windows postscript drivers (preferably
# colour)on the samba server, so that clients can automatically install
# them.
@@ -455,11 +455,11 @@
# Uncomment next line.
; vfs object = /usr/lib/samba/vfs/audit.so
-# Other examples.
+# Other examples.
#
# A private printer, usable only by Fred. Spool data will be placed in
# Fred's
-# home directory. Note that fred must have write access to the spool
+# home directory. Note that fred must have write access to the spool
# directory,
# wherever it is.
;[fredsprn]
@@ -473,7 +473,7 @@
-----------------------------------------------------------
-# A private directory, usable only by Fred. Note that Fred requires
+# A private directory, usable only by Fred. Note that Fred requires
# write access to the directory.
;[fredsdir]
@@ -493,8 +493,8 @@
-----------------------------------------------------------
-# a service which has a different directory for each machine that
-# connects this allows you to tailor configurations to incoming
+# a service which has a different directory for each machine that
+# connects this allows you to tailor configurations to incoming
# machines. You could also use the %u option to tailor it by user name.
# The %m gets replaced with the machine name that is connecting.
;[pchome]
@@ -506,10 +506,10 @@
-----------------------------------------------------------
# A publicly accessible directory, read/write to all users. Note that
-# all files created in the directory by users will be owned by the
-# default user, so any user with access can delete any other user's
-# files. Obviously this directory must be writable by the default user.
-# Another user could of course be specified, in which case all files
+# all files created in the directory by users will be owned by the
+# default user, so any user with access can delete any other user's
+# files. Obviously this directory must be writable by the default user.
+# Another user could of course be specified, in which case all files
# would be owned by that user instead.
;[public]
@@ -521,10 +521,10 @@
-----------------------------------------------------------
-# The following two entries demonstrate how to share a directory so
-# that two users can place files there that will be owned by the
-# specific users. In this setup, the directory should be writable by
-# both users and should have the sticky bit set on it to prevent abuse.
+# The following two entries demonstrate how to share a directory so
+# that two users can place files there that will be owned by the
+# specific users. In this setup, the directory should be writable by
+# both users and should have the sticky bit set on it to prevent abuse.
# Obviously this could be extended to as many users as required.
;[myshare]
« no previous file with comments | « Lib/lib2to3/Grammar.txt ('k') | Lib/test/cfgparser.3 » ('j') | no next file with comments »

RSS Feeds Recent Issues | This issue
This is Rietveld 894c83f36cb7+