[Pkg-samba-maint] r1737 - trunk/samba/debian
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Sat Mar 8 23:28:58 UTC 2008
Author: vorlon
Date: 2008-03-08 23:28:57 +0000 (Sat, 08 Mar 2008)
New Revision: 1737
Added:
trunk/samba/debian/smb.conf.dapper
trunk/samba/debian/smb.conf.etch
trunk/samba/debian/smb.conf.gutsy
Modified:
trunk/samba/debian/changelog
trunk/samba/debian/control
trunk/samba/debian/samba-common.config
trunk/samba/debian/samba-common.postinst
trunk/samba/debian/samba-common.postrm
trunk/samba/debian/smb.conf
Log:
* Convert handling of smb.conf to use ucf, so that we can sanely manage
syntax changes going forward.
* In the process, fix the dhcp handling to allow proper reconfiguration
via debconf.
Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog 2008-03-08 21:29:16 UTC (rev 1736)
+++ trunk/samba/debian/changelog 2008-03-08 23:28:57 UTC (rev 1737)
@@ -4,6 +4,10 @@
* Add missing eventlogadm(8) manpage.
* Refresh the list of Linux architectures from type-handling, to pick up
libacl-dev on armel. Closes: #465121.
+ * Convert handling of smb.conf to use ucf, so that we can sanely manage
+ syntax changes going forward.
+ * In the process, fix the dhcp handling to allow proper reconfiguration
+ via debconf.
[ Debconf translations ]
* Indonesian added. Closes: #469976
Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control 2008-03-08 21:29:16 UTC (rev 1736)
+++ trunk/samba/debian/control 2008-03-08 23:28:57 UTC (rev 1737)
@@ -46,7 +46,7 @@
Package: samba-common
Architecture: any
-Depends: libpam-modules, ${shlibs:Depends}, ${misc:Depends}
+Depends: libpam-modules, ucf, ${shlibs:Depends}, ${misc:Depends}
Replaces: samba (<< 3.0.20b-1)
Description: Samba common files used by both the server and the client
The Samba software suite is a collection of programs that
Modified: trunk/samba/debian/samba-common.config
===================================================================
--- trunk/samba/debian/samba-common.config 2008-03-08 21:29:16 UTC (rev 1736)
+++ trunk/samba/debian/samba-common.config 2008-03-08 23:28:57 UTC (rev 1737)
@@ -88,16 +88,19 @@
# DHCPPRIORITY=high
fi
-if [ ! -f $FILE ] || grep -q -i 'wins server' $FILE
+FOUND=false
+if [ -f $FILE ]; then
+ if grep -q 'include[[:space:]]*=[[:space:]]*/etc/samba/dhcp.conf' $FILE
+ then
+ FOUND=true
+ fi
+ db_set samba-common/dhcp $FOUND
+fi
+
+# we only prompt in one of three cases: the file doesn't exist yet, it
+# has the context we need to add our include line, or the include line
+# is already present.
+if [ ! -f $FILE ] || grep -q -i 'wins server' $FILE || [ "$FOUND" = "true" ];
then
- # check the values before and after; unset the 'applied' flag
- # if they don't match.
- db_get samba-common/dhcp || true
- OLDDHCP="$RET"
db_input $DHCPPRIORITY samba-common/dhcp || true
- db_go
- db_get samba-common/dhcp || true
- if [ "$OLDDHCP" != "$RET" ]; then
- db_fset samba-common/dhcp applied false
- fi
fi
Modified: trunk/samba/debian/samba-common.postinst
===================================================================
--- trunk/samba/debian/samba-common.postinst 2008-03-08 21:29:16 UTC (rev 1736)
+++ trunk/samba/debian/samba-common.postinst 2008-03-08 23:28:57 UTC (rev 1737)
@@ -7,20 +7,23 @@
# Do debconf stuff here
. /usr/share/debconf/confmodule
+TEMPDIR=/var/run/samba/upgrades
+NEWFILE=$TEMPDIR/smb.conf
CONFIG=/etc/samba/smb.conf
-# We need a default smb.conf file. If one doesn't exist we put in place
-# one that has some basic defaults.
-if [ ! -e "$CONFIG" ]; then
- cp -a /usr/share/samba/smb.conf $CONFIG
-fi
-
# ------------------------- Debconf questions start ---------------------
-# Is the user configuring with debconf, or he/she prefers swat/manual
-# config?
-db_get samba-common/do_debconf || true
-if [ "${RET}" = "true" ]; then
+configure_smb_conf() {
+ local CONFIG
+ CONFIG="$1"
+
+ # Is the user configuring with debconf, or he/she prefers
+ # swat/manual config?
+ db_get samba-common/do_debconf || true
+ if [ "${RET}" != "true" ]; then
+ return 0
+ fi
+
# Get workgroup name
db_get samba-common/workgroup || true
WORKGROUP="${RET}"
@@ -48,9 +51,8 @@
"$CONFIG"
# Install DHCP support
- db_get samba-common/dhcp && DHCPVAL="$RET"
- db_fget samba-common/dhcp applied || true
- if [ "$DHCPVAL" = true ] && [ "$RET" != true ] && \
+ db_get samba-common/dhcp
+ if [ "$RET" = true ] && \
! grep -q dhcp.conf "$CONFIG"
then
sed -i -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
@@ -60,16 +62,12 @@
# If we receive WINS server info from DHCP, override the options above. \\
include = /etc/samba/dhcp.conf
}" "$CONFIG"
- elif [ "$RET" != true ] && grep -q dhcp.conf "$CONFIG"
- then
- :
- # FIXME: here we /delete/ the lines?
+ elif [ "$RET" != true ]; then
+ sed -i -e '
+ /^#[[:space:]]*If we receive WINS server info from DHCP, override the options above/d
+ /^#*[[:space:]]*include[[:space:]]*=[[:space:]]*/etc/samba/dhcp.conf/d
+ ' "$CONFIG"
fi
- # Once we get here, the config has been applied, whatever
- # it is.
- if [ "$RET" != true ]; then
- db_fset samba-common/dhcp applied true
- fi
if [ -n "$2" ] && dpkg --compare-versions "$2" lt 3.0.23b-2 \
&& grep -qi "^[[:space:]]*passdb backend[[:space:]]*=.*guest" "$CONFIG"
@@ -79,8 +77,38 @@
s/^\([[:space:]]*passdb backend[[:space:]]*=[^,]*\),\?[[:space:]]*guest[[:space:]]*$/\1/i" \
"$CONFIG"
fi
+}
+
+
+if [ -e "$CONFIG" ]; then
+ configure_smb_conf "$CONFIG"
fi
+mkdir -p "$TEMPDIR"
+
+if [ -n "$2" ] && dpkg --compare-versions "$2" lt 3.0.28-2; then
+ if dpkg --compare-versions "$2" lt 3.0.26a-1 && [ "$2" != "${2%ubuntu*}" ]
+ then
+ base=dapper
+ elif [ "$2" != "${2%ubuntu*}" ]
+ then
+ base=gutsy
+ else
+ base=etch
+ fi
+
+ TEMPLATE=/usr/share/samba/smb.conf.${base}
+
+ cp "$TEMPLATE" "$NEWFILE"
+ configure_smb_conf "$NEWFILE"
+ ucf --debconf-ok "$NEWFILE" "$CONFIG"
+fi
+
+cp /usr/share/samba/smb.conf "$NEWFILE"
+configure_smb_conf "$NEWFILE"
+ucf --three-way --debconf-ok "$NEWFILE" "$CONFIG"
+ucfr samba-common "$CONFIG"
+
chmod a+r "$CONFIG"
# ------------------------- Debconf questions end ---------------------
Modified: trunk/samba/debian/samba-common.postrm
===================================================================
--- trunk/samba/debian/samba-common.postrm 2008-03-08 21:29:16 UTC (rev 1736)
+++ trunk/samba/debian/samba-common.postrm 2008-03-08 23:28:57 UTC (rev 1737)
@@ -2,6 +2,12 @@
if [ "$1" = purge ]; then
rm -rf /etc/samba/ /var/cache/samba/ /var/lib/samba/ /var/run/samba/
+ if [ -x "`which ucf 2>/dev/null`" ]; then
+ ucf --purge /etc/samba/smb.conf
+ fi
+ if [ -x "`which ucfr 2>/dev/null`" ]; then
+ ucfr --purge samba-common /etc/samba/smb.conf
+ fi
fi
#DEBHELPER#
Modified: trunk/samba/debian/smb.conf
===================================================================
--- trunk/samba/debian/smb.conf 2008-03-08 21:29:16 UTC (rev 1736)
+++ trunk/samba/debian/smb.conf 2008-03-08 23:28:57 UTC (rev 1737)
@@ -106,18 +106,18 @@
# This boolean parameter controls whether Samba attempts to sync the Unix
# password with the SMB password when the encrypted SMB password in the
# passdb is changed.
-; unix password sync = no
+ unix password sync = yes
# For Unix password sync to work on a Debian GNU/Linux system, the following
# parameters must be set (thanks to Ian Kahan <<kahan at informatik.tu-muenchen.de> for
# sending the correct chat script for the passwd program in Debian Sarge).
passwd program = /usr/bin/passwd %u
- passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n *password\supdated\ssuccessfully* .
+ passwd chat = *Enter\snew\s*\spassword:* %n\n *Retype\snew\s*\spassword:* %n\n *password\supdated\ssuccessfully* .
# This boolean controls whether PAM will be used for password changes
# when requested by an SMB client instead of the program listed in
# 'passwd program'. The default is 'no'.
-; pam password change = no
+ pam password change = yes
########## Domains ###########
Added: trunk/samba/debian/smb.conf.dapper
===================================================================
--- trunk/samba/debian/smb.conf.dapper (rev 0)
+++ trunk/samba/debian/smb.conf.dapper 2008-03-08 23:28:57 UTC (rev 1737)
@@ -0,0 +1,299 @@
+#
+# Sample configuration file for the Samba suite for Debian GNU/Linux.
+#
+#
+# This is the main Samba configuration file. You should read the
+# smb.conf(5) manual page in order to understand the options listed
+# here. Samba has a huge number of configurable options most of which
+# are not shown in this example
+#
+# 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 commentary 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.
+#
+
+#======================= Global Settings =======================
+
+[global]
+
+## Browsing/Identification ###
+
+# Change this to the workgroup/NT-domain name your Samba server will part of
+ workgroup = DEBIAN_FANS
+
+# server string is the equivalent of the NT Description field
+ server string = %h server (Samba, Ubuntu)
+
+# Windows Internet Name Serving Support Section:
+# WINS Support - Tells the NMBD component of Samba to enable its WINS Server
+; wins support = no
+
+# 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 NOT both
+; wins server = w.x.y.z
+
+# This will prevent nmbd to search for NetBIOS names through DNS.
+ dns proxy = no
+
+# What naming service and in what order should we use to resolve host names
+# to IP addresses
+; name resolve order = lmhosts host wins bcast
+
+#### Networking ####
+
+# The specific set of interfaces / networks to bind to
+# This can be either the interface name or an IP address/netmask;
+# interface names are normally preferred
+; interfaces = 127.0.0.0/8 eth0
+
+# Only bind to the named interfaces and/or networks; you must use the
+# 'interfaces' option above to use this.
+# It is recommended that you enable this feature if your Samba machine is
+# not protected by a firewall or is a firewall itself. However, this
+# option cannot handle dynamic or non-broadcast interfaces correctly.
+; bind interfaces only = true
+
+
+
+#### Debugging/Accounting ####
+
+# This tells Samba to use a separate log file for each machine
+# that connects
+ log file = /var/log/samba/log.%m
+
+# Put a capping on the size of the log files (in Kb).
+ max log size = 1000
+
+# If you want Samba to only log through syslog then set the following
+# parameter to 'yes'.
+; syslog only = no
+
+# We want Samba to log a minimum amount of information to syslog. Everything
+# should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log
+# through syslog you should set the following parameter to something higher.
+ syslog = 0
+
+# Do something sensible when Samba crashes: mail the admin a backtrace
+ panic action = /usr/share/samba/panic-action %d
+
+
+####### Authentication #######
+
+# "security = user" is always a good idea. This will require a Unix account
+# in this server for every user accessing the server. See
+# /usr/share/doc/samba-doc/htmldocs/Samba-HOWTO-Collection/ServerType.html
+# in the samba-doc package for details.
+; security = user
+
+# You may wish to use password encryption. See the section on
+# 'encrypt passwords' in the smb.conf(5) manpage before enabling.
+ encrypt passwords = no
+
+# If you are using encrypted passwords, Samba will need to know what
+# password database type you are using.
+ passdb backend = tdbsam
+
+ obey pam restrictions = yes
+
+; guest account = nobody
+ invalid users = root
+
+# This boolean parameter controls whether Samba attempts to sync the Unix
+# password with the SMB password when the encrypted SMB password in the
+# passdb is changed.
+; unix password sync = no
+
+# For Unix password sync to work on a Debian GNU/Linux system, the following
+# parameters must be set (thanks to Ian Kahan <<kahan at informatik.tu-muenchen.de> for
+# sending the correct chat script for the passwd program in Debian Sarge).
+ passwd program = /usr/bin/passwd %u
+ passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n *password\supdated\ssuccessfully* .
+
+# This boolean controls whether PAM will be used for password changes
+# when requested by an SMB client instead of the program listed in
+# 'passwd program'. The default is 'no'.
+; pam password change = no
+
+########## Domains ###########
+
+# Is this machine able to authenticate users. Both PDC and BDC
+# must have this setting enabled. If you are the BDC you must
+# change the 'domain master' setting to no
+#
+; domain logons = yes
+#
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the location of the user's profile directory
+# from the client point of view)
+# The following required a [profiles] share to be setup on the
+# samba server (see below)
+; logon path = \\%N\profiles\%U
+# Another common choice is storing the profile in the user's home directory
+; logon path = \\%N\%U\profile
+
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the location of a user's home directory (from the client
+# point of view)
+; logon drive = H:
+; logon home = \\%N\%U
+
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the script to run during logon. The script must be stored
+# in the [netlogon] share
+# NOTE: Must be store in 'DOS' file format convention
+; logon script = logon.cmd
+
+# This allows Unix users to be created on the domain controller via the SAMR
+# RPC pipe. The example command creates a user account with a disabled Unix
+# password; please adapt to your needs
+; add user script = /usr/sbin/adduser --quiet --disabled-password --gecos "" %u
+
+########## Printing ##########
+
+# If you want to automatically load your printer list rather
+# than setting them up individually then you'll need this
+; load printers = yes
+
+# lpr(ng) printing. You may wish to override the location of the
+# printcap file
+; printing = bsd
+; printcap name = /etc/printcap
+
+# CUPS printing. See also the cupsaddsmb(8) manpage in the
+# cupsys-client package.
+; printing = cups
+; printcap name = cups
+
+# When using [print$], root is implicitly a 'printer admin', but you can
+# also give this right to other users to add drivers and set printer
+# properties
+; printer admin = @lpadmin
+
+
+############ Misc ############
+
+# Using the following line enables you to customise your configuration
+# on a per machine basis. The %m gets replaced with the netbios name
+# of the machine that is connecting
+; include = /home/samba/etc/smb.conf.%m
+
+# Most people will find that this option gives better performance.
+# See smb.conf(5) and /usr/share/doc/samba-doc/htmldocs/speed.html
+# for details
+# You may want to add the following on a Linux system:
+# SO_RCVBUF=8192 SO_SNDBUF=8192
+ socket options = TCP_NODELAY
+
+# The following parameter is useful only if you have the linpopup package
+# installed. The samba maintainer and the linpopup maintainer are
+# working to ease installation and configuration of linpopup and samba.
+; message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' &
+
+# Domain Master specifies Samba to be the Domain Master Browser. If this
+# machine will be configured as a BDC (a secondary logon server), you
+# must set this to 'no'; otherwise, the default behavior is recommended.
+; domain master = auto
+
+# Some defaults for winbind (make sure you're not using the ranges
+# for something else.)
+; idmap uid = 10000-20000
+; idmap gid = 10000-20000
+; template shell = /bin/bash
+
+#======================= Share Definitions =======================
+
+# Un-comment the following (and tweak the other settings below to suit)
+# to enable the default home directory shares. This will share each
+# user's home directory as \\server\username
+;[homes]
+; comment = Home Directories
+; browseable = no
+
+# By default, \\server\username shares can be connected to by anyone
+# with access to the samba server. Un-comment the following parameter
+# to make sure that only "username" can connect to \\server\username
+; valid users = %S
+
+# By default, the home directories are exported read-only. Change next
+# parameter to 'yes' if you want to be able to write to them.
+; writable = no
+
+# File creation mask is set to 0600 for security reasons. If you want to
+# create files with group=rw permissions, set next parameter to 0664.
+; create mask = 0600
+
+# Directory creation mask is set to 0700 for security reasons. If you want to
+# create dirs. with group=rw permissions, set next parameter to 0775.
+; directory mask = 0700
+
+# Un-comment the following and create the netlogon directory for Domain Logons
+# (you need to configure Samba to act as a domain controller too.)
+;[netlogon]
+; comment = Network Logon Service
+; path = /home/samba/netlogon
+; guest ok = yes
+; writable = no
+; share modes = no
+
+# Un-comment the following and create the profiles directory to store
+# users profiles (see the "logon path" option above)
+# (you need to configure Samba to act as a domain controller too.)
+# The path below should be writable by all users so that their
+# profile directory may be created the first time they log on
+;[profiles]
+; comment = Users profiles
+; path = /home/samba/profiles
+; guest ok = no
+; browseable = no
+; create mask = 0600
+; directory mask = 0700
+
+[printers]
+ comment = All Printers
+ browseable = no
+ path = /tmp
+ printable = yes
+ public = no
+ writable = no
+ create mode = 0700
+
+# Windows clients look for this share name as a source of downloadable
+# printer drivers
+[print$]
+ comment = Printer Drivers
+ path = /var/lib/samba/printers
+ browseable = yes
+ read only = yes
+ guest ok = no
+# Uncomment to allow remote administration of Windows print drivers.
+# Replace 'ntadmin' with the name of the group your admin users are
+# members of.
+; write list = root, @ntadmin
+
+# A sample share for sharing your CD-ROM with others.
+;[cdrom]
+; comment = Samba server's CD-ROM
+; writable = no
+; locking = no
+; path = /cdrom
+; public = yes
+
+# The next two parameters show how to auto-mount a CD-ROM when the
+# cdrom share is accesed. For this to work /etc/fstab must contain
+# an entry like this:
+#
+# /dev/scd0 /cdrom iso9660 defaults,noauto,ro,user 0 0
+#
+# The CD-ROM gets unmounted automatically after the connection to the
+#
+# If you don't want to use auto-mounting/unmounting make sure the CD
+# is mounted on /cdrom
+#
+; preexec = /bin/mount /cdrom
+; postexec = /bin/umount /cdrom
+
Added: trunk/samba/debian/smb.conf.etch
===================================================================
--- trunk/samba/debian/smb.conf.etch (rev 0)
+++ trunk/samba/debian/smb.conf.etch 2008-03-08 23:28:57 UTC (rev 1737)
@@ -0,0 +1,305 @@
+#
+# Sample configuration file for the Samba suite for Debian GNU/Linux.
+#
+#
+# This is the main Samba configuration file. You should read the
+# smb.conf(5) manual page in order to understand the options listed
+# here. Samba has a huge number of configurable options most of which
+# are not shown in this example
+#
+# 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 commentary 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.
+#
+
+#======================= Global Settings =======================
+
+[global]
+
+## Browsing/Identification ###
+
+# Change this to the workgroup/NT-domain name your Samba server will part of
+ workgroup = WORKGROUP
+
+# server string is the equivalent of the NT Description field
+ server string = %h server
+
+# Windows Internet Name Serving Support Section:
+# WINS Support - Tells the NMBD component of Samba to enable its WINS Server
+; wins support = no
+
+# 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 NOT both
+; wins server = w.x.y.z
+
+# This will prevent nmbd to search for NetBIOS names through DNS.
+ dns proxy = no
+
+# What naming service and in what order should we use to resolve host names
+# to IP addresses
+; name resolve order = lmhosts host wins bcast
+
+#### Networking ####
+
+# The specific set of interfaces / networks to bind to
+# This can be either the interface name or an IP address/netmask;
+# interface names are normally preferred
+; interfaces = 127.0.0.0/8 eth0
+
+# Only bind to the named interfaces and/or networks; you must use the
+# 'interfaces' option above to use this.
+# It is recommended that you enable this feature if your Samba machine is
+# not protected by a firewall or is a firewall itself. However, this
+# option cannot handle dynamic or non-broadcast interfaces correctly.
+; bind interfaces only = true
+
+
+
+#### Debugging/Accounting ####
+
+# This tells Samba to use a separate log file for each machine
+# that connects
+ log file = /var/log/samba/log.%m
+
+# Put a capping on the size of the log files (in Kb).
+ max log size = 1000
+
+# If you want Samba to only log through syslog then set the following
+# parameter to 'yes'.
+; syslog only = no
+
+# We want Samba to log a minimum amount of information to syslog. Everything
+# should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log
+# through syslog you should set the following parameter to something higher.
+ syslog = 0
+
+# Do something sensible when Samba crashes: mail the admin a backtrace
+ panic action = /usr/share/samba/panic-action %d
+
+
+####### Authentication #######
+
+# "security = user" is always a good idea. This will require a Unix account
+# in this server for every user accessing the server. See
+# /usr/share/doc/samba-doc/htmldocs/Samba3-HOWTO/ServerType.html
+# in the samba-doc package for details.
+; security = user
+
+# You may wish to use password encryption. See the section on
+# 'encrypt passwords' in the smb.conf(5) manpage before enabling.
+ encrypt passwords = no
+
+# If you are using encrypted passwords, Samba will need to know what
+# password database type you are using.
+ passdb backend = tdbsam
+
+ obey pam restrictions = yes
+
+; guest account = nobody
+ invalid users = root
+
+# This boolean parameter controls whether Samba attempts to sync the Unix
+# password with the SMB password when the encrypted SMB password in the
+# passdb is changed.
+; unix password sync = no
+
+# For Unix password sync to work on a Debian GNU/Linux system, the following
+# parameters must be set (thanks to Ian Kahan <<kahan at informatik.tu-muenchen.de> for
+# sending the correct chat script for the passwd program in Debian Sarge).
+ passwd program = /usr/bin/passwd %u
+ passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n *password\supdated\ssuccessfully* .
+
+# This boolean controls whether PAM will be used for password changes
+# when requested by an SMB client instead of the program listed in
+# 'passwd program'. The default is 'no'.
+; pam password change = no
+
+########## Domains ###########
+
+# Is this machine able to authenticate users. Both PDC and BDC
+# must have this setting enabled. If you are the BDC you must
+# change the 'domain master' setting to no
+#
+; domain logons = yes
+#
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the location of the user's profile directory
+# from the client point of view)
+# The following required a [profiles] share to be setup on the
+# samba server (see below)
+; logon path = \\%N\profiles\%U
+# Another common choice is storing the profile in the user's home directory
+; logon path = \\%N\%U\profile
+
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the location of a user's home directory (from the client
+# point of view)
+; logon drive = H:
+; logon home = \\%N\%U
+
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the script to run during logon. The script must be stored
+# in the [netlogon] share
+# NOTE: Must be store in 'DOS' file format convention
+; logon script = logon.cmd
+
+# This allows Unix users to be created on the domain controller via the SAMR
+# RPC pipe. The example command creates a user account with a disabled Unix
+# password; please adapt to your needs
+; add user script = /usr/sbin/adduser --quiet --disabled-password --gecos "" %u
+
+########## Printing ##########
+
+# If you want to automatically load your printer list rather
+# than setting them up individually then you'll need this
+; load printers = yes
+
+# lpr(ng) printing. You may wish to override the location of the
+# printcap file
+; printing = bsd
+; printcap name = /etc/printcap
+
+# CUPS printing. See also the cupsaddsmb(8) manpage in the
+# cupsys-client package.
+; printing = cups
+; printcap name = cups
+
+# When using [print$], root is implicitly a 'printer admin', but you can
+# also give this right to other users to add drivers and set printer
+# properties
+; printer admin = @ntadmin
+
+
+############ Misc ############
+
+# Using the following line enables you to customise your configuration
+# on a per machine basis. The %m gets replaced with the netbios name
+# of the machine that is connecting
+; include = /home/samba/etc/smb.conf.%m
+
+# Most people will find that this option gives better performance.
+# See smb.conf(5) and /usr/share/doc/samba-doc/htmldocs/Samba3-HOWTO/speed.html
+# for details
+# You may want to add the following on a Linux system:
+# SO_RCVBUF=8192 SO_SNDBUF=8192
+ socket options = TCP_NODELAY
+
+# The following parameter is useful only if you have the linpopup package
+# installed. The samba maintainer and the linpopup maintainer are
+# working to ease installation and configuration of linpopup and samba.
+; message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' &
+
+# Domain Master specifies Samba to be the Domain Master Browser. If this
+# machine will be configured as a BDC (a secondary logon server), you
+# must set this to 'no'; otherwise, the default behavior is recommended.
+; domain master = auto
+
+# Some defaults for winbind (make sure you're not using the ranges
+# for something else.)
+; idmap uid = 10000-20000
+; idmap gid = 10000-20000
+; template shell = /bin/bash
+;
+; The following was the default behaviour in sarge
+; but samba upstream reverted the default because it might induce
+; performance issues in large organizations
+; See #368251 for some of the consequences of *not* having
+; this setting and smb.conf(5) for all details
+;
+; winbind enum groups = yes
+; winbind enum users = yes
+
+#======================= Share Definitions =======================
+
+[homes]
+ comment = Home Directories
+ browseable = no
+
+# By default, the home directories are exported read-only. Change next
+# parameter to 'yes' if you want to be able to write to them.
+ writable = no
+
+# File creation mask is set to 0700 for security reasons. If you want to
+# create files with group=rw permissions, set next parameter to 0775.
+ create mask = 0700
+
+# Directory creation mask is set to 0700 for security reasons. If you want to
+# create dirs. with group=rw permissions, set next parameter to 0775.
+ directory mask = 0700
+
+# Restrict access to home directories
+# to the one of the authenticated user
+# This might need tweaking when using external authentication schemes
+ valid users = %S
+
+# Un-comment the following and create the netlogon directory for Domain Logons
+# (you need to configure Samba to act as a domain controller too.)
+;[netlogon]
+; comment = Network Logon Service
+; path = /home/samba/netlogon
+; guest ok = yes
+; writable = no
+; share modes = no
+
+# Un-comment the following and create the profiles directory to store
+# users profiles (see the "logon path" option above)
+# (you need to configure Samba to act as a domain controller too.)
+# The path below should be writable by all users so that their
+# profile directory may be created the first time they log on
+;[profiles]
+; comment = Users profiles
+; path = /home/samba/profiles
+; guest ok = no
+; browseable = no
+; create mask = 0600
+; directory mask = 0700
+
+[printers]
+ comment = All Printers
+ browseable = no
+ path = /var/spool/samba
+ printable = yes
+ public = no
+ writable = no
+ create mode = 0700
+
+# Windows clients look for this share name as a source of downloadable
+# printer drivers
+[print$]
+ comment = Printer Drivers
+ path = /var/lib/samba/printers
+ browseable = yes
+ read only = yes
+ guest ok = no
+# Uncomment to allow remote administration of Windows print drivers.
+# Replace 'ntadmin' with the name of the group your admin users are
+# members of.
+; write list = root, @ntadmin
+
+# A sample share for sharing your CD-ROM with others.
+;[cdrom]
+; comment = Samba server's CD-ROM
+; writable = no
+; locking = no
+; path = /cdrom
+; public = yes
+
+# The next two parameters show how to auto-mount a CD-ROM when the
+# cdrom share is accesed. For this to work /etc/fstab must contain
+# an entry like this:
+#
+# /dev/scd0 /cdrom iso9660 defaults,noauto,ro,user 0 0
+#
+# The CD-ROM gets unmounted automatically after the connection to the
+#
+# If you don't want to use auto-mounting/unmounting make sure the CD
+# is mounted on /cdrom
+#
+; preexec = /bin/mount /cdrom
+; postexec = /bin/umount /cdrom
+
Added: trunk/samba/debian/smb.conf.gutsy
===================================================================
--- trunk/samba/debian/smb.conf.gutsy (rev 0)
+++ trunk/samba/debian/smb.conf.gutsy 2008-03-08 23:28:57 UTC (rev 1737)
@@ -0,0 +1,309 @@
+#
+# Sample configuration file for the Samba suite for Debian GNU/Linux.
+#
+#
+# This is the main Samba configuration file. You should read the
+# smb.conf(5) manual page in order to understand the options listed
+# here. Samba has a huge number of configurable options most of which
+# are not shown in this example
+#
+# 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 commentary 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.
+#
+
+#======================= Global Settings =======================
+
+[global]
+
+## Browsing/Identification ###
+
+# Change this to the workgroup/NT-domain name your Samba server will part of
+ workgroup = WORKGROUP
+
+# server string is the equivalent of the NT Description field
+ server string = %h server (Samba, Ubuntu)
+
+# Windows Internet Name Serving Support Section:
+# WINS Support - Tells the NMBD component of Samba to enable its WINS Server
+; wins support = no
+
+# 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 NOT both
+; wins server = w.x.y.z
+
+# This will prevent nmbd to search for NetBIOS names through DNS.
+ dns proxy = no
+
+# What naming service and in what order should we use to resolve host names
+# to IP addresses
+; name resolve order = lmhosts host wins bcast
+
+#### Networking ####
+
+# The specific set of interfaces / networks to bind to
+# This can be either the interface name or an IP address/netmask;
+# interface names are normally preferred
+; interfaces = 127.0.0.0/8 eth0
+
+# Only bind to the named interfaces and/or networks; you must use the
+# 'interfaces' option above to use this.
+# It is recommended that you enable this feature if your Samba machine is
+# not protected by a firewall or is a firewall itself. However, this
+# option cannot handle dynamic or non-broadcast interfaces correctly.
+; bind interfaces only = true
+
+
+
+#### Debugging/Accounting ####
+
+# This tells Samba to use a separate log file for each machine
+# that connects
+ log file = /var/log/samba/log.%m
+
+# Put a capping on the size of the log files (in Kb).
+ max log size = 1000
+
+# If you want Samba to only log through syslog then set the following
+# parameter to 'yes'.
+; syslog only = no
+
+# We want Samba to log a minimum amount of information to syslog. Everything
+# should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log
+# through syslog you should set the following parameter to something higher.
+ syslog = 0
+
+# Do something sensible when Samba crashes: mail the admin a backtrace
+ panic action = /usr/share/samba/panic-action %d
+
+
+####### Authentication #######
+
+# "security = user" is always a good idea. This will require a Unix account
+# in this server for every user accessing the server. See
+# /usr/share/doc/samba-doc/htmldocs/Samba3-HOWTO/ServerType.html
+# in the samba-doc package for details.
+; security = user
+
+# You may wish to use password encryption. See the section on
+# 'encrypt passwords' in the smb.conf(5) manpage before enabling.
+ encrypt passwords = no
+
+# If you are using encrypted passwords, Samba will need to know what
+# password database type you are using.
+ passdb backend = tdbsam
+
+ obey pam restrictions = yes
+
+; guest account = nobody
+ invalid users = root
+
+# This boolean parameter controls whether Samba attempts to sync the Unix
+# password with the SMB password when the encrypted SMB password in the
+# passdb is changed.
+; unix password sync = no
+
+# For Unix password sync to work on a Debian GNU/Linux system, the following
+# parameters must be set (thanks to Ian Kahan <<kahan at informatik.tu-muenchen.de> for
+# sending the correct chat script for the passwd program in Debian Sarge).
+ passwd program = /usr/bin/passwd %u
+ passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n *passwd:*password\supdated\ssuccessfully* .
+
+# This boolean controls whether PAM will be used for password changes
+# when requested by an SMB client instead of the program listed in
+# 'passwd program'. The default is 'no'.
+; pam password change = no
+
+########## Domains ###########
+
+# Is this machine able to authenticate users. Both PDC and BDC
+# must have this setting enabled. If you are the BDC you must
+# change the 'domain master' setting to no
+#
+; domain logons = yes
+#
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the location of the user's profile directory
+# from the client point of view)
+# The following required a [profiles] share to be setup on the
+# samba server (see below)
+; logon path = \\%N\profiles\%U
+# Another common choice is storing the profile in the user's home directory
+; logon path = \\%N\%U\profile
+
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the location of a user's home directory (from the client
+# point of view)
+; logon drive = H:
+; logon home = \\%N\%U
+
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the script to run during logon. The script must be stored
+# in the [netlogon] share
+# NOTE: Must be store in 'DOS' file format convention
+; logon script = logon.cmd
+
+# This allows Unix users to be created on the domain controller via the SAMR
+# RPC pipe. The example command creates a user account with a disabled Unix
+# password; please adapt to your needs
+; add user script = /usr/sbin/adduser --quiet --disabled-password --gecos "" %u
+
+########## Printing ##########
+
+# If you want to automatically load your printer list rather
+# than setting them up individually then you'll need this
+; load printers = yes
+
+# lpr(ng) printing. You may wish to override the location of the
+# printcap file
+; printing = bsd
+; printcap name = /etc/printcap
+
+# CUPS printing. See also the cupsaddsmb(8) manpage in the
+# cupsys-client package.
+; printing = cups
+; printcap name = cups
+
+# When using [print$], root is implicitly a 'printer admin', but you can
+# also give this right to other users to add drivers and set printer
+# properties
+; printer admin = @lpadmin
+
+
+############ Misc ############
+
+# Using the following line enables you to customise your configuration
+# on a per machine basis. The %m gets replaced with the netbios name
+# of the machine that is connecting
+; include = /home/samba/etc/smb.conf.%m
+
+# Most people will find that this option gives better performance.
+# See smb.conf(5) and /usr/share/doc/samba-doc/htmldocs/Samba3-HOWTO/speed.html
+# for details
+# You may want to add the following on a Linux system:
+# SO_RCVBUF=8192 SO_SNDBUF=8192
+ socket options = TCP_NODELAY
+
+# The following parameter is useful only if you have the linpopup package
+# installed. The samba maintainer and the linpopup maintainer are
+# working to ease installation and configuration of linpopup and samba.
+; message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' &
+
+# Domain Master specifies Samba to be the Domain Master Browser. If this
+# machine will be configured as a BDC (a secondary logon server), you
+# must set this to 'no'; otherwise, the default behavior is recommended.
+; domain master = auto
+
+# Some defaults for winbind (make sure you're not using the ranges
+# for something else.)
+; idmap uid = 10000-20000
+; idmap gid = 10000-20000
+; template shell = /bin/bash
+;
+; The following was the default behaviour in sarge
+; but samba upstream reverted the default because it might induce
+; performance issues in large organizations
+; See #368251 for some of the consequences of *not* having
+; this setting and smb.conf(5) for all details
+;
+; winbind enum groups = yes
+; winbind enum users = yes
+
+#======================= Share Definitions =======================
+
+# Un-comment the following (and tweak the other settings below to suit)
+# to enable the default home directory shares. This will share each
+# user's home directory as \\server\username
+;[homes]
+; comment = Home Directories
+; browseable = no
+
+# By default, \\server\username shares can be connected to by anyone
+# with access to the samba server. Un-comment the following parameter
+# to make sure that only "username" can connect to \\server\username
+# This might need tweaking when using external authentication schemes
+; valid users = %S
+
+# By default, the home directories are exported read-only. Change next
+# parameter to 'yes' if you want to be able to write to them.
+; writable = no
+
+# File creation mask is set to 0700 for security reasons. If you want to
+# create files with group=rw permissions, set next parameter to 0775.
+; create mask = 0700
+
+# Directory creation mask is set to 0700 for security reasons. If you want to
+# create dirs. with group=rw permissions, set next parameter to 0775.
+; directory mask = 0700
+
+# Un-comment the following and create the netlogon directory for Domain Logons
+# (you need to configure Samba to act as a domain controller too.)
+;[netlogon]
+; comment = Network Logon Service
+; path = /home/samba/netlogon
+; guest ok = yes
+; writable = no
+; share modes = no
+
+# Un-comment the following and create the profiles directory to store
+# users profiles (see the "logon path" option above)
+# (you need to configure Samba to act as a domain controller too.)
+# The path below should be writable by all users so that their
+# profile directory may be created the first time they log on
+;[profiles]
+; comment = Users profiles
+; path = /home/samba/profiles
+; guest ok = no
+; browseable = no
+; create mask = 0600
+; directory mask = 0700
+
+[printers]
+ comment = All Printers
+ browseable = no
+ path = /var/spool/samba
+ printable = yes
+ public = no
+ writable = no
+ create mode = 0700
+
+# Windows clients look for this share name as a source of downloadable
+# printer drivers
+[print$]
+ comment = Printer Drivers
+ path = /var/lib/samba/printers
+ browseable = yes
+ read only = yes
+ guest ok = no
+# Uncomment to allow remote administration of Windows print drivers.
+# Replace 'ntadmin' with the name of the group your admin users are
+# members of.
+; write list = root, @ntadmin
+
+# A sample share for sharing your CD-ROM with others.
+;[cdrom]
+; comment = Samba server's CD-ROM
+; writable = no
+; locking = no
+; path = /cdrom
+; public = yes
+
+# The next two parameters show how to auto-mount a CD-ROM when the
+# cdrom share is accesed. For this to work /etc/fstab must contain
+# an entry like this:
+#
+# /dev/scd0 /cdrom iso9660 defaults,noauto,ro,user 0 0
+#
+# The CD-ROM gets unmounted automatically after the connection to the
+#
+# If you don't want to use auto-mounting/unmounting make sure the CD
+# is mounted on /cdrom
+#
+; preexec = /bin/mount /cdrom
+; postexec = /bin/umount /cdrom
+
More information about the Pkg-samba-maint
mailing list