Move mdssvc data files to correct package

Update to Samba 4.13.0rc1
Guenther
2020-07-14 13:03:01 +02:00 · 2020-07-09 19:00:47 +02:00 · 2020-07-08 11:12:01 -05:00 · 2020-07-02 19:50:30 +02:00 · 2020-07-02 15:29:06 +02:00 · 2020-07-02 11:39:52 +02:00
23 changed files with 5490 additions and 1645 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +0,0 @@
-samba-3.4.1.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,213 @@
+samba-3.5.4.tar.gz
+samba-3.6.0pre1.tar.gz
+/samba-3.6.0pre2.tar.gz
+/samba-3.6.0pre3.tar.gz
+/samba-3.6.0rc1.tar.gz
+/samba-3.6.0rc2.tar.gz
+/samba-3.6.0rc3.tar.gz
+/samba-3.6.0.tar.gz
+/samba-3.6.1.tar.gz
+/samba-3.6.3.tar.gz
+/samba-3.6.4.tar.gz
+/samba-3.6.5.tar.gz
+/samba-3.6.6.tar.gz
+/samba-3.6.7.tar.gz
+/samba-4.0.0rc1.tar.bz2
+/samba-4.0.0rc2.tar.bz2
+/samba-4.0.0rc3.tar.bz2
+/samba-4.0.0rc4.tar.bz2
+/samba-4.0.0rc5.tar.bz2
+/samba-4.0.0rc6.tar.bz2
+/samba-4.0.0.tar.bz2
+/samba-4.0.1.tar.bz2
+/samba-4.0.2.tar.bz2
+/samba-4.0.3.tar.bz2
+/samba-4.0.4.tar.bz2
+/samba-4.0.5.tar.bz2
+/samba-4.0.6.tar.bz2
+/samba-4.0.7.tar.xz
+/samba-4.1.0rc1.tar.xz
+/samba-4.1.0rc2.tar.xz
+/samba-4.1.0rc3.tar.xz
+/samba-4.1.0rc4.tar.xz
+/samba-4.1.0.tar.xz
+/samba-4.1.1.tar.xz
+/samba-4.1.2.tar.xz
+/samba-4.1.3.tar.xz
+/samba-4.1.4.tar.xz
+/samba-4.1.5.tar.xz
+/samba-4.1.6.tar.xz
+/samba-4.1.8.tar.xz
+/samba-4.1.9.tar.xz
+/samba-4.1.11.tar.gz
+/samba-4.1.11.tar.xz
+/samba-4.1.12.tar.xz
+/samba-4.2.0rc2.tar.xz
+/samba-4.2.0rc3.tar.xz
+/samba-4.2.0rc4.tar.xz
+/samba-4.2.0rc5.tar.xz
+/samba-4.2.0.tar.xz
+/samba-4.2.1.tar.xz
+/samba-4.2.2.tar.xz
+/samba-4.2.3.tar.xz
+/samba-4.3.0rc3.tar.xz
+/samba-4.3.0rc4.tar.xz
+/samba-4.3.0.tar.xz
+/samba-4.3.1.tar.xz
+/samba-4.3.2.tar.xz
+/samba-4.3.3.tar.xz
+/samba-4.3.4.tar.xz
+/samba-4.4.0rc1.tar.xz
+/samba-4.4.0rc2.tar.xz
+/samba-4.4.0rc3.tar.xz
+/samba-4.4.0rc4.tar.xz
+/samba-4.4.0rc5.tar.xz
+/samba-4.4.0.tar.xz
+/samba-4.4.2.tar.xz
+/samba-4.4.3.tar.xz
+/samba-4.4.4.tar.xz
+/samba-4.4.5.tar.xz
+/samba-4.5.0rc1.tar.xz
+/samba-4.5.0rc2.tar.xz
+/samba-4.5.0rc3.tar.xz
+/samba-4.5.0.tar.xz
+/samba-4.5.1.tar.xz
+/samba-4.5.2.tar.xz
+/samba-4.5.3.tar.xz
+/samba-4.6.0rc1.tar.xz
+/samba-4.6.0rc2.tar.xz
+/samba-4.6.0rc2.tar.asc
+/samba-4.6.0rc3.tar.asc
+/samba-4.6.0rc3.tar.xz
+/samba-4.6.0rc4.tar.xz
+/samba-4.6.0rc4.tar.asc
+/samba-4.6.0.tar.asc
+/samba-4.6.0.tar.xz
+/samba-4.6.1.tar.xz
+/samba-4.6.1.tar.asc
+/samba-4.6.2.tar.xz
+/samba-4.6.2.tar.asc
+/samba-4.6.3.tar.xz
+/samba-4.6.3.tar.asc
+/samba-4.6.4.tar.xz
+/samba-4.6.4.tar.asc
+/samba-4.6.5.tar.xz
+/samba-4.6.5.tar.asc
+/samba-4.7.0rc1.tar.xz
+/samba-4.7.0rc1.tar.asc
+/samba-4.7.0rc3.tar.xz
+/samba-4.7.0rc3.tar.asc
+/samba-4.7.0rc5.tar.xz
+/samba-4.7.0rc5.tar.asc
+/samba-4.7.0rc6.tar.xz
+/samba-4.7.0rc6.tar.asc
+/samba-4.7.0.tar.xz
+/samba-4.7.0.tar.asc
+/samba-4.7.1.tar.xz
+/samba-4.7.1.tar.asc
+/samba-4.7.2.tar.xz
+/samba-4.7.2.tar.asc
+/samba-4.7.3.tar.xz
+/samba-4.7.3.tar.asc
+/samba-4.7.4.tar.xz
+/samba-4.7.4.tar.asc
+/samba-4.8.0rc1.tar.xz
+/samba-4.8.0rc1.tar.asc
+/samba-4.8.0rc2.tar.xz
+/samba-4.8.0rc2.tar.asc
+/samba-4.8.0rc3.tar.xz
+/samba-4.8.0rc3.tar.asc
+/samba-4.8.0rc4.tar.xz
+/samba-4.8.0rc4.tar.asc
+/samba-4.8.0.tar.xz
+/samba-4.8.0.tar.asc
+/samba-4.8.1.tar.xz
+/samba-4.8.1.tar.asc
+/samba-4.8.2.tar.xz
+/samba-4.8.2.tar.asc
+/samba-4.8.3.tar.asc
+/samba-4.8.3.tar.xz
+/samba-4.9.0rc1.tar.xz
+/samba-4.9.0rc1.tar.asc
+/samba-4.9.0rc2.tar.xz
+/samba-4.9.0rc2.tar.asc
+/samba-4.9.0rc3.tar.xz
+/samba-4.9.0rc3.tar.asc
+/samba-4.9.0rc4.tar.xz
+/samba-4.9.0rc4.tar.asc
+/samba-4.9.0rc5.tar.asc
+/samba-4.9.0rc5.tar.xz
+/samba-4.9.0.tar.xz
+/samba-4.9.0.tar.asc
+/samba-4.9.1.tar.asc
+/samba-4.9.1.tar.xz
+/samba-4.9.2.tar.xz
+/samba-4.9.2.tar.asc
+/samba-4.9.3.tar.xz
+/samba-4.9.3.tar.asc
+/samba-4.9.4.tar.xz
+/samba-4.9.4.tar.asc
+/samba-4.10.0rc1.tar.xz
+/samba-4.10.0rc1.tar.asc
+/samba-4.10.0rc2.tar.xz
+/samba-4.10.0rc2.tar.asc
+/samba-4.10.0rc3.tar.xz
+/samba-4.10.0rc3.tar.asc
+/samba-4.10.0rc4.tar.xz
+/samba-4.10.0rc4.tar.asc
+/samba-4.10.0.tar.xz
+/samba-4.10.0.tar.asc
+/samba-4.10.1.tar.xz
+/samba-4.10.1.tar.asc
+/samba-4.10.2.tar.xz
+/samba-4.10.2.tar.asc
+/samba-4.10.3.tar.xz
+/samba-4.10.3.tar.asc
+/samba-4.10.4.tar.xz
+/samba-4.10.4.tar.asc
+/samba-4.10.5.tar.xz
+/samba-4.10.5.tar.asc
+/samba-4.10.6.tar.xz
+/samba-4.10.6.tar.asc
+/samba-4.11.0rc1.tar.xz
+/samba-4.11.0rc1.tar.asc
+/samba-4.11.0rc2.tar.xz
+/samba-4.11.0rc2.tar.asc
+/samba-4.11.0rc3.tar.xz
+/samba-4.11.0rc3.tar.asc
+/samba-4.11.0rc4.tar.xz
+/samba-4.11.0rc4.tar.asc
+/samba-4.11.0.tar.xz
+/samba-4.11.0.tar.asc
+/samba-4.11.1.tar.xz
+/samba-4.11.1.tar.asc
+/samba-4.11.2.tar.xz
+/samba-4.11.2.tar.asc
+/samba-4.11.3.tar.xz
+/samba-4.11.3.tar.asc
+/samba-4.11.4.tar.xz
+/samba-4.11.4.tar.asc
+/samba-4.11.5.tar.xz
+/samba-4.11.5.tar.asc
+/samba-4.12.0rc1.tar.xz
+/samba-4.12.0rc1.tar.asc
+/samba-4.12.0rc2.tar.xz
+/samba-4.12.0rc2.tar.asc
+/samba-4.12.0rc3.tar.xz
+/samba-4.12.0rc3.tar.asc
+/samba-4.12.0rc4.tar.xz
+/samba-4.12.0rc4.tar.asc
+/samba-4.12.0.tar.xz
+/samba-4.12.0.tar.asc
+/samba-4.12.1.tar.xz
+/samba-4.12.1.tar.asc
+/samba-4.12.2.tar.xz
+/samba-4.12.2.tar.asc
+/samba-4.12.3.tar.xz
+/samba-4.12.3.tar.asc
+/samba-4.12.4.tar.xz
+/samba-4.12.4.tar.asc
+/samba-4.12.5.tar.xz
+/samba-4.12.5.tar.asc
+/samba-4.13.0rc1.tar.xz
+/samba-4.13.0rc1.tar.asc
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: samba
-# $Id$
-NAME := samba
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
--- a/README.downgrade
+++ b/README.downgrade
@ -0,0 +1,29 @@
+Downgrading Samba
+=================
+
+Short version: data-preserving downgrades between Samba versions are not supported
+
+Long version:
+With Samba development there are cases when on-disk database format evolves.
+In general, Samba Team attempts to maintain forward compatibility and
+automatically upgrade databases during runtime when requires.
+However, when downgrade is required Samba will not perform downgrade to
+existing databases. It may be impossible if new features that caused database
+upgrade are in use. Thus, one needs to consider a downgrade procedure before
+actually downgrading Samba setup.
+
+Please always perform back up prior both upgrading and downgrading across major
+version changes. Restoring database files is easiest and simplest way to get to
+previously working setup.
+
+Easiest way to downgrade is to remove all created databases and start from scratch.
+This means losing all authentication and domain relationship data, as well as
+user databases (in case of tdb storage), printers, registry settings, and winbindd
+caches.
+
+Remove databases in following locations:
+/var/lib/samba/*.tdb
+/var/lib/samba/private/*.tdb
+
+In particular, registry settings are known to prevent running downgraded versions
+(Samba 4 to Samba 3) as registry format has changed between Samba 3 and Samba 4.
--- a/README.md
+++ b/README.md
@ -0,0 +1,186 @@
+Samba is a free SMB and CIFS client and server and Domain Controller for UNIX
+and other operating systems. It is maintained by the Samba Team, who support the
+original author, Andrew Tridgell.
+
+This software is freely distributable under the GNU public license, a copy of
+which you should have received with this software (in a file called COPYING).
+
+# WHAT IS SMB/CIFS?
+This is a big question.
+
+The very short answer is that it is the protocol by which a lot of PC-related
+machines share files and printers and other information such as lists of
+available files and printers. Operating systems that support this natively
+include Windows 9x, Windows NT (and derivatives), OS/2, Mac OS X and Linux. Add
+on packages that achieve the same thing are available for DOS, Windows 3.1, VMS,
+Unix of all kinds, MVS, and more.  Some Web Browsers can speak this protocol as
+well (smb://).  Alternatives to SMB include Netware, NFS, Appletalk, Banyan
+Vines, Decnet etc; many of these have advantages but none are both public
+specifications and widely implemented in desktop machines by default.
+
+The Common Internet File system (CIFS) is what the new SMB initiative is called.
+For details watch [here](https://samba.org/cifs)
+
+# WHY DO PEOPLE WANT TO USE SMB?
+* Many people want to integrate their Microsoft desktop clients with their Unix
+servers.
+
+* Others want to integrate their Microsoft (etc) servers with Unix servers. This
+is a different problem to integrating desktop clients.
+
+* Others want to replace protocols like NFS, DecNet and Novell NCP, especially
+when used with PCs.
+
+# WHAT CAN SAMBA DO?
+Please refer to the WHATSNEW.txt included with this README for a list of
+features in the latest Samba release.
+
+Here is a very short list of what samba includes, and what it does. For many
+networks this can be simply summarized by "Samba provides a complete replacement
+for Windows NT, Warp, NFS or Netware servers."
+* a SMB server, to provide Windows NT and LAN Manager-style file and print
+services to SMB clients such as Windows 95, Warp Server, smbfs and others.
+
+* a Windows Domain Controller (NT4 and AD) replacement.
+
+* a file/print server that can act as a member of a Windows NT 4.0 or Active
+Directory domain.
+
+* a NetBIOS (rfc1001/1002) nameserver, which amongst other things gives browsing
+support. Samba can be the master browser on your LAN if you wish.
+
+* a ftp-like SMB client so you can access PC resources (disks and printers) from
+UNIX, Netware, and other operating systems
+
+* a tar extension to the client for backing up PCs
+
+* limited command-line tool that supports some of the NT administrative
+functionality, which can be used on Samba, NT workstation and NT server.
+
+For a much better overview have a look at the [web site](http://samba.org/samba)
+and browse the user survey.
+
+#### Related packages include:
+* cifsvfs, an advanced Linux-only filesystem allowing you to mount remote SMB
+filesystems from PCs on your Linux box. This is included as standard with Linux
+2.5 and later.
+
+* smbfs, the previous Linux-only filesystem allowing you to mount remote SMB
+filesystems from PCs on your Linux box. This is included as standard with Linux
+2.0 and later.
+
+# CONTRIBUTIONS
+
+### To contribute via GitHub
+  * fork the official Samba team repository on GitHub
+    -- see [GitHub](https://github.com/samba-team/samba)
+
+  * become familiar with the coding standards as described in README.Coding
+
+  * make sure you read the Samba copyright policy
+    -- see [Copyright Policy](https://www.samba.org/samba/devel/copyright-policy.html)
+
+  * create a feature branch
+
+  * make changes
+
+  * when committing, be sure to add signed-off-by tags
+    -- see [Commit message tags](https://wiki.samba.org/index.php/CodeReview#commit_message_tags)
+
+  * send a pull request for your branch through GitHub
+
+  * this will trigger an email to the samba-technical mailing list
+
+  * discussion happens on the samba-technical mailing list as described below
+
+  * more info on using Git for Samba development can be found on Samba Wiki
+    -- see [Using Git for Samba](https://wiki.samba.org/index.php/Using_Git_for_Samba_Development)
+
+### To contribute via mailing lists
+Join the mailing list. The Samba team accepts patches (preferably in "diff -u"
+format, see [here](https://samba.org/samba/devel) for more details) and are
+always glad to receive feedback or suggestions to the address
+samba@lists.samba.org. More information on the various Samba mailing lists can
+be found at [mailman](http://lists.samba.org).
+
+You can also get the Samba sourcecode straight from the [git repository](http://wiki.samba.org/index.php/Using_Git_for_Samba_Development).
+
+If you like a particular feature then look through the git change-log on the
+[web](https://git.samba.org/?p=samba.git;a=summary) and see who added it, then
+send them an email.
+
+Remember that free software of this kind lives or dies by the response we get.
+If no one tells us they like it then we'll probably move onto something else.
+
+
+# MORE INFO
+
+### DOCUMENTATION
+There is quite a bit of documentation included with the package, including man
+pages, and lots of .html files with hints and useful info. This is also
+available from the web page. There is a growing collection of information under
+docs/.
+
+A list of Samba documentation in languages other than English is available on
+the web page.
+
+If you would like to help with the documentation, please coordinate on the
+samba@lists.samba.org mailing list. See the next section for details on
+subscribing to samba mailing lists.
+
+### MAILING LIST
+Please do NOT send subscription/unsubscription requests to the lists!
+
+There is a mailing list for discussion of Samba.  For details go to [mailman](https://lists.samba.org)
+or send mail to <samba-subscribe@lists.samba.org>.
+
+There is also an announcement mailing list where new versions are announced. To
+subscribe go to [mailman](http://lists.samba.org) or send mail to
+<samba-announce-subscribe@lists.samba.org>. All announcements also go to the
+samba list, so you only need to be on one.
+
+For details of other Samba mailing lists and for access to archives, see
+[mailman](http://lists.samba.org)
+
+### MAILING LIST ETIQUETTE
+
+A few tips when submitting to this or any mailing list.
+ - Make your subject short and descriptive. Avoid the words "help" or "Samba" in
+the subject. The readers of this list already know that a) you need help, and b)
+you are writing about samba (of course, you may need to distinguish between
+Samba PDC and other file sharing software). Avoid phrases such as "what is" and
+"how do i". Some good subject lines might look like "Slow response with Excel
+files" or "Migrating from Samba PDC to NT PDC".
+
+- If you include the original message in your reply, trim it so that only the
+relevant lines, enough to establish context, are included. Chances are (since
+this is a mailing list) we've already read the original message.
+
+- Trim irrelevant headers from the original message in your reply. All we need
+to see is a) From, b) Date, and c) Subject. We don't even really need the
+Subject, if you haven't changed it. Better yet is to just preface the original
+message with "On [date] [someone] wrote:".
+
+- Please don't reply to or argue about spam, spam filters or viruses on any
+Samba lists. We do have a spam filtering system that is working quite well thank
+you very much but occasionally unwanted messages slip through. Deal with it.
+
+- Never say "Me too." It doesn't help anyone solve the problem. Instead, if you
+ARE having the same problem, give more information. Have you seen something that
+the other writer hasn't mentioned, which may be helpful?
+
+- If you ask about a problem, then come up with the solution on your own or
+through another source, by all means post it. Someone else may have the same
+problem and is waiting for an answer, but never hears of it.
+
+- Give as much *relevant* information as possible such as Samba release number,
+OS, kernel version, etc...
+
+- RTFM. Google.
+
+### WEB SITE
+A Samba WWW [site](https://samba.org) has been setup with lots of useful info.
+
+As well as general information and documentation, this also has searchable
+archives of the mailing list and a user survey that shows who else is using this
+package.
--- a/gpgkey-52FBC0B86D954B0843324CDC6F33915B6568B7EA.gpg
+++ b/gpgkey-52FBC0B86D954B0843324CDC6F33915B6568B7EA.gpg
--- a/nmb.init
+++ b/nmb.init
@ -1,114 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: - 91 35
-# description: Starts and stops the Samba smbd and nmbd daemons \
-#	       used to provide SMB network services.
-#
-# pidfile: /var/run/samba/nmbd.pid
-# config:  /etc/samba/smb.conf
-
-
-# Source function library.
-if [ -f /etc/init.d/functions ] ; then
-  . /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ] ; then
-  . /etc/rc.d/init.d/functions
-else
-  exit 1
-fi
-
-# Avoid using root's TMPDIR
-unset TMPDIR
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-if [ -f /etc/sysconfig/samba ]; then
-   . /etc/sysconfig/samba
-fi
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 1
-
-# Check that smb.conf exists.
-[ -f /etc/samba/smb.conf ] || exit 6
-
-RETVAL=0
-
-
-start() {
-        KIND="NMB"
-	echo -n $"Starting $KIND services: "
-	daemon nmbd $NMBDOPTIONS
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nmb || \
-	   RETVAL=1
-	return $RETVAL
-}	
-
-stop() {
-	KIND="NMB"
-	echo -n $"Shutting down $KIND services: "
-	killproc nmbd
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/nmb
-	return $RETVAL
-}	
-
-restart() {
-	stop
-	start
-}	
-
-reload() {
-        echo -n $"Reloading smb.conf file: "
-	killproc nmbd -HUP
-	RETVAL=$?
-	echo
-	return $RETVAL
-}	
-
-rhstatus() {
-	status nmbd
-	return $?
-}	
-
-
-# Allow status as non-root.
-if [ "$1" = status ]; then
-       rhstatus
-       exit $?
-fi
-
-# Check that we can write to it... so non-root users stop here
-[ -w /etc/samba/smb.conf ] || exit 4
-
-
-
-case "$1" in
-  start)
-  	start
-	;;
-  stop)
-  	stop
-	;;
-  restart)
-  	restart
-	;;
-  reload)
-  	reload
-	;;
-  status)
-  	rhstatus
-	;;
-  condrestart)
-  	[ -f /var/lock/subsys/nmb ] && restart || :
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
-	exit 2
-esac
-
-exit $?
--- a/samba-3.0.0rc3-nmbd-netbiosname.patch
+++ b/samba-3.0.0rc3-nmbd-netbiosname.patch
@ -1,90 +0,0 @@
-diff -ur samba-3.0.0rc3/source/lib/popt_common.c samba-3.0.0rc3-lhh/source/lib/popt_common.c
--- samba-3.0.0rc3/source/lib/popt_common.c	2003-09-10 13:57:00.000000000 -0400
-+++ samba-3.0.0rc3-lhh/source/lib/popt_common.c	2003-09-11 13:49:24.000000000 -0400
-@@ -87,7 +87,7 @@
- 
- 	case 'n':
- 		if (arg) {
-			set_global_myname(arg);
-+			set_global_myname_override(arg);
- 		}
- 		break;
- 
-diff -ur samba-3.0.0rc3/source/lib/util.c samba-3.0.0rc3-lhh/source/lib/util.c
--- samba-3.0.0rc3/source/lib/util.c	2003-09-08 12:04:35.000000000 -0400
-+++ samba-3.0.0rc3-lhh/source/lib/util.c	2003-09-11 13:47:18.000000000 -0400
-@@ -84,6 +84,7 @@
- ***********************************************************************/
- 
- static char *smb_myname;
-+static char *smb_myname_override;
- static char *smb_myworkgroup;
- static char *smb_scope;
- static int smb_num_netbios_names;
-@@ -108,6 +109,27 @@
- 	return smb_myname;
- }
- 
-+
-+/***********************************************************************
-+ Allocate and set override for myname. Ensure upper case.
-+***********************************************************************/
-+
-+BOOL set_global_myname_override(const char *myname)
-+{
-+	SAFE_FREE(smb_myname_override);
-+	smb_myname_override = strdup(myname);
-+	if (!smb_myname_override)
-+		return False;
-+	strupper_m(smb_myname_override);
-+	return True;
-+}
-+
-+const char *global_myname_override(void)
-+{
-+	return smb_myname_override;
-+}
-+
-+
- /***********************************************************************
-  Allocate and set myworkgroup. Ensure upper case.
- ***********************************************************************/
-diff -ur samba-3.0.0rc3/source/nmbd/nmbd.c samba-3.0.0rc3-lhh/source/nmbd/nmbd.c
--- samba-3.0.0rc3/source/nmbd/nmbd.c	2003-09-10 13:57:00.000000000 -0400
-+++ samba-3.0.0rc3-lhh/source/nmbd/nmbd.c	2003-09-11 14:05:21.000000000 -0400
-@@ -608,6 +608,7 @@
- 	{"hosts", 'H', POPT_ARG_STRING, dyn_LMHOSTSFILE, 'H', "Load a netbios hosts file"},
- 	{"port", 'p', POPT_ARG_INT, &global_nmb_port, NMB_PORT, "Listen on the specified port" },
- 	POPT_COMMON_SAMBA
-+	POPT_COMMON_CONNECTION
- 	{ NULL }
- 	};
- 
-diff -ur samba-3.0.0rc3/source/param/loadparm.c samba-3.0.0rc3-lhh/source/param/loadparm.c
--- samba-3.0.0rc3/source/param/loadparm.c	2003-09-08 12:04:35.000000000 -0400
-+++ samba-3.0.0rc3-lhh/source/param/loadparm.c	2003-09-11 14:00:51.000000000 -0400
-@@ -1327,7 +1327,10 @@
- 	 */
- 	string_set(&Globals.szPasswdChat, DEFAULT_PASSWD_CHAT);
- 	
-	set_global_myname(myhostname());
-+	if (!global_myname_override())
-+		set_global_myname(myhostname());
-+	else
-+		set_global_myname(global_myname_override());
- 	string_set(&Globals.szNetbiosName,global_myname());
- 
- 	set_global_myworkgroup(WORKGROUP);
-@@ -2698,6 +2701,12 @@
- 	BOOL ret;
- 	pstring netbios_name;
- 
-+	if (global_myname_override()) {
-+		DEBUG(4, ("handle_netbios_name: ignoring netbios name "
-+			  "parameter"));
-+		return True;
-+	}
-+
- 	pstrcpy(netbios_name, pszParmValue);
- 
- 	standard_sub_basic(current_user_info.smb_name, netbios_name,sizeof(netbios_name));
--- a/samba-3.2.0pre1-grouppwd.patch
+++ b/samba-3.2.0pre1-grouppwd.patch
@ -1,11 +0,0 @@
--- samba-3.2.0pre1/source3/winbindd/winbindd_group.c.star	2007-10-03 17:40:31.000000000 -0400
-+++ samba-3.2.0pre1/source3/winbindd/winbindd_group.c	2007-10-03 17:40:46.000000000 -0400
-@@ -215,7 +215,7 @@
- 	/* Group name and password */
- 
- 	safe_strcpy(gr->gr_name, full_group_name, sizeof(gr->gr_name) - 1);
-	safe_strcpy(gr->gr_passwd, "x", sizeof(gr->gr_passwd) - 1);
-+	safe_strcpy(gr->gr_passwd, "*", sizeof(gr->gr_passwd) - 1);
- 
- 	return True;
- }
--- a/samba-3.2.0pre1-pipedir.patch
+++ b/samba-3.2.0pre1-pipedir.patch
@ -1,11 +0,0 @@
--- samba-3.2.0pre1/nsswitch/winbind_struct_protocol.h.pipedir	2007-10-03 15:32:23.000000000 -0400
-+++ samba-3.2.0pre1/nsswitch/winbind_struct_protocol.h	2007-10-03 15:33:13.000000000 -0400
-@@ -24,7 +24,7 @@
-  * is needed for launchd support -- jpeach.
-  */
- #ifndef WINBINDD_SOCKET_DIR
-#define WINBINDD_SOCKET_DIR  "/tmp/.winbindd"  /* Name of PF_UNIX dir */
-+#define WINBINDD_SOCKET_DIR  "/var/run/winbindd"  /* Name of PF_UNIX dir */
- #endif
- 
- /*
--- a/samba-3.2.5-inotify.patch
+++ b/samba-3.2.5-inotify.patch
@ -1,50 +0,0 @@
-=== modified file 'source/smbd/notify_inotify.c'
--- source3/smbd/notify_inotify.c	2007-03-09 12:07:58 +0000
-+++ source3/smbd/notify_inotify.c	2007-04-10 16:27:47 +0000
-@@ -66,6 +66,7 @@
- 	struct sys_notify_context *ctx;
- 	int fd;
- 	struct inotify_watch_context *watches;
-+	bool broken_inotify;	/* Late stop for broken system */
- };
- 
- struct inotify_watch_context {
-@@ -229,8 +230,16 @@
- 	  filenames, and thus can't know how much to allocate
- 	  otherwise
- 	*/
-	if (ioctl(in->fd, FIONREAD, &bufsize) != 0 || 
-	    bufsize == 0) {
-+
-+	if ((ioctl(in->fd, FIONREAD, &bufsize) != 0) && (errno == EACCES)) {
-+		/*
-+		 * Workaround for broken system (SELinux policy bug fixed since long but it is always better not to loop on EACCES)
-+		 */
-+		TALLOC_FREE(fde);
-+		in->broken_inotify = True;
-+		return;
-+	}
-+	if (bufsize == 0) {
- 		DEBUG(0,("No data on inotify fd?!\n"));
- 		return;
- 	}
-@@ -281,6 +290,7 @@
- 	}
- 	in->ctx = ctx;
- 	in->watches = NULL;
-+	in->broken_inotify = False;
- 
- 	ctx->private_data = in;
- 	talloc_set_destructor(in, inotify_destructor);
-@@ -375,6 +385,10 @@
- 
- 	in = talloc_get_type(ctx->private_data, struct inotify_private);
- 
-+	if (in->broken_inotify) {
-+		return NT_STATUS_OK;
-+	}
-+
- 	mask = inotify_map(e);
- 	if (mask == 0) {
- 		/* this filter can't be handled by inotify */
-
--- a/samba.logrotate
+++ b/samba.logrotate
@ -1,7 +1,10 @@
-/var/log/samba/* {
+/var/log/samba/log.* {
+    compress
+    dateext
+    maxage 365
+    rotate 99
    notifempty
    olddir /var/log/samba/old
    missingok
-    sharedscripts
    copytruncate
 }
--- a/samba.spec
+++ b/samba.spec
--- a/samba.sysconfig
+++ b/samba.sysconfig
@ -1,6 +0,0 @@
-# Options to smbd
-SMBDOPTIONS="-D"
-# Options to nmbd
-NMBDOPTIONS="-D"
-# Options for winbindd
-WINBINDOPTIONS=""
--- a/samba.xinetd
+++ b/samba.xinetd
@ -1,15 +0,0 @@
-# default: off
-# description: SWAT is the Samba Web Admin Tool. Use swat \
-#	       to configure your Samba server. To use SWAT, \
-#	       connect to port 901 with your favorite web browser.
-service swat
-{
-	port		= 901
-	socket_type	= stream
-	wait 		= no
-	only_from 	= 127.0.0.1
-	user		= root
-	server		= /usr/sbin/swat
-	log_on_failure	+= USERID
-	disable		= yes
-}
--- a/smb.conf.default
+++ b/smb.conf.default
@ -1,288 +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. 
-#
-#---------------
-# SELINUX NOTES:
-#
-# If you want to use the useradd/groupadd family of binaries please run:
-# setsebool -P samba_domain_controller on
-#
-# If you want to share home directories via samba please run:
-# setsebool -P samba_enable_home_dirs on
-#
-# If you create a new directory you want to share you should mark it as
-# "samba-share_t" so that selinux will let you write into it.
-# Make sure not to do that on system directories as they may already have
-# been marked with othe SELinux labels.
-#
-# Use ls -ldZ /path to see which context a directory has
-#
-# Set labels only on directories you created!
-# To set a label use the following: chcon -t samba_share_t /path
-#
-# If you need to share a system created directory you can use one of the
-# following (read-only/read-write):
-# setsebool -P samba_export_all_ro on
-# or
-# setsebool -P samba_export_all_rw on
-#
-# If you want to run scripts (preexec/root prexec/print command/...) please
-# put them into the /var/lib/samba/scripts directory so that smbd will be
-# allowed to run them.
-# Make sure you COPY them and not MOVE them so that the right SELinux context
-# is applied, to check all is ok use restorecon -R -v /var/lib/samba/scripts
-#
-#--------------
-#
-#======================= Global Settings =====================================
-	
-[global]
-	
-# ----------------------- Netwrok Related Options -------------------------
-#
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
-#
-# server string is the equivalent of the NT Description field
-#
-# netbios name can be used to specify a server name not tied to the hostname
-#
-# Interfaces lets you configure Samba to use multiple interfaces
-# If you have multiple network interfaces then you can list the ones
-# you want to listen on (never omit localhost)
-#
-# Hosts Allow/Hosts Deny lets you restrict who can connect, and you can
-# specifiy it as a per share option as well
-#
-	workgroup = MYGROUP
-	server string = Samba Server Version %v
-	
-;	netbios name = MYSERVER
-	
-;	interfaces = lo eth0 192.168.12.2/24 192.168.13.2/24 
-;	hosts allow = 127. 192.168.12. 192.168.13.
-	
-# --------------------------- Logging Options -----------------------------
-#
-# Log File let you specify where to put logs and how to split them up.
-#
-# Max Log Size let you specify the max size log files should reach
-	
-	# logs split per machine
-	log file = /var/log/samba/log.%m
-	# max 50KB per log file, then rotate
-	max log size = 50
-	
-# ----------------------- Standalone Server Options ------------------------
-#
-# Scurity can be set to user, share(deprecated) or server(deprecated)
-#
-# 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.
-
-	security = user
-	passdb backend = tdbsam
-
-
-# ----------------------- Domain Members Options ------------------------
-#
-# Security must be set to domain or ads
-#
-# Use the realm option only with security = ads
-# Specifies the Active Directory realm the host is part of
-#
-# 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.
-#
-# Use password server option only with security = server or if you can't
-# use the DNS to locate Domain Controllers
-# 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 = *
-	
-	
-;	security = domain
-;	passdb backend = tdbsam
-;	realm = MY_REALM
-
-;	password server = <NT-Server-Name>
-
-# ----------------------- Domain Controller Options ------------------------
-#
-# Security must be set to user for domain controllers
-#
-# 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.
-#
-# 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 Logons let Samba be a domain logon server for Windows workstations. 
-#
-# Logon Scrpit let yuou specify a script to be run at login time on the client
-# You need to provide it in a share called NETLOGON
-#
-# Logon Path let you specify where user profiles are stored (UNC path)
-#
-# Various scripts can be used on a domain controller or stand-alone
-# machine to add or delete corresponding unix accounts
-#
-;	security = user
-;	passdb backend = tdbsam
-	
-;	domain master = yes 
-;	domain logons = yes
-	
-	# the login script name depends on the machine name
-;	logon script = %m.bat
-	# the login script name depends on the unix user used
-;	logon script = %u.bat
-;	logon path = \\%L\Profiles\%u
-	# disables profiles support by specifing an empty path
-;	logon path =          
-	
-;	add user script = /usr/sbin/useradd "%u" -n -g users
-;	add group script = /usr/sbin/groupadd "%g"
-;	add machine script = /usr/sbin/useradd -n -c "Workstation (%u)" -M -d /nohome -s /bin/false "%u"
-;	delete user script = /usr/sbin/userdel "%u"
-;	delete user from group script = /usr/sbin/userdel "%u" "%g"
-;	delete group script = /usr/sbin/groupdel "%g"
-	
-	
-# ----------------------- 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
-#
-# OS Level determines the precedence of this server in master browser
-# elections. The default value should be reasonable
-#
-# Preferred Master causes Samba to force a local browser election on startup
-# and gives it a slightly higher chance of winning the election
-;	local master = no
-;	os level = 33
-;	preferred master = yes
-	
-#----------------------------- Name Resolution -------------------------------
-# Windows Internet Name Serving Support Section:
-# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
-#
-# - WINS Support: Tells the NMBD component of Samba to enable it's WINS Server
-#
-# - WINS Server: Tells the NMBD components of Samba to be a WINS Client
-#
-# - 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.
-#
-# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
-# via DNS nslookups.
-	
-;	wins support = yes
-;	wins server = w.x.y.z
-;	wins proxy = yes
-	
-;	dns proxy = yes
-	
-# --------------------------- Printing Options -----------------------------
-#
-# Load Printers let you load automatically the list of printers rather
-# than setting them up individually
-#
-# Cups Options let you pass the cups libs custom options, setting it to raw
-# for example will let you use drivers on your Windows clients
-#
-# Printcap Name let you specify an alternative printcap file
-#
-# You can choose a non default printing system using the Printing option
-	
-	load printers = yes
-	cups options = raw
-
-;	printcap name = /etc/printcap
-	#obtain list of printers automatically on SystemV
-;	printcap name = lpstat
-;	printing = cups
-
-# --------------------------- Filesystem Options ---------------------------
-#
-# The following options can be uncommented if the filesystem supports
-# Extended Attributes and they are enabled (usually by the mount option
-# user_xattr). Thess options will let the admin store the DOS attributes
-# in an EA and make samba not mess with the permission bits.
-#
-# Note: these options can also be set just per share, setting them in global
-# makes them the default for all shares
-
-;	map archive = no
-;	map hidden = no
-;	map read only = no
-;	map system = no
-;	store dos attributes = yes
-
-
-#============================ Share Definitions ==============================
-	
-[homes]
-	comment = Home Directories
-	browseable = no
-	writable = yes
-;	valid users = %S
-;	valid users = MYDOMAIN\%S
-	
-[printers]
-	comment = All Printers
-	path = /var/spool/samba
-	browseable = no
-	guest ok = no
-	writable = no
-	printable = 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
-	
-	
-# 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
--- a/smb.conf.example
+++ b/smb.conf.example
@ -0,0 +1,313 @@
+# This is the main Samba configuration file. For detailed information about the
+# options listed here, refer to the smb.conf(5) manual page. Samba has a huge
+# number of configurable options, most of which are not shown in this example.
+#
+# The Samba Wiki contains a lot of step-by-step guides installing, configuring,
+# and using Samba:
+# https://wiki.samba.org/index.php/User_Documentation
+#
+# In this file, lines starting with a semicolon (;) or a hash (#) are
+# comments and are ignored. This file uses hashes to denote commentary and
+# semicolons for parts of the file you may wish to configure.
+#
+# NOTE: Run the "testparm" command after modifying this file to check for basic
+# syntax errors.
+#
+#---------------
+# Security-Enhanced Linux (SELinux) Notes:
+#
+# Turn the samba_domain_controller Boolean on to allow a Samba PDC to use the
+# useradd and groupadd family of binaries. Run the following command as the
+# root user to turn this Boolean on:
+# setsebool -P samba_domain_controller on
+#
+# Turn the samba_enable_home_dirs Boolean on if you want to share home
+# directories via Samba. Run the following command as the root user to turn this
+# Boolean on:
+# setsebool -P samba_enable_home_dirs on
+#
+# If you create a new directory, such as a new top-level directory, label it
+# with samba_share_t so that SELinux allows Samba to read and write to it. Do
+# not label system directories, such as /etc/ and /home/, with samba_share_t, as
+# such directories should already have an SELinux label.
+#
+# Run the "ls -ldZ /path/to/directory" command to view the current SELinux
+# label for a given directory.
+#
+# Set SELinux labels only on files and directories you have created. Use the
+# chcon command to temporarily change a label:
+# chcon -t samba_share_t /path/to/directory
+#
+# Changes made via chcon are lost when the file system is relabeled or commands
+# such as restorecon are run.
+#
+# Use the samba_export_all_ro or samba_export_all_rw Boolean to share system
+# directories. To share such directories and only allow read-only permissions:
+# setsebool -P samba_export_all_ro on
+# To share such directories and allow read and write permissions:
+# setsebool -P samba_export_all_rw on
+#
+# To run scripts (preexec/root prexec/print command/...), copy them to the
+# /var/lib/samba/scripts/ directory so that SELinux will allow smbd to run them.
+# Note that if you move the scripts to /var/lib/samba/scripts/, they retain
+# their existing SELinux labels, which may be labels that SELinux does not allow
+# smbd to run. Copying the scripts will result in the correct SELinux labels.
+# Run the "restorecon -R -v /var/lib/samba/scripts" command as the root user to
+# apply the correct SELinux labels to these files.
+#
+#--------------
+#
+#======================= Global Settings =====================================
+
+[global]
+
+# ----------------------- Network-Related Options -------------------------
+#
+# workgroup = the Windows NT domain name or workgroup name, for example, MYGROUP.
+#
+# server string = the equivalent of the Windows NT Description field.
+#
+# netbios name = used to specify a server name that is not tied to the hostname,
+#                maximum is 15 characters.
+#
+# interfaces = used to configure Samba to listen on multiple network interfaces.
+# If you have multiple interfaces, you can use the "interfaces =" option to
+# configure which of those interfaces Samba listens on. Never omit the localhost
+# interface (lo).
+#
+# hosts allow = the hosts allowed to connect. This option can also be used on a
+# per-share basis.
+#
+# hosts deny = the hosts not allowed to connect. This option can also be used on
+# a per-share basis.
+#
+	workgroup = MYGROUP
+	server string = Samba Server Version %v
+
+;	netbios name = MYSERVER
+
+;	interfaces = lo eth0 192.168.12.2/24 192.168.13.2/24
+;	hosts allow = 127. 192.168.12. 192.168.13.
+
+# --------------------------- Logging Options -----------------------------
+#
+# log file = specify where log files are written to and how they are split.
+#
+# max log size = specify the maximum size log files are allowed to reach. Log
+# files are rotated when they reach the size specified with "max log size".
+#
+
+	# log files split per-machine:
+	log file = /var/log/samba/log.%m
+	# maximum size of 50KB per log file, then rotate:
+	max log size = 50
+
+# ----------------------- Standalone Server Options ------------------------
+#
+# security = the mode Samba runs in. This can be set to user, share
+# (deprecated), or server (deprecated).
+#
+# passdb backend = the backend used to store user information in. New
+# installations should use either tdbsam or ldapsam. No additional configuration
+# is required for tdbsam. The "smbpasswd" utility is available for backwards
+# compatibility.
+#
+
+	security = user
+	passdb backend = tdbsam
+
+
+# ----------------------- Domain Members Options ------------------------
+#
+# security = must be set to domain or ads.
+#
+# passdb backend = the backend used to store user information in. New
+# installations should use either tdbsam or ldapsam. No additional configuration
+# is required for tdbsam. The "smbpasswd" utility is available for backwards
+# compatibility.
+#
+# realm = only use the realm option when the "security = ads" option is set.
+# The realm option specifies the Active Directory realm the host is a part of.
+#
+# password server = only use this option when the "security = server"
+# option is set, or if you cannot use DNS to locate a Domain Controller. The
+# argument list can include My_PDC_Name, [My_BDC_Name], and [My_Next_BDC_Name]:
+#
+# password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
+#
+# Use "password server = *" to automatically locate Domain Controllers.
+
+;	security = domain
+;	passdb backend = tdbsam
+;	realm = MY_REALM
+
+;	password server = <NT-Server-Name>
+
+# ----------------------- Domain Controller Options ------------------------
+#
+# security = must be set to user for domain controllers.
+#
+# passdb backend = the backend used to store user information in. New
+# installations should use either tdbsam or ldapsam. No additional configuration
+# is required for tdbsam. The "smbpasswd" utility is available for backwards
+# compatibility.
+#
+# domain master = specifies Samba to be the Domain Master Browser, allowing
+# Samba to collate browse lists between subnets. Do not use the "domain master"
+# option if you already have a Windows NT domain controller performing this task.
+#
+# domain logons = allows Samba to provide a network logon service for Windows
+# workstations.
+#
+# logon script = specifies a script to run at login time on the client. These
+# scripts must be provided in a share named NETLOGON.
+#
+# logon path = specifies (with a UNC path) where user profiles are stored.
+#
+#
+;	security = user
+;	passdb backend = tdbsam
+
+;	domain master = yes
+;	domain logons = yes
+
+	# the following login script name is determined by the machine name
+	# (%m):
+;	logon script = %m.bat
+	# the following login script name is determined by the UNIX user used:
+;	logon script = %u.bat
+;	logon path = \\%L\Profiles\%u
+	# use an empty path to disable profile support:
+;	logon path =
+
+	# various scripts can be used on a domain controller or a stand-alone
+	# machine to add or delete corresponding UNIX accounts:
+
+;	add user script = /usr/sbin/useradd "%u" -n -g users
+;	add group script = /usr/sbin/groupadd "%g"
+;	add machine script = /usr/sbin/useradd -n -c "Workstation (%u)" -M -d /nohome -s /bin/false "%u"
+;	delete user script = /usr/sbin/userdel "%u"
+;	delete user from group script = /usr/sbin/userdel "%u" "%g"
+;	delete group script = /usr/sbin/groupdel "%g"
+
+
+# ----------------------- Browser Control Options ----------------------------
+#
+# local master = when set to no, Samba does not become the master browser on
+# your network. When set to yes, normal election rules apply.
+#
+# os level = determines the precedence the server has in master browser
+# elections. The default value should be reasonable.
+#
+# preferred master = when set to yes, Samba forces a local browser election at
+# start up (and gives itself a slightly higher chance of winning the election).
+#
+;	local master = no
+;	os level = 33
+;	preferred master = yes
+
+#----------------------------- Name Resolution -------------------------------
+#
+# This section details the support for the Windows Internet Name Service (WINS).
+#
+# Note: Samba can be either a WINS server or a WINS client, but not both.
+#
+# wins support = when set to yes, the NMBD component of Samba enables its WINS
+# server.
+#
+# wins server = tells the NMBD component of Samba to be a WINS client.
+#
+# wins proxy = when set to yes, Samba answers 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.
+#
+# dns proxy = when set to yes, Samba attempts to resolve NetBIOS names via DNS
+# nslookups.
+
+;	wins support = yes
+;	wins server = w.x.y.z
+;	wins proxy = yes
+
+;	dns proxy = yes
+
+# --------------------------- Printing Options -----------------------------
+#
+# The options in this section allow you to configure a non-default printing
+# system.
+#
+# load printers = when set you yes, the list of printers is automatically
+# loaded, rather than setting them up individually.
+#
+# cups options = allows you to pass options to the CUPS library. Setting this
+# option to raw, for example, allows you to use drivers on your Windows clients.
+#
+# printcap name = used to specify an alternative printcap file.
+#
+
+	load printers = yes
+	cups options = raw
+
+;	printcap name = /etc/printcap
+	# obtain a list of printers automatically on UNIX System V systems:
+;	printcap name = lpstat
+;	printing = cups
+
+# --------------------------- File System Options ---------------------------
+#
+# The options in this section can be un-commented if the file system supports
+# extended attributes, and those attributes are enabled (usually via the
+# "user_xattr" mount option). These options allow the administrator to specify
+# that DOS attributes are stored in extended attributes and also make sure that
+# Samba does not change the permission bits.
+#
+# Note: These options can be used on a per-share basis. Setting them globally
+# (in the [global] section) makes them the default for all shares.
+
+;	map archive = no
+;	map hidden = no
+;	map read only = no
+;	map system = no
+;	store dos attributes = yes
+
+
+#============================ Share Definitions ==============================
+
+[homes]
+	comment = Home Directories
+	browseable = no
+	writable = yes
+;	valid users = %S
+;	valid users = MYDOMAIN\%S
+
+[printers]
+	comment = All Printers
+	path = /var/spool/samba
+	browseable = no
+	guest ok = no
+	writable = no
+	printable = 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 roaming profile share.
+# The default is to use the user's home directory:
+;	[Profiles]
+;	path = /var/lib/samba/profiles
+;	browseable = no
+;	guest ok = yes
+
+# A publicly accessible directory that is read only, except for users in the
+# "staff" group (which have write permissions):
+;	[public]
+;	comment = Public Stuff
+;	path = /home/samba
+;	public = yes
+;	writable = no
+;	printable = no
+;	write list = +staff
--- a/smb.conf.vendor
+++ b/smb.conf.vendor
@ -0,0 +1,37 @@
+# See smb.conf.example for a more detailed config file or
+# read the smb.conf manpage.
+# Run 'testparm' to verify the config is correct after
+# you modified it.
+
+[global]
+	workgroup = SAMBA
+	security = user
+
+	passdb backend = tdbsam
+
+	printing = cups
+	printcap name = cups
+	load printers = yes
+	cups options = raw
+
+[homes]
+	comment = Home Directories
+	valid users = %S, %D%w%S
+	browseable = No
+	read only = No
+	inherit acls = Yes
+
+[printers]
+	comment = All Printers
+	path = /var/tmp
+	printable = Yes
+	create mask = 0600
+	browseable = No
+
+[print$]
+	comment = Printer Drivers
+	path = /var/lib/samba/drivers
+	write list = @printadmin root
+	force group = @printadmin
+	create mask = 0664
+	directory mask = 0775
--- a/smb.init
+++ b/smb.init
@ -1,114 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: - 91 35
-# description: Starts and stops the Samba smbd daemon \
-#	       used to provide SMB network services.
-#
-# pidfile: /var/run/samba/smbd.pid
-# config:  /etc/samba/smb.conf
-
-
-# Source function library.
-if [ -f /etc/init.d/functions ] ; then
-  . /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ] ; then
-  . /etc/rc.d/init.d/functions
-else
-  exit 1
-fi
-
-# Avoid using root's TMPDIR
-unset TMPDIR
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-if [ -f /etc/sysconfig/samba ]; then
-   . /etc/sysconfig/samba
-fi
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 1
-
-# Check that smb.conf exists.
-[ -f /etc/samba/smb.conf ] || exit 6
-
-RETVAL=0
-
-
-start() {
-        KIND="SMB"
-	echo -n $"Starting $KIND services: "
-	daemon smbd $SMBDOPTIONS
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/smb || \
-	   RETVAL=1
-	return $RETVAL
-}	
-
-stop() {
-        KIND="SMB"
-	echo -n $"Shutting down $KIND services: "
-	killproc smbd
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/smb
-	return $RETVAL
-}	
-
-restart() {
-	stop
-	start
-}	
-
-reload() {
-        echo -n $"Reloading smb.conf file: "
-	killproc smbd -HUP
-	RETVAL=$?
-	echo
-	return $RETVAL
-}	
-
-rhstatus() {
-	status smbd
-	return $?
-}	
-
-
-# Allow status as non-root.
-if [ "$1" = status ]; then
-       rhstatus
-       exit $?
-fi
-
-# Check that we can write to it... so non-root users stop here
-[ -w /etc/samba/smb.conf ] || exit 4
-
-
-
-case "$1" in
-  start)
-  	start
-	;;
-  stop)
-  	stop
-	;;
-  restart)
-  	restart
-	;;
-  reload)
-  	reload
-	;;
-  status)
-  	rhstatus
-	;;
-  condrestart)
-  	[ -f /var/lock/subsys/smb ] && restart || :
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
-	exit 2
-esac
-
-exit $?
--- a/84
+++ b/84
@ -1,84 +0,0 @@
-#!/bin/sh
-# This script is an input filter for printcap printing on a unix machine. It
-# uses the smbclient program to print the file to the specified smb-based 
-# server and service.
-# For example you could have a printcap entry like this
-#
-# smb:lp=/dev/null:sd=/usr/spool/smb:sh:if=/usr/local/samba/smbprint
-#
-# which would create a unix printer called "smb" that will print via this 
-# script. You will need to create the spool directory /usr/spool/smb with
-# appropriate permissions and ownerships for your system.
-
-# Set these to the server and service you wish to print to 
-# In this example I have a WfWg PC called "lapland" that has a printer 
-# exported called "printer" with no password.
-
-#
-# Script further altered by hamiltom@ecnz.co.nz (Michael Hamilton)
-# so that the server, service, and password can be read from 
-# a /usr/var/spool/lpd/PRINTNAME/.config file.
-#
-# In order for this to work the /etc/printcap entry must include an 
-# accounting file (af=...):
-#
-#   cdcolour:\
-#	:cm=CD IBM Colorjet on 6th:\
-#	:sd=/var/spool/lpd/cdcolour:\
-#	:af=/var/spool/lpd/cdcolour/acct:\
-#	:if=/usr/local/etc/smbprint:\
-#	:mx=0:\
-#	:lp=/dev/null:
-#
-# The /usr/var/spool/lpd/PRINTNAME/.config file should contain:
-#   share=PC_SERVER
-#   user="user"
-#   password="password"
-#
-# Please, do not modify the order in the file.
-# Example:
-#   share=\\server\deskjet
-#   user="fred"
-#   password=""
-
-#
-# The last parameter to the filter is the accounting file name.
-#   Extract the directory name from the file name.
-#   Concat this with /.config to get the config file.
-#
-eval acct_file=\${$#}
-spool_dir=`dirname $acct_file` 
-config_file=$spool_dir/.config
-
-# Should read the following variables set in the config file:
-#   share
-#   hostip
-#   user
-#   password
-
-eval `cat $config_file`
-
-share=`echo $share | sed "s/[\]/\//g"`
-
-if [ "$user" != "" ]; then
-   usercmd="-U"
-else
-   usercmd=""
-fi
-
-if [ "$workgroup" != "" ]; then
-   workgroupcmd="-W"
-else
-   workgroupcmd=""
-fi
-
-if [ "$translate" = "yes" ]; then
- command="translate ; print -"
-else
- command="print -"
-fi
-#echo $share $password $translate $x_command > /tmp/smbprint.log
-
-cat | /usr/bin/smbclient "$share" "$password" -E ${hostip:+-I} \
-     $hostip -N -P $usercmd "$user" $workgroupcmd "$workgroup" \
-     -c "$command" 2>/dev/null
--- a/3
+++ b/3
@ -1 +1,2 @@
-f857c534148e28b686996d232da76cec  samba-3.4.1.tar.gz
+SHA512 (samba-4.13.0rc1.tar.xz) = 3e6d431998907ad8c81f488ddf78dcef5fd6a4cdf8ca684e5ad0ce9bf7217d82fcca7501155446c83d804f939bea7012f1d37c1f738d8ec7bc769a9148a6592a
+SHA512 (samba-4.13.0rc1.tar.asc) = 6dfe9467fd7fd28db91ae15fa3314a7707cfeb88c8ecd2af532d57614bec311119546a2fd4ced71063df9b7d6879a62f9ba512ae05d494323e0362a5492d33fa
--- a/swat.desktop
+++ b/swat.desktop
@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Samba Configuration
-Name[de]=Samba Konfiguration
-Type=Application
-Comment=Configure Samba with a web based interface
-Exec=htmlview http://127.0.0.1:901/
-Terminal=false
-Categories=X-Red-Hat-Extra;Application;System;X-Red-Hat-ServerConfig;
--- a/winbind.init
+++ b/winbind.init
@ -1,102 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: - 27 73
-# description: Starts and stops the Samba winbind daemon
-#	       #
-# pidfile: /var/run/winbindd.pid
-# config:  /etc/samba/smb.conf
-
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# Avoid using root's TMPDIR
-unset TMPDIR
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 1
-
-# Check that smb.conf exists.
-[ -f /etc/samba/smb.conf ] || exit 6
-
-[ -f /etc/sysconfig/samba ] && . /etc/sysconfig/samba
-
-RETVAL=0
-
-
-start() {
-        KIND="Winbind"
-	echo -n $"Starting $KIND services: "
-	daemon winbindd "$WINBINDOPTIONS"
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/winbindd || RETVAL=1
-	return $RETVAL
-}	
-
-stop() {
-        echo
-	KIND="Winbind"
-	echo -n $"Shutting down $KIND services: "
-	killproc winbindd
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/winbindd
-	echo ""
-	return $RETVAL
-}	
-
-restart() {
-	stop
-	start
-}	
-
-reload() {
-        echo -n $"Reloading smb.conf file: "
-	killproc winbindd -HUP
-	RETVAL=$?
-	echo
-	return $RETVAL
-}	
-
-rhstatus() {
-	status winbindd
-	return $?
-}	
-
-# Allow status as non-root.
-if [ "$1" = status ]; then
-       rhstatus
-       exit $?
-fi
-
-# Check that we can write to it... so non-root users stop here
-[ -w /etc/samba/smb.conf ] || exit 4
-
-case "$1" in
-  start)
-  	start
-	;;
-  stop)
-  	stop
-	;;
-  restart)
-  	restart
-	;;
-  reload)
-  	reload
-	;;
-  status)
-  	rhstatus
-	;;
-  condrestart)
-  	[ -f /var/lock/subsys/winbindd ] && restart || :
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
-	exit 2
-esac
-
-exit $?