Update port to the 3.5.18 version

Feature safe:	yes

5 files changed, 200 insertions, 147 deletions

diff --git a/net/samba35/Makefile b/net/samba35/Makefile
index 59154ca7744d..d3c5ae9e59bf 100644
--- a/net/samba35/Makefile
+++ b/net/samba35/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		${SAMBA_BASENAME}35
-PORTVERSION=		3.5.15
+PORTVERSION=		3.5.18
 PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
diff --git a/net/samba35/distinfo b/net/samba35/distinfo
index d652bb7698aa..2849c7b8e19c 100644
--- a/net/samba35/distinfo
+++ b/net/samba35/distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-3.5.15.tar.gz) = c23c67c1212b7ff2e68a9e047a22200e1ad447d5ac1bd3cf24363f4b5875d396
-SIZE (samba-3.5.15.tar.gz) = 30368870
+SHA256 (samba-3.5.18.tar.gz) = ff684a20a5a27fae6027fcedcedba10da73743cff331e22f5994b1212ee8ae16
+SIZE (samba-3.5.18.tar.gz) = 35371052
diff --git a/net/samba35/files/samba.in b/net/samba35/files/samba.in
index b2a679c19f37..94f70ff13b39 100644
--- a/net/samba35/files/samba.in
+++ b/net/samba35/files/samba.in
@@ -14,9 +14,9 @@
 # to enable this service:
 #
 #samba_enable="YES"
-# or, for fine grain control:
-#nmbd_enable="YES"
-#smbd_enable="YES"
+# You can disable/enable any of the Samba daemons by specifying:
+#nmbd_enable="NO"
+#smbd_enable="NO"
 %%WINBIND%%# You need to enable winbindd separately, by adding:
 %%WINBIND%%#winbindd_enable="YES"
 #
@@ -28,43 +28,6 @@
 
 name="samba"
 rcvar=samba_enable
-
-# Defaults
-samba_enable=${samba_enable:=NO}
-samba_config_default="%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%"
-samba_config=${samba_config="${samba_config_default}"}
-command_args=${samba_config:+-s "${samba_config}"}
-# Fetch parameters from configuration file
-testparm_command="%%PREFIX%%/bin/testparm"
-smbcontrol_command="%%PREFIX%%/bin/smbcontrol"
-samba_parm="${testparm_command} -s -v --parameter-name"
-samba_idmap=$(${samba_parm} 'idmap uid' "${samba_config}" 2>/dev/null)
-samba_lockdir=$(${samba_parm} 'lock directory' "${samba_config}" 2>/dev/null)
-# Load configuration
-load_rc_config "${name}"
-# Setup dependent variables
-if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
-    nmbd_enable=${nmbd_enable=YES}
-    smbd_enable=${smbd_enable=YES}
-%%WINBIND%%    # Check that winbindd is actually configured
-%%WINBIND%%    if [ -n "${samba_idmap}" ]; then
-%%WINBIND%%	winbindd_enable=${winbindd_enable=YES}
-%%WINBIND%%    fi
-fi
-# XXX: Hack to enable check of the dependent variables
-eval real_${rcvar}="\${${rcvar}:=NO}"	${rcvar}=YES
-%%WINBIND%%# winbindd
-%%WINBIND%%rcvar=winbindd_enable
-%%WINBIND%%winbindd_enable=${winbindd_enable:=NO}
-%%WINBIND%%winbindd_flags=${winbindd_flags=''}
-# nmbd
-rcvar=nmbd_enable
-nmbd_enable=${nmbd_enable:=NO}
-nmbd_flags=${nmbd_flags="-D"}
-# smbd
-rcvar=smbd_enable
-smbd_enable=${smbd_enable:=NO}
-smbd_flags=${smbd_flags="-D"}
 # Custom commands
 extra_commands="reload status"
 start_precmd="samba_start_precmd"
@@ -75,16 +38,19 @@ restart_precmd="samba_checkconfig"
 reload_precmd="samba_checkconfig"
 reload_cmd="samba_reload_cmd"
 rcvar_cmd="samba_rcvar_cmd"
+# Defaults
+samba_config_default="%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%"
+testparm_command="%%PREFIX%%/bin/testparm"
+smbcontrol_command="%%PREFIX%%/bin/smbcontrol"
+samba_parm="${testparm_command} -s -v --parameter-name"
+pid_extra=
 #
 samba_daemons="nmbd smbd"
 %%WINBIND%%samba_daemons="${samba_daemons} winbindd"
-# Requirements
-required_files="${samba_config}"
-required_dirs="${samba_lockdir}"
 
 samba_checkconfig() {
     echo -n "Performing sanity check on Samba configuration: "
-    if ${testparm_command} -s ${samba_config:+"${samba_config}"} >/dev/null 2>&1; then
+    if ${testparm_command} -s ${samba_config:+"${samba_config}"} >/dev/null 2>&1; then #"
 	echo "OK"
     else
 	echo "FAILED"
@@ -94,6 +60,10 @@ samba_checkconfig() {
 }
 
 samba_start_precmd() {
+    # Make sure rundir exists
+    if [ ! -d "%%SAMBA_RUNDIR%%" -a ! -e "%%SAMBA_RUNDIR%%" ]; then
+	install -m 0755 -d "%%SAMBA_RUNDIR%%"
+    fi
     # XXX: Never delete winbindd_idmap, winbindd_cache and group_mapping
     if [ -n "${samba_lockdir}" -a -d "${samba_lockdir}" ]; then
 	echo -n "Removing stale Samba tdb files: "
@@ -108,13 +78,19 @@ samba_start_precmd() {
 }
 
 samba_rcvar_cmd() {
-    local rcvar
+    local name rcvar
     rcvar=${name}_enable
-    eval ${rcvar}=\${real_${rcvar}}
     # Prevent recursive calling
     unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
     # Check master variable
     run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
+    # Check dependent variables
+    for name in ${samba_daemons}; do
+	# XXX
+	rcvars=''; v=''
+	rcvar=${name}_enable
+	run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
+    done
 }
 
 samba_reload_cmd() {
@@ -123,7 +99,7 @@ samba_reload_cmd() {
     unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
     # Apply to all daemons
     for name in ${samba_daemons}; do
-    	rcvar=${name}_enable
+	rcvar=${name}_enable
 	command="%%PREFIX%%/sbin/${name}"
 	pidfile="%%SAMBA_RUNDIR%%/${name}${pid_extra}.pid"
 	# Daemon should be enabled and running
@@ -150,19 +126,65 @@ samba_cmd() {
     result=0
     # Apply to all daemons
     for name in ${samba_daemons}; do
-	rcvar=${name}_enable
 	# XXX
 	rcvars=''; v=''
+	rcvar=${name}_enable
 	command="%%PREFIX%%/sbin/${name}"
 	pidfile="%%SAMBA_RUNDIR%%/${name}${pid_extra}.pid"
 	# Daemon should be enabled and running
 	if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
 	    run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
-	    # If any of the of the commands failed, take it as a total result
+	    # If any of the commands failed, take it as a global result
 	    result=$((${result} || $?))
 	fi
     done
     return ${result}
 }
 
+samba_config_init() {
+    local name
+    # Load configuration
+    load_rc_config "${name}"
+    for name in ${samba_daemons}; do
+	load_rc_config "${name}"
+    done
+    # Location of the config
+    samba_config=${samba_config="${samba_config_default}"} #"
+    # XXX: Hack to work around name change of pid file with non-default config
+    if [ -n "${samba_config}" -a "${samba_config}" != "${samba_config_default}" ]; then
+	pid_extra="-$(basename "${samba_config}")"
+    fi
+    # Setup dependent variables
+    if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
+	nmbd_enable=${nmbd_enable=YES}
+	smbd_enable=${smbd_enable=YES}
+    fi
+    # Defaults
+    samba_enable=${samba_enable:=NO}
+    nmbd_enable=${nmbd_enable:=NO}
+    smbd_enable=${smbd_enable:=NO}
+%%WINBIND%%    # Winbindd
+%%WINBIND%%    if [ -z "${winbind_enable}" ]; then
+%%WINBIND%%	samba_idmap=$(${samba_parm} 'idmap uid' "${samba_config}" 2>/dev/null)
+%%WINBIND%%	# Check that winbindd is actually configured
+%%WINBIND%%	if [ -n "${samba_idmap}" ]; then
+%%WINBIND%%		winbindd_enable="YES"
+%%WINBIND%%	fi
+%%WINBIND%%	winbindd_enable=${winbindd_enable:=NO}
+%%WINBIND%%    fi
+}
+
+# Load configuration variables
+samba_config_init
+# Where is the lockdir
+samba_lockdir=$(${samba_parm} 'lock directory' "${samba_config}" 2>/dev/null)
+# Common flags
+command_args=${samba_config:+-s "${samba_config}"} #"
+nmbd_flags=${nmbd_flags="-D"}
+smbd_flags=${smbd_flags="-D"}
+%%WINBIND%%winbindd_flags=${winbindd_flags=''}
+# Requirements
+required_files="${samba_config}"
+required_dirs="${samba_lockdir}"
+
 run_rc_command "$1"
diff --git a/net/samba35/pkg-plist b/net/samba35/pkg-plist
index f8f3e0ff6b1c..4bf630324d6c 100644
--- a/net/samba35/pkg-plist
+++ b/net/samba35/pkg-plist
@@ -44,6 +44,7 @@ sbin/nmbd
 %%EXAMPLESDIR%%/LDAP/samba-schema-FDS.ldif
 %%EXAMPLESDIR%%/LDAP/samba-schema-netscapeds4.x
 %%EXAMPLESDIR%%/LDAP/samba-schema-netscapeds5.x
+%%EXAMPLESDIR%%/LDAP/samba-schema-netscapeds5.x.README
 %%EXAMPLESDIR%%/LDAP/samba-schema.IBMSecureWay
 %%EXAMPLESDIR%%/LDAP/samba.schema
 %%EXAMPLESDIR%%/LDAP/samba.schema.at.IBM-DS
diff --git a/net/samba35/pkg-plist.swat b/net/samba35/pkg-plist.swat
index 1f8fc8a346b4..809084218206 100644
--- a/net/samba35/pkg-plist.swat
+++ b/net/samba35/pkg-plist.swat
@@ -10,45 +10,60 @@ share/swat/help/Samba3-ByExample/appendix.html
 share/swat/help/Samba3-ByExample/ch14.html
 share/swat/help/Samba3-ByExample/go01.html
 share/swat/help/Samba3-ByExample/happy.html
-@comment share/swat/help/Samba3-ByExample/images/AccountingNetwork.png
-@comment share/swat/help/Samba3-ByExample/images/Charity-Network.png
-@comment share/swat/help/Samba3-ByExample/images/HostAnnouncment.png
-@comment share/swat/help/Samba3-ByExample/images/NullConnect.png
-@comment share/swat/help/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png
-@comment share/swat/help/Samba3-ByExample/images/UserConnect.png
-@comment share/swat/help/Samba3-ByExample/images/UserMgrNT4.png
-@comment share/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture.png
-@comment share/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture2.png
-@comment share/swat/help/Samba3-ByExample/images/WindowsXP-NullConnection.png
-@comment share/swat/help/Samba3-ByExample/images/WindowsXP-UserConnection.png
-@comment share/swat/help/Samba3-ByExample/images/XP-screen001.png
-@comment share/swat/help/Samba3-ByExample/images/acct2net.png
-@comment share/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png
-@comment share/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP.png
-@comment share/swat/help/Samba3-ByExample/images/ch7-fail-overLDAP.png
-@comment share/swat/help/Samba3-ByExample/images/ch7-singleLDAP.png
-@comment share/swat/help/Samba3-ByExample/images/ch8-migration.png
-@comment share/swat/help/Samba3-ByExample/images/chap4-net.png
-@comment share/swat/help/Samba3-ByExample/images/chap5-net.png
-@comment share/swat/help/Samba3-ByExample/images/chap6-net.png
-@comment share/swat/help/Samba3-ByExample/images/chap7-idresol.png
-@comment share/swat/help/Samba3-ByExample/images/chap7-net-Ar.png
-@comment share/swat/help/Samba3-ByExample/images/chap7-net2-Br.png
-@comment share/swat/help/Samba3-ByExample/images/chap9-ADSDC.png
-@comment share/swat/help/Samba3-ByExample/images/chap9-SambaDC.png
-@comment share/swat/help/Samba3-ByExample/images/imc-usermanager2.png
-@comment share/swat/help/Samba3-ByExample/images/lam-config.png
-@comment share/swat/help/Samba3-ByExample/images/lam-group-members.png
-@comment share/swat/help/Samba3-ByExample/images/lam-groups.png
-@comment share/swat/help/Samba3-ByExample/images/lam-hosts.png
-@comment share/swat/help/Samba3-ByExample/images/lam-login.png
-@comment share/swat/help/Samba3-ByExample/images/lam-users.png
-@comment share/swat/help/Samba3-ByExample/images/openmag.png
-@comment share/swat/help/Samba3-ByExample/images/wxpp001.png
-@comment share/swat/help/Samba3-ByExample/images/wxpp004.png
-@comment share/swat/help/Samba3-ByExample/images/wxpp006.png
-@comment share/swat/help/Samba3-ByExample/images/wxpp007.png
-@comment share/swat/help/Samba3-ByExample/images/wxpp008.png
+share/swat/help/Samba3-ByExample/images/AccountingNetwork.png
+share/swat/help/Samba3-ByExample/images/Charity-Network.png
+share/swat/help/Samba3-ByExample/images/Domain-WorkgroupAnnouncement.png
+share/swat/help/Samba3-ByExample/images/HostAnnouncment.png
+share/swat/help/Samba3-ByExample/images/LocalMasterAnnouncement.png
+share/swat/help/Samba3-ByExample/images/NullConnect.png
+share/swat/help/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png
+share/swat/help/Samba3-ByExample/images/UserConnect.png
+share/swat/help/Samba3-ByExample/images/UserMgrNT4.png
+share/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture.png
+share/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture2.png
+share/swat/help/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
+share/swat/help/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
+share/swat/help/Samba3-ByExample/images/WindowsXP-NullConnection.png
+share/swat/help/Samba3-ByExample/images/WindowsXP-UserConnection.png
+share/swat/help/Samba3-ByExample/images/XP-screen001.png
+share/swat/help/Samba3-ByExample/images/acct2net.png
+share/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png
+share/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP.png
+share/swat/help/Samba3-ByExample/images/ch7-fail-overLDAP.png
+share/swat/help/Samba3-ByExample/images/ch7-singleLDAP.png
+share/swat/help/Samba3-ByExample/images/ch8-migration.png
+share/swat/help/Samba3-ByExample/images/chap4-net.png
+share/swat/help/Samba3-ByExample/images/chap5-net.png
+share/swat/help/Samba3-ByExample/images/chap6-net.png
+share/swat/help/Samba3-ByExample/images/chap7-idresol.png
+share/swat/help/Samba3-ByExample/images/chap7-net-A.png
+share/swat/help/Samba3-ByExample/images/chap7-net-Ar.png
+share/swat/help/Samba3-ByExample/images/chap7-net.png
+share/swat/help/Samba3-ByExample/images/chap7-net2-B.png
+share/swat/help/Samba3-ByExample/images/chap7-net2-Br.png
+share/swat/help/Samba3-ByExample/images/chap7-net2.png
+share/swat/help/Samba3-ByExample/images/chap7-net2r.png
+share/swat/help/Samba3-ByExample/images/chap7-netr.png
+share/swat/help/Samba3-ByExample/images/chap9-ADSDC.png
+share/swat/help/Samba3-ByExample/images/chap9-SambaDC.png
+share/swat/help/Samba3-ByExample/images/imc-usermanager2.png
+share/swat/help/Samba3-ByExample/images/lam-config.png
+share/swat/help/Samba3-ByExample/images/lam-group-members.png
+share/swat/help/Samba3-ByExample/images/lam-groups.png
+share/swat/help/Samba3-ByExample/images/lam-hosts.png
+share/swat/help/Samba3-ByExample/images/lam-login.png
+share/swat/help/Samba3-ByExample/images/lam-users.png
+share/swat/help/Samba3-ByExample/images/openmag.png
+share/swat/help/Samba3-ByExample/images/wxpp001.png
+share/swat/help/Samba3-ByExample/images/wxpp004.png
+share/swat/help/Samba3-ByExample/images/wxpp006.png
+share/swat/help/Samba3-ByExample/images/wxpp007.png
+share/swat/help/Samba3-ByExample/images/wxpp008.png
+share/swat/help/Samba3-ByExample/images/wxpp010.png
+share/swat/help/Samba3-ByExample/images/wxpp011.png
+share/swat/help/Samba3-ByExample/images/wxpp012.png
+share/swat/help/Samba3-ByExample/images/wxpp013.png
+share/swat/help/Samba3-ByExample/images/wxpp015.png
 share/swat/help/Samba3-ByExample/index.html
 share/swat/help/Samba3-ByExample/ix01.html
 share/swat/help/Samba3-ByExample/kerberos.html
@@ -123,60 +138,74 @@ share/swat/help/Samba3-HOWTO/domain-member.html
 share/swat/help/Samba3-HOWTO/go01.html
 share/swat/help/Samba3-HOWTO/groupmapping.html
 share/swat/help/Samba3-HOWTO/idmapper.html
-@comment share/swat/help/Samba3-HOWTO/images/10small.png
-@comment share/swat/help/Samba3-HOWTO/images/11small.png
-@comment share/swat/help/Samba3-HOWTO/images/12small.png
-@comment share/swat/help/Samba3-HOWTO/images/13small.png
-@comment share/swat/help/Samba3-HOWTO/images/14small.png
-@comment share/swat/help/Samba3-HOWTO/images/1small.png
-@comment share/swat/help/Samba3-HOWTO/images/2small.png
-@comment share/swat/help/Samba3-HOWTO/images/3small.png
-@comment share/swat/help/Samba3-HOWTO/images/4small.png
-@comment share/swat/help/Samba3-HOWTO/images/5small.png
-@comment share/swat/help/Samba3-HOWTO/images/6small.png
-@comment share/swat/help/Samba3-HOWTO/images/7small.png
-@comment share/swat/help/Samba3-HOWTO/images/8small.png
-@comment share/swat/help/Samba3-HOWTO/images/9small.png
-@comment share/swat/help/Samba3-HOWTO/images/WME001.png
-@comment share/swat/help/Samba3-HOWTO/images/WME002.png
-@comment share/swat/help/Samba3-HOWTO/images/WME003.png
-@comment share/swat/help/Samba3-HOWTO/images/WME005.png
-@comment share/swat/help/Samba3-HOWTO/images/WME009.png
-@comment share/swat/help/Samba3-HOWTO/images/WME010.png
-@comment share/swat/help/Samba3-HOWTO/images/WME013.png
-@comment share/swat/help/Samba3-HOWTO/images/WME014.png
-@comment share/swat/help/Samba3-HOWTO/images/WXPP002.png
-@comment share/swat/help/Samba3-HOWTO/images/WXPP003.png
-@comment share/swat/help/Samba3-HOWTO/images/WXPP005.png
-@comment share/swat/help/Samba3-HOWTO/images/WXPP009.png
-@comment share/swat/help/Samba3-HOWTO/images/WXPP014.png
-@comment share/swat/help/Samba3-HOWTO/images/a_small.png
-@comment share/swat/help/Samba3-HOWTO/images/access1.png
-@comment share/swat/help/Samba3-HOWTO/images/browsing1.png
-@comment share/swat/help/Samba3-HOWTO/images/cups1.png
-@comment share/swat/help/Samba3-HOWTO/images/cups2.png
-@comment share/swat/help/Samba3-HOWTO/images/domain.png
-@comment share/swat/help/Samba3-HOWTO/images/ethereal1.png
-@comment share/swat/help/Samba3-HOWTO/images/ethereal2.png
-@comment share/swat/help/Samba3-HOWTO/images/idmap-gid2sid.png
-@comment share/swat/help/Samba3-HOWTO/images/idmap-sid2gid.png
-@comment share/swat/help/Samba3-HOWTO/images/idmap-sid2uid.png
-@comment share/swat/help/Samba3-HOWTO/images/idmap-store-gid2sid.png
-@comment share/swat/help/Samba3-HOWTO/images/idmap-uid2sid.png
-@comment share/swat/help/Samba3-HOWTO/images/idmap_winbind_no_loop.png
-@comment share/swat/help/Samba3-HOWTO/images/pdftoepsonusb.png
-@comment share/swat/help/Samba3-HOWTO/images/pdftosocket.png
-@comment share/swat/help/Samba3-HOWTO/images/trusts1.png
-@comment share/swat/help/Samba3-HOWTO/images/w2kp001.png
-@comment share/swat/help/Samba3-HOWTO/images/w2kp002.png
-@comment share/swat/help/Samba3-HOWTO/images/w2kp003.png
-@comment share/swat/help/Samba3-HOWTO/images/w2kp004.png
-@comment share/swat/help/Samba3-HOWTO/images/w2kp005.png
-@comment share/swat/help/Samba3-HOWTO/images/wxpp001.png
-@comment share/swat/help/Samba3-HOWTO/images/wxpp004.png
-@comment share/swat/help/Samba3-HOWTO/images/wxpp006.png
-@comment share/swat/help/Samba3-HOWTO/images/wxpp007.png
-@comment share/swat/help/Samba3-HOWTO/images/wxpp008.png
+share/swat/help/Samba3-HOWTO/images/10small.png
+share/swat/help/Samba3-HOWTO/images/11small.png
+share/swat/help/Samba3-HOWTO/images/12small.png
+share/swat/help/Samba3-HOWTO/images/13small.png
+share/swat/help/Samba3-HOWTO/images/14small.png
+share/swat/help/Samba3-HOWTO/images/1small.png
+share/swat/help/Samba3-HOWTO/images/2small.png
+share/swat/help/Samba3-HOWTO/images/3small.png
+share/swat/help/Samba3-HOWTO/images/4small.png
+share/swat/help/Samba3-HOWTO/images/5small.png
+share/swat/help/Samba3-HOWTO/images/6small.png
+share/swat/help/Samba3-HOWTO/images/7small.png
+share/swat/help/Samba3-HOWTO/images/8small.png
+share/swat/help/Samba3-HOWTO/images/9small.png
+share/swat/help/Samba3-HOWTO/images/WME001.png
+share/swat/help/Samba3-HOWTO/images/WME002.png
+share/swat/help/Samba3-HOWTO/images/WME003.png
+share/swat/help/Samba3-HOWTO/images/WME004.png
+share/swat/help/Samba3-HOWTO/images/WME005.png
+share/swat/help/Samba3-HOWTO/images/WME006.png
+share/swat/help/Samba3-HOWTO/images/WME007.png
+share/swat/help/Samba3-HOWTO/images/WME008.png
+share/swat/help/Samba3-HOWTO/images/WME009.png
+share/swat/help/Samba3-HOWTO/images/WME010.png
+share/swat/help/Samba3-HOWTO/images/WME011.png
+share/swat/help/Samba3-HOWTO/images/WME012.png
+share/swat/help/Samba3-HOWTO/images/WME013.png
+share/swat/help/Samba3-HOWTO/images/WME014.png
+share/swat/help/Samba3-HOWTO/images/WXPP002.png
+share/swat/help/Samba3-HOWTO/images/WXPP003.png
+share/swat/help/Samba3-HOWTO/images/WXPP005.png
+share/swat/help/Samba3-HOWTO/images/WXPP009.png
+share/swat/help/Samba3-HOWTO/images/WXPP014.png
+share/swat/help/Samba3-HOWTO/images/a_small.png
+share/swat/help/Samba3-HOWTO/images/access1.png
+share/swat/help/Samba3-HOWTO/images/browsing1.png
+share/swat/help/Samba3-HOWTO/images/cups1.png
+share/swat/help/Samba3-HOWTO/images/cups2.png
+share/swat/help/Samba3-HOWTO/images/domain.png
+share/swat/help/Samba3-HOWTO/images/ethereal1.png
+share/swat/help/Samba3-HOWTO/images/ethereal2.png
+share/swat/help/Samba3-HOWTO/images/idmap-gid2sid.png
+share/swat/help/Samba3-HOWTO/images/idmap-groups.png
+share/swat/help/Samba3-HOWTO/images/idmap-sid2gid.png
+share/swat/help/Samba3-HOWTO/images/idmap-sid2uid.png
+share/swat/help/Samba3-HOWTO/images/idmap-store-gid2sid.png
+share/swat/help/Samba3-HOWTO/images/idmap-uid2sid.png
+share/swat/help/Samba3-HOWTO/images/idmap.png
+share/swat/help/Samba3-HOWTO/images/idmap_winbind_no_loop.png
+share/swat/help/Samba3-HOWTO/images/pdftoepsonusb.png
+share/swat/help/Samba3-HOWTO/images/pdftosocket.png
+share/swat/help/Samba3-HOWTO/images/trusts1.png
+share/swat/help/Samba3-HOWTO/images/w2kp001.png
+share/swat/help/Samba3-HOWTO/images/w2kp002.png
+share/swat/help/Samba3-HOWTO/images/w2kp003.png
+share/swat/help/Samba3-HOWTO/images/w2kp004.png
+share/swat/help/Samba3-HOWTO/images/w2kp005.png
+share/swat/help/Samba3-HOWTO/images/w2kp006.png
+share/swat/help/Samba3-HOWTO/images/wxpp001.png
+share/swat/help/Samba3-HOWTO/images/wxpp004.png
+share/swat/help/Samba3-HOWTO/images/wxpp006.png
+share/swat/help/Samba3-HOWTO/images/wxpp007.png
+share/swat/help/Samba3-HOWTO/images/wxpp008.png
+share/swat/help/Samba3-HOWTO/images/wxpp010.png
+share/swat/help/Samba3-HOWTO/images/wxpp011.png
+share/swat/help/Samba3-HOWTO/images/wxpp012.png
+share/swat/help/Samba3-HOWTO/images/wxpp013.png
+share/swat/help/Samba3-HOWTO/images/wxpp015.png
 share/swat/help/Samba3-HOWTO/index.html
 share/swat/help/Samba3-HOWTO/install.html
 share/swat/help/Samba3-HOWTO/integrate-ms-networks.html
@@ -259,6 +288,7 @@ share/swat/help/manpages/testparm.1.html
 share/swat/help/manpages/umount.cifs.8.html
 share/swat/help/manpages/vfs_acl_tdb.8.html
 share/swat/help/manpages/vfs_acl_xattr.8.html
+share/swat/help/manpages/vfs_aio_fork.8.html
 share/swat/help/manpages/vfs_audit.8.html
 share/swat/help/manpages/vfs_cacheprime.8.html
 share/swat/help/manpages/vfs_cap.8.html
@@ -327,10 +357,10 @@ share/swat/lang/tr/images/viewconfig.gif
 @dirrm share/swat/include
 @dirrm share/swat/images
 @dirrm share/swat/help/manpages
-@comment @dirrm share/swat/help/Samba3-HOWTO/images
+@dirrm share/swat/help/Samba3-HOWTO/images
 @dirrm share/swat/help/Samba3-HOWTO
 @dirrm share/swat/help/Samba3-Developers-Guide
-@comment @dirrm share/swat/help/Samba3-ByExample/images
+@dirrm share/swat/help/Samba3-ByExample/images
 @dirrm share/swat/help/Samba3-ByExample
 @dirrm share/swat/help
 @dirrm share/swat