From: Frank Brehm <frank@brehm-online.com>
Date: Wed, 25 Apr 2012 21:41:10 +0000 (+0200)
Subject: Current state
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=5224d39a793c9a56423171c9ccd1ce99b58e6cdc;p=config%2Fbruni%2Fetc.git

Current state
---

diff --git a/conf.d/._cfg0000_samba b/conf.d/._cfg0000_samba
deleted file mode 100644
index 1b329dae..00000000
--- a/conf.d/._cfg0000_samba
+++ /dev/null
@@ -1,28 +0,0 @@
-#add "winbind" to the daemon_list if you also want winbind to start
-daemon_list="smbd nmbd"
-
-#----------------------------------------------------------------------------
-# Daemons calls: <daemon_name>_<command_option>
-#----------------------------------------------------------------------------
-my_service_name="samba"
-my_service_PRE="unset TMP TMPDIR"
-my_service_POST=""
-
-#----------------------------------------------------------------------------
-# Daemons calls: <daemon_name>_<command_option>
-#----------------------------------------------------------------------------
-smbd_start_options="-D"
-smbd_start="start-stop-daemon --start --exec /usr/sbin/smbd -- ${smbd_start_options}"
-smbd_stop="start-stop-daemon --stop --exec /usr/sbin/smbd"
-smbd_reload="killall -HUP smbd"
-
-nmbd_start_options="-D"
-nmbd_start="start-stop-daemon --start --exec /usr/sbin/nmbd -- ${nmbd_start_options}"
-nmbd_stop="start-stop-daemon --stop --exec /usr/sbin/nmbd"
-nmbd_reload="killall -HUP nmbd"
-
-winbind_start_options=""
-winbind_start="start-stop-daemon --start --exec /usr/sbin/winbindd -- ${winbind_start_options}"
-winbind_stop="start-stop-daemon --stop --exec /usr/sbin/winbindd"
-winbind_reload="killall -HUP winbindd"
-
diff --git a/config-archive/etc/conf.d/samba b/config-archive/etc/conf.d/samba
new file mode 100644
index 00000000..c5d99293
--- /dev/null
+++ b/config-archive/etc/conf.d/samba
@@ -0,0 +1,28 @@
+#add "winbind" to the daemon_list if you also want winbind to start
+daemon_list="smbd nmbd winbind"
+
+#----------------------------------------------------------------------------
+# Daemons calls: <daemon_name>_<command_option>
+#----------------------------------------------------------------------------
+my_service_name="samba"
+my_service_PRE="unset TMP TMPDIR"
+my_service_POST=""
+
+#----------------------------------------------------------------------------
+# Daemons calls: <daemon_name>_<command_option>
+#----------------------------------------------------------------------------
+smbd_start_options="-D"
+smbd_start="start-stop-daemon --start --exec /usr/sbin/smbd -- ${smbd_start_options}"
+smbd_stop="start-stop-daemon --stop --exec /usr/sbin/smbd"
+smbd_reload="killall -HUP smbd"
+
+nmbd_start_options="-D"
+nmbd_start="start-stop-daemon --start --exec /usr/sbin/nmbd -- ${nmbd_start_options}"
+nmbd_stop="start-stop-daemon --stop --exec /usr/sbin/nmbd"
+nmbd_reload="killall -HUP nmbd"
+
+winbind_start_options=""
+winbind_start="start-stop-daemon --start --exec /usr/sbin/winbindd -- ${winbind_start_options}"
+winbind_stop="start-stop-daemon --stop --exec /usr/sbin/winbindd"
+winbind_reload="killall -HUP winbindd"
+
diff --git a/config-archive/etc/conf.d/samba.dist.new b/config-archive/etc/conf.d/samba.dist.new
new file mode 100644
index 00000000..1b329dae
--- /dev/null
+++ b/config-archive/etc/conf.d/samba.dist.new
@@ -0,0 +1,28 @@
+#add "winbind" to the daemon_list if you also want winbind to start
+daemon_list="smbd nmbd"
+
+#----------------------------------------------------------------------------
+# Daemons calls: <daemon_name>_<command_option>
+#----------------------------------------------------------------------------
+my_service_name="samba"
+my_service_PRE="unset TMP TMPDIR"
+my_service_POST=""
+
+#----------------------------------------------------------------------------
+# Daemons calls: <daemon_name>_<command_option>
+#----------------------------------------------------------------------------
+smbd_start_options="-D"
+smbd_start="start-stop-daemon --start --exec /usr/sbin/smbd -- ${smbd_start_options}"
+smbd_stop="start-stop-daemon --stop --exec /usr/sbin/smbd"
+smbd_reload="killall -HUP smbd"
+
+nmbd_start_options="-D"
+nmbd_start="start-stop-daemon --start --exec /usr/sbin/nmbd -- ${nmbd_start_options}"
+nmbd_stop="start-stop-daemon --stop --exec /usr/sbin/nmbd"
+nmbd_reload="killall -HUP nmbd"
+
+winbind_start_options=""
+winbind_start="start-stop-daemon --start --exec /usr/sbin/winbindd -- ${winbind_start_options}"
+winbind_stop="start-stop-daemon --stop --exec /usr/sbin/winbindd"
+winbind_reload="killall -HUP winbindd"
+
diff --git a/group b/group
index 94ad9ec1..1f557579 100644
--- a/group
+++ b/group
@@ -23,7 +23,7 @@ users:x:100:
 portage:x:250:portage
 utmp:x:406:
 nogroup:x:65533:
-nobody:x:65534:
+nobody:x:65534:frank,doris,heiko,patrick,robert,steffen
 man:x:15:
 sshd:x:22:
 cron:x:16:frank,heiko,patrick,vivi,doris,robert,steffen
diff --git a/samba.orig/lmhosts b/samba.orig/lmhosts
deleted file mode 100644
index 80e71756..00000000
--- a/samba.orig/lmhosts
+++ /dev/null
@@ -1,2 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.5/lmhosts,v 1.1 2010/03/01 16:19:54 patrick Exp $
-127.0.0.1 localhost
diff --git a/samba.orig/smb.conf b/samba.orig/smb.conf
deleted file mode 100644
index 44444172..00000000
--- a/samba.orig/smb.conf
+++ /dev/null
@@ -1,185 +0,0 @@
-#======================= Global Settings =====================================
-[global]
-
-;	workgroup = Brehm
-	workgroup = HENNIG
-	netbios name = Bruni
-;	server string = %h
-	server string = %h - (Samba %v)
-	load printers = yes
-	printing = cups
-;	printcap name = cups
-	printcap name = /etc/printcap
-	cups options = raw
-;	printer admin = @adm
-;	printer admin = @"Domain Admins"
-	log file = /var/log/samba/log.%m
-	max log size = 5120
-	log level = 2 passdb:5 auth:10
-;	hosts allow = 10.12.11. 127. ::1 2001:6f8:1db7::/64 fe80::/64 2001:6f8:1c00:365::/64
-	#guest account = pcguest
-	#map to guest = bad user
-	security = user
-;	password server = <NT-Server-Name>
-;	password server = *
-;	password level = 8
-;	username level = 8
-	encrypt passwords = true
-;	smb passwd file = /var/lib/samba/private/smbpasswd
-	passdb backend = tdbsam
-    	lanman auth = yes
-;	unix password sync = Yes
-;	pam password change = yes
-;	passwd program = /usr/bin/passwd %u
-;	passwd chat = *New*UNIX*password* %n\n *Re*ype*new*UNIX*password* %n\n \
-;*passwd:*all*authentication*tokens*updated*successfully*
-;	username map = /etc/samba/smbusers
-;	include = /etc/samba/smb.conf.%m
-;	winbind separator = +
-;	winbind use default domain = yes
-;	template homedir = /home/%D/%U
-;	obey pam restrictions = yes
-;	template shell = /bin/bash
-	#socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
-;	interfaces = eth0 eth1 10.12.11.0/24
-	#interfaces = eth0
-	interfaces = lo 10.12.11.0/24 172.20.1.0/24
-;	remote browse sync = 192.168.3.25 192.168.5.255
-;	remote browse sync = 10.12.11.255 
-;	remote announce = 192.168.1.255 192.168.2.44
-;	remote announce = 10.12.11.255
-;	local master = yes
-;	os level = 100
-;	domain master = yes 
-;	preferred master = yes
-;	domain logons = yes
-;	logon script = %m.bat
-;	logon script = %U.bat
-;	logon path = \\%L\Profiles\%U
-;	logon home = \\%L\%U\.profile
-;	enhanced browsing = yes
-
-;	add user script = /usr/sbin/useradd -s /bin/false '%u'
-;	delete user script = /usr/sbin/userdel '%s'
-;	add user to group script = /usr/bin/gpasswd -a '%u' '%g'
-;	delete user from group script = /usr/bin/gpasswd -d '%u' '%g'
-;	set primary group script = /usr/sbin/usermod -g '%g' '%u'
-;	add group script = /usr/sbin/groupadd %g && getent group '%g'|awk -F: '{print $3}'
-;	delete group script = /usr/sbin/groupdel '%g'
-
-;	passdb backend = smbpasswd guest
-;	passdb backend = tdbsam smbpasswd guest
-;	passdb backend = ldapsam:ldaps://ldap.mydomain.com smbpasswd guest
-;	passdb backend = ldapsam_compat:ldaps://ldap.mydomain.com smbpasswd guest
-
-;	idmap uid = 10000-20000
-;	idmap gid = 10000-20000
-  
-;	name resolve order = wins lmhosts bcast
-	name resolve order = wins lmhosts bcast host
-
-;	wins support = yes
-;	wins server =  10.12.11.2 2001:6f8:1db7::1 fe80::2e0:4cff:fe69:50b7 127.0.0.1 ::1
-
-;	wins server = w.x.y.z
-
-;	wins proxy = yes
-
-	dns proxy = no 
-
-;	preserve case = no
-;	short preserve case = no
-;	default case = lower
-;	case sensitive = no
-
-	dos charset = 850
-	unix charset = UTF-8
-
-	force create mode = 0644
-	force directory mode = 0755
-	create mask = 000
-	directory mask = 000
-
-	follow symlinks = yes
-;	wide links = yes
-;	unix extensions = no
-	wide links = no
-	unix extensions = yes
-
-	force group = users
-
-
-#============================ Share Definitions ==============================
-[homes]
-	comment = Home Directories
-	browseable = no
-	writable = yes
-	printable = no
-	create mask = 0664
-	directory mask = 0775
-;	vfs object = /usr/lib/samba/vfs/recycle.so
-	follow symlinks = yes
-	wide links = yes
-	public = no
-	
-
-;[netlogon]
-;	comment = Network Logon Service
-;	path = /var/lib/samba/netlogon
-;	guest ok = yes
-;	writable = no
-
-;[Profiles]
-;	path = /var/lib/samba/profiles
-;	browseable = no
-;	guest ok = yes
-;	root preexec = PROFILE=/var/lib/samba/profiles/%u; if [ ! -e $PROFILE ]; \
-;                then mkdir -pm700 $PROFILE; chown %u:%g $PROFILE;fi
-
-[printers]
-	comment = Alle Drucker
-	path = /var/spool/samba
-	browseable = yes
-	guest ok = yes
-	writable = no
-	printable = yes
-	create mode = 0700
-	printer admin = root, @lp
-	#print command = lpr-cups -P %p -o raw %s -r   # using client side printer drivers.
-;	print command = lpr-cups -P %p %s # using cups own drivers (use generic PostScript on clients).
-;	lpq command = lpq -P %p
-;	lprm command = cancel %p-%j
-
-#[print$]
-#	path = /var/lib/samba/printers
-#	browseable = yes
-#	read only = yes
-#	write list = @adm root
-#	guest ok = yes
-
-[all]
-	path = /data/all
-	browseable = yes
-	comment = Oeffentliches Zeug
-	#public = no
-	writable = no
-	write list = @users
-	printable = no
-	create mask = 0664
-	directory mask = 0775
-	guest ok = yes
-#	vfs object = /usr/lib/samba/vfs/audit.so
-
-[inst]
-	path = /data/inst
-	browseable = yes
-	comment = Installations-Dateien
-	public = yes
-	only guest = yes
-	writable = no
-	write list = @users
-	printable = no
-	force user = frank
-	create mask = 0664
-	directory mask = 0775
-
diff --git a/samba.orig/smb.conf.default b/samba.orig/smb.conf.default
deleted file mode 100644
index 57061345..00000000
--- a/samba.orig/smb.conf.default
+++ /dev/null
@@ -1,274 +0,0 @@
-# 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 (perhaps too
-# many!) most of which are not shown in this example
-#
-# For a step to step guide on installing, configuring and using samba, 
-# read the Samba-HOWTO-Collection. This may be obtained from:
-#  http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf
-#
-# Many working examples of smb.conf files can be found in the 
-# Samba-Guide which is generated daily and can be downloaded from: 
-#  http://www.samba.org/samba/docs/Samba-Guide.pdf
-#
-# 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. 
-#
-#======================= Global Settings =====================================
-[global]
-
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
-   workgroup = MYGROUP
-
-# server string is the equivalent of the NT Description field
-   server string = Samba Server
-
-# Security mode. Defines in which mode Samba will operate. Possible 
-# values are share, user, server, domain and ads. Most people will want 
-# user level security. See the Samba-HOWTO-Collection for details.
-   security = user
-
-# This option is important for security. It allows you to restrict
-# connections to machines which are on your local network. The
-# following example restricts access to two C class networks and
-# the "loopback" interface. For more examples of the syntax see
-# the smb.conf man page
-;   hosts allow = 192.168.1. 192.168.2. 127.
-
-# If you want to automatically load your printer list rather
-# than setting them up individually then you'll need this
-   load printers = yes
-
-# you may wish to override the location of the printcap file
-;   printcap name = /etc/printcap
-
-# on SystemV system setting printcap name to lpstat should allow
-# you to automatically obtain a printer list from the SystemV spool
-# system
-;   printcap name = lpstat
-
-# It should not be necessary to specify the print system type unless
-# it is non-standard. Currently supported print systems include:
-# bsd, cups, sysv, plp, lprng, aix, hpux, qnx
-;   printing = cups
-
-# Uncomment this if you want a guest account, you must add this to /etc/passwd
-# otherwise the user "nobody" is used
-;  guest account = pcguest
-
-# 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 = 50
-
-# Use password server option only with security = server
-# The argument list may include:
-#   password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
-# or to auto-locate the domain controller/s
-#   password server = *
-;   password server = <NT-Server-Name>
-
-# Use the realm option only with security = ads
-# Specifies the Active Directory realm the host is part of
-;   realm = MY_REALM
-
-# Backend to store user information in. New installations should 
-# use either tdbsam or ldapsam. smbpasswd is available for backwards 
-# compatibility. tdbsam requires no further configuration. If you're 
-# migrating from < samba 3.4, you'll have to convert your old user 
-# passwords to the new backend with the command:
-# pdbedit -i smbpasswd:/var/lib/samba/private/smbpasswd -e
-;   passdb backend = tdbsam
-
-# 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.
-# Note: Consider carefully the location in the configuration file of
-#       this line.  The included file is read at that point.
-;   include = /etc/samba/smb.conf.%m
-
-# 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 
-
-# Browser Control Options:
-# set local master to no if you don't want Samba to become a master
-# browser on your network. Otherwise the normal election rules apply
-;   local master = no
-
-# OS Level determines the precedence of this server in master browser
-# elections. The default value should be reasonable
-;   os level = 33
-
-# 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 
-
-# 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
-
-# Enable this if you want Samba to be a domain logon server for 
-# Windows95 workstations. 
-;   domain logons = yes
-
-# if you enable domain logons then you may want a per-machine or
-# per user logon script
-# run a specific logon batch file per workstation (machine)
-;   logon script = %m.bat
-# run a specific logon batch file per username
-;   logon script = %U.bat
-
-# Where to store roving profiles (only for Win95 and WinNT)
-#        %L substitutes for this servers netbios name, %U is username
-#        You must uncomment the [Profiles] share below
-;   logon path = \\%L\Profiles\%U
-
-# Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
-;   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 NOT both
-;   wins server = w.x.y.z
-
-# WINS Proxy - Tells Samba to answer name resolution queries on
-# behalf of a non WINS capable client, for this to work there must be
-# 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 default is NO.
-   dns proxy = no 
-
-# These scripts are used on a domain controller or stand-alone 
-# machine to add or delete corresponding unix accounts
-;  add user script = /usr/sbin/useradd %u
-;  add group script = /usr/sbin/groupadd %g
-;  add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
-;  delete user script = /usr/sbin/userdel %u
-;  delete user from group script = /usr/sbin/deluser %u %g
-;  delete group script = /usr/sbin/groupdel %g
-
-
-#============================ Share Definitions ==============================
-[homes]
-   comment = Home Directories
-   browseable = no
-   writable = yes
-
-# Un-comment the following and create the netlogon directory for Domain Logons
-; [netlogon]
-;   comment = Network Logon Service
-;   path = /var/lib/samba/netlogon
-;   guest ok = yes
-;   writable = no
-;   share modes = no
-
-
-# Un-comment the following to provide a specific roving profile share
-# the default is to use the user's home directory
-;[Profiles]
-;    path = /var/lib/samba/profiles
-;    browseable = no
-;    guest ok = yes
-
-
-# NOTE: If you have a BSD-style print system there is no need to 
-# specifically define each individual printer
-[printers]
-   comment = All Printers
-   path = /var/spool/samba
-   browseable = no
-# Set public = yes to allow user 'guest account' to print
-   guest ok = no
-   writable = no
-   printable = yes
-
-# This one is useful for people to share files
-;[tmp]
-;   comment = Temporary file space
-;   path = /tmp
-;   read only = no
-;   public = yes
-
-# A publicly accessible directory, but read only, except for people in
-# the "staff" group
-;[public]
-;   comment = Public Stuff
-;   path = /home/samba
-;   public = yes
-;   writable = yes
-;   printable = no
-;   write list = @staff
-
-# 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 directory,
-# wherever it is.
-;[fredsprn]
-;   comment = Fred's Printer
-;   valid users = fred
-;   path = /homes/fred
-;   printer = freds_printer
-;   public = no
-;   writable = no
-;   printable = yes
-
-# A private directory, usable only by fred. Note that fred requires write
-# access to the directory.
-;[fredsdir]
-;   comment = Fred's Service
-;   path = /usr/somewhere/private
-;   valid users = fred
-;   public = no
-;   writable = yes
-;   printable = no
-
-# 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]
-;  comment = PC Directories
-;  path = /usr/pc/%m
-;  public = no
-;  writable = yes
-
-# 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 would be owned by that user instead.
-;[public]
-;   path = /usr/somewhere/else/public
-;   public = yes
-;   only guest = yes
-;   writable = yes
-;   printable = no
-
-# 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]
-;   comment = Mary's and Fred's stuff
-;   path = /usr/somewhere/shared
-;   valid users = mary fred
-;   public = no
-;   writable = yes
-;   printable = no
-;   create mask = 0765
-
-
diff --git a/samba.orig/smb.conf.michael b/samba.orig/smb.conf.michael
deleted file mode 100644
index e572d12a..00000000
--- a/samba.orig/smb.conf.michael
+++ /dev/null
@@ -1,56 +0,0 @@
-[global]
-
- workgroup = ARBEITSGRUPPE
- #server string = Samba %v
- server string = Fileserver
- netbios name = FILESERVER
- interfaces = lo 10.1.0.0/24
- hosts allow = 127. 10.1.0.
- name resolve order = wins lmhosts hosts
- #socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE IPTOS_LOWDELAY
- #socket options = TCP_NODELAY SO_RCVBUF=65520 SO_SNDBUF=65520
- #strict sync = yes
- #sync always = yes
- # This will prevent nmbd to search for NetBIOS names through DNS.
- dns proxy = no
- # fix umlaute when using windows clients
- dos charset = 850
- unix charset = UTF-8
- force create mode = 0644
- force directory mode = 0755
- create mask = 000
- directory mask = 000
- security = user
- passdb backend = tdbsam
- # You may wish to use password encryption. See the section on
- # 'encrypt passwords' in the smb.conf(5) manpage before enabling.
- encrypt passwords = true
- # disable printer support completely
- load printers = no
- cups options = raw
- printcap name = /etc/printcap
- printing =
- # 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
- # 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
- # 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 = /etc/samba/smb.conf.%m
-;/etc/samba/smb.conf.irgendeinhostname:
-;[dms]
-; comment = DMS
-; path = /storage/antea/dms
-; browseable = yes
-; writable = yes
-; valid users = mbalser
-; force user = nobody
-; force group = nogroup
-
-; vim: filetype=samba ts=4 expandtab
diff --git a/samba.orig/smb.conf.orig b/samba.orig/smb.conf.orig
deleted file mode 100644
index ba7dc10e..00000000
--- a/samba.orig/smb.conf.orig
+++ /dev/null
@@ -1,184 +0,0 @@
-# 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 (perhaps too
-# many!) 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 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. 
-#
-#======================= Global Settings =====================================
-[global]
-
-;	workgroup = Brehm
-	workgroup = Hennig
-	netbios name = Bruni
-;	netbios name = Brunhilde
-	server string = %h
-;	server string = %h - (Samba %v)
-	printcap name = cups
-	load printers = yes
-	printing = cups
-;	printer admin = @adm
-;	printer admin = @"Domain Admins"
-	log file = /var/log/samba/log.%m
-	max log size = 1024
-	log level = 2
-;	hosts allow = 10.12.11. 127. ::1 2001:6f8:1db7::/64 fe80::/64 2001:6f8:1c00:365::/64
-;	guest account = pcguest
-	map to guest = bad user
-	security = user
-;	password server = <NT-Server-Name>
-;	password server = *
-;	password level = 8
-;	username level = 8
-	encrypt passwords = yes
-;	smb passwd file = /var/lib/samba/private/smbpasswd
-	passdb backend = tdbsam
-;	unix password sync = Yes
-;	pam password change = yes
-;	passwd program = /usr/bin/passwd %u
-;	passwd chat = *New*UNIX*password* %n\n *Re*ype*new*UNIX*password* %n\n \
-;*passwd:*all*authentication*tokens*updated*successfully*
-;	username map = /etc/samba/smbusers
-;	include = /etc/samba/smb.conf.%m
-;	winbind separator = +
-;	winbind use default domain = yes
-;	template homedir = /home/%D/%U
-;	obey pam restrictions = yes
-;	template shell = /bin/bash
-	socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
-;	interfaces = eth0 eth1 10.12.11.0/24
-	interfaces = eth1
-;	remote browse sync = 192.168.3.25 192.168.5.255
-;	remote browse sync = 10.12.11.255 
-;	remote announce = 192.168.1.255 192.168.2.44
-;	remote announce = 10.12.11.255
-	local master = yes
-	os level = 100
-	domain master = yes 
-	preferred master = yes
-;	domain logons = yes
-;	logon script = %m.bat
-;	logon script = %U.bat
-;	logon path = \\%L\Profiles\%U
-;	logon home = \\%L\%U\.profile
-	enhanced browsing = yes
-
-;	add user script = /usr/sbin/useradd -s /bin/false '%u'
-;	delete user script = /usr/sbin/userdel '%s'
-;	add user to group script = /usr/bin/gpasswd -a '%u' '%g'
-;	delete user from group script = /usr/bin/gpasswd -d '%u' '%g'
-;	set primary group script = /usr/sbin/usermod -g '%g' '%u'
-;	add group script = /usr/sbin/groupadd %g && getent group '%g'|awk -F: '{print $3}'
-;	delete group script = /usr/sbin/groupdel '%g'
-
-;	passdb backend = smbpasswd guest
-;	passdb backend = tdbsam smbpasswd guest
-;	passdb backend = ldapsam:ldaps://ldap.mydomain.com smbpasswd guest
-;	passdb backend = ldapsam_compat:ldaps://ldap.mydomain.com smbpasswd guest
-
-;	idmap uid = 10000-20000
-;	idmap gid = 10000-20000
-  
-;	name resolve order = wins lmhosts bcast
-	name resolve order = wins lmhosts bcast host
-
-;	wins support = yes
-;	wins server =  10.12.11.2 2001:6f8:1db7::1 fe80::2e0:4cff:fe69:50b7 127.0.0.1 ::1
-
-;	wins server = w.x.y.z
-
-;	wins proxy = yes
-
-	dns proxy = no 
-
-;	preserve case = no
-;	short preserve case = no
-;	default case = lower
-;	case sensitive = no
-
-	dos charset = 850
-	unix charset = UTF-8
-
-	follow symlinks = yes
-	wide links = yes
-	unix extensions = no
-
-
-#============================ Share Definitions ==============================
-[homes]
-	comment = Home Directories
-	browseable = yes
-	writable = yes
-	printable = no
-	create mask = 0664
-	directory mask = 0775
-;	vfs object = /usr/lib/samba/vfs/recycle.so
-	follow symlinks = yes
-	wide links = yes
-	public = no
-	
-
-;[netlogon]
-;	comment = Network Logon Service
-;	path = /var/lib/samba/netlogon
-;	guest ok = yes
-;	writable = no
-
-;[Profiles]
-;	path = /var/lib/samba/profiles
-;	browseable = no
-;	guest ok = yes
-;	root preexec = PROFILE=/var/lib/samba/profiles/%u; if [ ! -e $PROFILE ]; \
-;                then mkdir -pm700 $PROFILE; chown %u:%g $PROFILE;fi
-
-[printers]
-	comment = Alle Drucker
-	path = /var/spool/samba
-	browseable = yes
-	guest ok = yes
-	writable = no
-	printable = yes
-	create mode = 0700
-	#print command = lpr-cups -P %p -o raw %s -r   # using client side printer drivers.
-;	print command = lpr-cups -P %p %s # using cups own drivers (use generic PostScript on clients).
-;	lpq command = lpq -P %p
-;	lprm command = cancel %p-%j
-
-[print$]
-	path = /var/lib/samba/printers
-	browseable = yes
-	read only = yes
-	write list = @adm root
-	guest ok = yes
-
-[all]
-	path = /data/all
-	browseable = yes
-	comment = Oeffentliches Zeug
-	public = no
-	writable = no
-	write list = @users
-	printable = no
-	create mask = 0664
-	directory mask = 0775
-;	vfs object = /usr/lib/samba/vfs/audit.so
-
-[inst]
-	path = /data/inst
-	browseable = yes
-	comment = Installations-Dateien
-	public = no
-;	only guest = yes
-	writable = no
-	write list = @users
-	printable = no
-;	force user = frank
-	create mask = 0664
-	directory mask = 0775
-
diff --git a/samba.orig/smbusers b/samba.orig/smbusers
deleted file mode 100644
index 85f82eea..00000000
--- a/samba.orig/smbusers
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.5/smbusers,v 1.1 2010/03/01 16:19:54 patrick Exp $
-
-# Syntax:
-#   Unix_name = SMB_name1 SMB_name2 ...
-
-root = Administrator admin
-nobody = guest pcguest smbguest
-frank = frank
diff --git a/samba/smb.conf b/samba/smb.conf
new file mode 100644
index 00000000..f4564ad9
--- /dev/null
+++ b/samba/smb.conf
@@ -0,0 +1,131 @@
+#======================= Global Settings =====================================
+[global]
+
+	workgroup = HENNIG
+
+	server string = %h - (Samba %v)
+
+	security = user
+
+;	hosts allow = 192.168.1. 192.168.2. 127.
+
+	load printers = yes
+
+	printcap name = /etc/printcap
+
+	printing = cups
+
+	guest account = pcguest
+
+	guest ok = yes
+
+	log file = /var/log/samba/log.%m
+
+	max log size = 5120
+
+#	log level = 3 passdb:5 auth:10
+	log level = 3
+
+	passdb backend = tdbsam
+
+#	interfaces = lo 10.12.11.0/24 172.20.1.0/24
+
+	local master = yes
+
+;	os level = 33
+
+	domain master = yes 
+
+	preferred master = yes
+
+;	domain logons = yes
+
+;	logon script = %m.bat
+;	logon script = %U.bat
+
+;	logon path = \\%L\Profiles\%U
+
+;	wins support = yes
+
+;	wins server = w.x.y.z
+
+;	wins proxy = yes
+
+	dns proxy = no 
+
+;	add user script = /usr/sbin/useradd %u
+;	add group script = /usr/sbin/groupadd %g
+;	add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
+;	delete user script = /usr/sbin/userdel %u
+;	delete user from group script = /usr/sbin/deluser %u %g
+;	delete group script = /usr/sbin/groupdel %g
+
+	unix extensions = yes
+	force group = users
+
+#============================ Share Definitions ==============================
+[homes]
+	comment = Home Directories
+	browseable = no
+	writable = yes
+	create mask = 0664
+	directory mask = 0775
+	follow symlinks = yes
+
+# Un-comment the following and create the netlogon directory for Domain Logons
+; [netlogon]
+;	comment = Network Logon Service
+;	path = /var/lib/samba/netlogon
+;	guest ok = yes
+;	writable = no
+;	share modes = no
+
+
+# Un-comment the following to provide a specific roving profile share
+# the default is to use the user's home directory
+;[Profiles]
+;	path = /var/lib/samba/profiles
+;	browseable = no
+;	guest ok = yes
+
+
+# NOTE: If you have a BSD-style print system there is no need to 
+# specifically define each individual printer
+[printers]
+	comment = Alle Drucker
+	path = /var/spool/samba
+	browseable = yes
+# Set public = yes to allow user 'guest account' to print
+	guest ok = yes
+	writable = no
+	printable = yes
+#	printer admin = root, @lp
+
+[all]
+        path = /data/all
+        browseable = yes
+        comment = Oeffentliches Zeug
+        #public = no
+        writable = no
+        write list = @users
+        printable = no
+        create mask = 0664
+        directory mask = 0775
+        guest ok = yes
+#       vfs object = /usr/lib/samba/vfs/audit.so
+
+[inst]
+        path = /data/inst
+        browseable = yes
+        comment = Installations-Dateien
+        public = yes
+        only guest = yes
+        writable = no
+        write list = @users
+        printable = no
+        force user = frank
+        create mask = 0664
+        directory mask = 0775
+        guest ok = yes
+
+
diff --git a/samba/smb.conf.michael b/samba/smb.conf.michael
new file mode 100644
index 00000000..e572d12a
--- /dev/null
+++ b/samba/smb.conf.michael
@@ -0,0 +1,56 @@
+[global]
+
+ workgroup = ARBEITSGRUPPE
+ #server string = Samba %v
+ server string = Fileserver
+ netbios name = FILESERVER
+ interfaces = lo 10.1.0.0/24
+ hosts allow = 127. 10.1.0.
+ name resolve order = wins lmhosts hosts
+ #socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE IPTOS_LOWDELAY
+ #socket options = TCP_NODELAY SO_RCVBUF=65520 SO_SNDBUF=65520
+ #strict sync = yes
+ #sync always = yes
+ # This will prevent nmbd to search for NetBIOS names through DNS.
+ dns proxy = no
+ # fix umlaute when using windows clients
+ dos charset = 850
+ unix charset = UTF-8
+ force create mode = 0644
+ force directory mode = 0755
+ create mask = 000
+ directory mask = 000
+ security = user
+ passdb backend = tdbsam
+ # You may wish to use password encryption. See the section on
+ # 'encrypt passwords' in the smb.conf(5) manpage before enabling.
+ encrypt passwords = true
+ # disable printer support completely
+ load printers = no
+ cups options = raw
+ printcap name = /etc/printcap
+ printing =
+ # 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
+ # 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
+ # 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 = /etc/samba/smb.conf.%m
+;/etc/samba/smb.conf.irgendeinhostname:
+;[dms]
+; comment = DMS
+; path = /storage/antea/dms
+; browseable = yes
+; writable = yes
+; valid users = mbalser
+; force user = nobody
+; force group = nogroup
+
+; vim: filetype=samba ts=4 expandtab
diff --git a/samba/smb.conf.orig.0 b/samba/smb.conf.orig.0
new file mode 100644
index 00000000..ba7dc10e
--- /dev/null
+++ b/samba/smb.conf.orig.0
@@ -0,0 +1,184 @@
+# 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 (perhaps too
+# many!) 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 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. 
+#
+#======================= Global Settings =====================================
+[global]
+
+;	workgroup = Brehm
+	workgroup = Hennig
+	netbios name = Bruni
+;	netbios name = Brunhilde
+	server string = %h
+;	server string = %h - (Samba %v)
+	printcap name = cups
+	load printers = yes
+	printing = cups
+;	printer admin = @adm
+;	printer admin = @"Domain Admins"
+	log file = /var/log/samba/log.%m
+	max log size = 1024
+	log level = 2
+;	hosts allow = 10.12.11. 127. ::1 2001:6f8:1db7::/64 fe80::/64 2001:6f8:1c00:365::/64
+;	guest account = pcguest
+	map to guest = bad user
+	security = user
+;	password server = <NT-Server-Name>
+;	password server = *
+;	password level = 8
+;	username level = 8
+	encrypt passwords = yes
+;	smb passwd file = /var/lib/samba/private/smbpasswd
+	passdb backend = tdbsam
+;	unix password sync = Yes
+;	pam password change = yes
+;	passwd program = /usr/bin/passwd %u
+;	passwd chat = *New*UNIX*password* %n\n *Re*ype*new*UNIX*password* %n\n \
+;*passwd:*all*authentication*tokens*updated*successfully*
+;	username map = /etc/samba/smbusers
+;	include = /etc/samba/smb.conf.%m
+;	winbind separator = +
+;	winbind use default domain = yes
+;	template homedir = /home/%D/%U
+;	obey pam restrictions = yes
+;	template shell = /bin/bash
+	socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
+;	interfaces = eth0 eth1 10.12.11.0/24
+	interfaces = eth1
+;	remote browse sync = 192.168.3.25 192.168.5.255
+;	remote browse sync = 10.12.11.255 
+;	remote announce = 192.168.1.255 192.168.2.44
+;	remote announce = 10.12.11.255
+	local master = yes
+	os level = 100
+	domain master = yes 
+	preferred master = yes
+;	domain logons = yes
+;	logon script = %m.bat
+;	logon script = %U.bat
+;	logon path = \\%L\Profiles\%U
+;	logon home = \\%L\%U\.profile
+	enhanced browsing = yes
+
+;	add user script = /usr/sbin/useradd -s /bin/false '%u'
+;	delete user script = /usr/sbin/userdel '%s'
+;	add user to group script = /usr/bin/gpasswd -a '%u' '%g'
+;	delete user from group script = /usr/bin/gpasswd -d '%u' '%g'
+;	set primary group script = /usr/sbin/usermod -g '%g' '%u'
+;	add group script = /usr/sbin/groupadd %g && getent group '%g'|awk -F: '{print $3}'
+;	delete group script = /usr/sbin/groupdel '%g'
+
+;	passdb backend = smbpasswd guest
+;	passdb backend = tdbsam smbpasswd guest
+;	passdb backend = ldapsam:ldaps://ldap.mydomain.com smbpasswd guest
+;	passdb backend = ldapsam_compat:ldaps://ldap.mydomain.com smbpasswd guest
+
+;	idmap uid = 10000-20000
+;	idmap gid = 10000-20000
+  
+;	name resolve order = wins lmhosts bcast
+	name resolve order = wins lmhosts bcast host
+
+;	wins support = yes
+;	wins server =  10.12.11.2 2001:6f8:1db7::1 fe80::2e0:4cff:fe69:50b7 127.0.0.1 ::1
+
+;	wins server = w.x.y.z
+
+;	wins proxy = yes
+
+	dns proxy = no 
+
+;	preserve case = no
+;	short preserve case = no
+;	default case = lower
+;	case sensitive = no
+
+	dos charset = 850
+	unix charset = UTF-8
+
+	follow symlinks = yes
+	wide links = yes
+	unix extensions = no
+
+
+#============================ Share Definitions ==============================
+[homes]
+	comment = Home Directories
+	browseable = yes
+	writable = yes
+	printable = no
+	create mask = 0664
+	directory mask = 0775
+;	vfs object = /usr/lib/samba/vfs/recycle.so
+	follow symlinks = yes
+	wide links = yes
+	public = no
+	
+
+;[netlogon]
+;	comment = Network Logon Service
+;	path = /var/lib/samba/netlogon
+;	guest ok = yes
+;	writable = no
+
+;[Profiles]
+;	path = /var/lib/samba/profiles
+;	browseable = no
+;	guest ok = yes
+;	root preexec = PROFILE=/var/lib/samba/profiles/%u; if [ ! -e $PROFILE ]; \
+;                then mkdir -pm700 $PROFILE; chown %u:%g $PROFILE;fi
+
+[printers]
+	comment = Alle Drucker
+	path = /var/spool/samba
+	browseable = yes
+	guest ok = yes
+	writable = no
+	printable = yes
+	create mode = 0700
+	#print command = lpr-cups -P %p -o raw %s -r   # using client side printer drivers.
+;	print command = lpr-cups -P %p %s # using cups own drivers (use generic PostScript on clients).
+;	lpq command = lpq -P %p
+;	lprm command = cancel %p-%j
+
+[print$]
+	path = /var/lib/samba/printers
+	browseable = yes
+	read only = yes
+	write list = @adm root
+	guest ok = yes
+
+[all]
+	path = /data/all
+	browseable = yes
+	comment = Oeffentliches Zeug
+	public = no
+	writable = no
+	write list = @users
+	printable = no
+	create mask = 0664
+	directory mask = 0775
+;	vfs object = /usr/lib/samba/vfs/audit.so
+
+[inst]
+	path = /data/inst
+	browseable = yes
+	comment = Installations-Dateien
+	public = no
+;	only guest = yes
+	writable = no
+	write list = @users
+	printable = no
+;	force user = frank
+	create mask = 0664
+	directory mask = 0775
+
diff --git a/samba/smb.conf.orig.1 b/samba/smb.conf.orig.1
new file mode 100644
index 00000000..44444172
--- /dev/null
+++ b/samba/smb.conf.orig.1
@@ -0,0 +1,185 @@
+#======================= Global Settings =====================================
+[global]
+
+;	workgroup = Brehm
+	workgroup = HENNIG
+	netbios name = Bruni
+;	server string = %h
+	server string = %h - (Samba %v)
+	load printers = yes
+	printing = cups
+;	printcap name = cups
+	printcap name = /etc/printcap
+	cups options = raw
+;	printer admin = @adm
+;	printer admin = @"Domain Admins"
+	log file = /var/log/samba/log.%m
+	max log size = 5120
+	log level = 2 passdb:5 auth:10
+;	hosts allow = 10.12.11. 127. ::1 2001:6f8:1db7::/64 fe80::/64 2001:6f8:1c00:365::/64
+	#guest account = pcguest
+	#map to guest = bad user
+	security = user
+;	password server = <NT-Server-Name>
+;	password server = *
+;	password level = 8
+;	username level = 8
+	encrypt passwords = true
+;	smb passwd file = /var/lib/samba/private/smbpasswd
+	passdb backend = tdbsam
+    	lanman auth = yes
+;	unix password sync = Yes
+;	pam password change = yes
+;	passwd program = /usr/bin/passwd %u
+;	passwd chat = *New*UNIX*password* %n\n *Re*ype*new*UNIX*password* %n\n \
+;*passwd:*all*authentication*tokens*updated*successfully*
+;	username map = /etc/samba/smbusers
+;	include = /etc/samba/smb.conf.%m
+;	winbind separator = +
+;	winbind use default domain = yes
+;	template homedir = /home/%D/%U
+;	obey pam restrictions = yes
+;	template shell = /bin/bash
+	#socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
+;	interfaces = eth0 eth1 10.12.11.0/24
+	#interfaces = eth0
+	interfaces = lo 10.12.11.0/24 172.20.1.0/24
+;	remote browse sync = 192.168.3.25 192.168.5.255
+;	remote browse sync = 10.12.11.255 
+;	remote announce = 192.168.1.255 192.168.2.44
+;	remote announce = 10.12.11.255
+;	local master = yes
+;	os level = 100
+;	domain master = yes 
+;	preferred master = yes
+;	domain logons = yes
+;	logon script = %m.bat
+;	logon script = %U.bat
+;	logon path = \\%L\Profiles\%U
+;	logon home = \\%L\%U\.profile
+;	enhanced browsing = yes
+
+;	add user script = /usr/sbin/useradd -s /bin/false '%u'
+;	delete user script = /usr/sbin/userdel '%s'
+;	add user to group script = /usr/bin/gpasswd -a '%u' '%g'
+;	delete user from group script = /usr/bin/gpasswd -d '%u' '%g'
+;	set primary group script = /usr/sbin/usermod -g '%g' '%u'
+;	add group script = /usr/sbin/groupadd %g && getent group '%g'|awk -F: '{print $3}'
+;	delete group script = /usr/sbin/groupdel '%g'
+
+;	passdb backend = smbpasswd guest
+;	passdb backend = tdbsam smbpasswd guest
+;	passdb backend = ldapsam:ldaps://ldap.mydomain.com smbpasswd guest
+;	passdb backend = ldapsam_compat:ldaps://ldap.mydomain.com smbpasswd guest
+
+;	idmap uid = 10000-20000
+;	idmap gid = 10000-20000
+  
+;	name resolve order = wins lmhosts bcast
+	name resolve order = wins lmhosts bcast host
+
+;	wins support = yes
+;	wins server =  10.12.11.2 2001:6f8:1db7::1 fe80::2e0:4cff:fe69:50b7 127.0.0.1 ::1
+
+;	wins server = w.x.y.z
+
+;	wins proxy = yes
+
+	dns proxy = no 
+
+;	preserve case = no
+;	short preserve case = no
+;	default case = lower
+;	case sensitive = no
+
+	dos charset = 850
+	unix charset = UTF-8
+
+	force create mode = 0644
+	force directory mode = 0755
+	create mask = 000
+	directory mask = 000
+
+	follow symlinks = yes
+;	wide links = yes
+;	unix extensions = no
+	wide links = no
+	unix extensions = yes
+
+	force group = users
+
+
+#============================ Share Definitions ==============================
+[homes]
+	comment = Home Directories
+	browseable = no
+	writable = yes
+	printable = no
+	create mask = 0664
+	directory mask = 0775
+;	vfs object = /usr/lib/samba/vfs/recycle.so
+	follow symlinks = yes
+	wide links = yes
+	public = no
+	
+
+;[netlogon]
+;	comment = Network Logon Service
+;	path = /var/lib/samba/netlogon
+;	guest ok = yes
+;	writable = no
+
+;[Profiles]
+;	path = /var/lib/samba/profiles
+;	browseable = no
+;	guest ok = yes
+;	root preexec = PROFILE=/var/lib/samba/profiles/%u; if [ ! -e $PROFILE ]; \
+;                then mkdir -pm700 $PROFILE; chown %u:%g $PROFILE;fi
+
+[printers]
+	comment = Alle Drucker
+	path = /var/spool/samba
+	browseable = yes
+	guest ok = yes
+	writable = no
+	printable = yes
+	create mode = 0700
+	printer admin = root, @lp
+	#print command = lpr-cups -P %p -o raw %s -r   # using client side printer drivers.
+;	print command = lpr-cups -P %p %s # using cups own drivers (use generic PostScript on clients).
+;	lpq command = lpq -P %p
+;	lprm command = cancel %p-%j
+
+#[print$]
+#	path = /var/lib/samba/printers
+#	browseable = yes
+#	read only = yes
+#	write list = @adm root
+#	guest ok = yes
+
+[all]
+	path = /data/all
+	browseable = yes
+	comment = Oeffentliches Zeug
+	#public = no
+	writable = no
+	write list = @users
+	printable = no
+	create mask = 0664
+	directory mask = 0775
+	guest ok = yes
+#	vfs object = /usr/lib/samba/vfs/audit.so
+
+[inst]
+	path = /data/inst
+	browseable = yes
+	comment = Installations-Dateien
+	public = yes
+	only guest = yes
+	writable = no
+	write list = @users
+	printable = no
+	force user = frank
+	create mask = 0664
+	directory mask = 0775
+
diff --git a/samba/smbusers b/samba/smbusers
index 51b8dda2..85f82eea 100644
--- a/samba/smbusers
+++ b/samba/smbusers
@@ -5,3 +5,4 @@
 
 root = Administrator admin
 nobody = guest pcguest smbguest
+frank = frank
diff --git a/xinetd.d/swat b/xinetd.d/swat
index 13b3ee23..bebc1076 100644
--- a/xinetd.d/swat
+++ b/xinetd.d/swat
@@ -13,5 +13,5 @@ service swat
 	user            = root
 	server          = /usr/sbin/swat
 	log_on_failure += USERID
-	disable         = yes
+	disable         = no
 }