diff options
Diffstat (limited to 'packaging/Debian/debian')
32 files changed, 677 insertions, 558 deletions
diff --git a/packaging/Debian/debian/README.build-upstream b/packaging/Debian/debian/README.build-upstream index 8b6cc68178..0a1d68ba37 100644 --- a/packaging/Debian/debian/README.build-upstream +++ b/packaging/Debian/debian/README.build-upstream @@ -3,10 +3,15 @@ Building Samba Packages for Debian GNU/Linux Building Debian packages is not as hard as some people might think. The following instructions will allow you to build your own Samba Debian -packages. These instructions, and the files in packaging/Debian/, are -current as of Samba 2.2.5, and should allow you to build Debian packages -for Debian Potato (2.2), Debian Woody (3.0), and Debian unstable as of -the date Samba 2.2.5 was released. +packages. These instructions, and the files in packaging/Debian/, should +be current as of Samba 3.0beta3, and should allow you to build Debian +packages for Debian unstable. + +We try to maintain as much compatibility with previous releases +of Debian as possible, so it is possible that the files in +packaging/Debian/ can also be used to build Samba Debian packages for +other Debian releases. However, sometimes this is just not possible +because we need to use stuff that is only available on Debian unstable. Instructions ------------ @@ -22,19 +27,29 @@ these instructions: to the normal Debian development packages -- dpkg-dev, libc6-dev, devscripts, etc.): + autoconf debhelper libpam0g-dev libreadline4-dev libcupsys2-dev - autoconf + libacl1-dev | acl-dev (>= 2.0.0) + libkrb5-dev + libldap2-dev + po-debconf + python-dev (>= 2.2) - Notes about the packages required to build Samba Debian packages: + Notes regarding the packages required to build Samba Debian packages: * The libcupsys2-dev is not available in Debian Potato (Debian 2.2). - That's fine; the configure script won't detect CUPS support and the - resulting binaries won't support CUPS. + That's fine; the configure script won't detect CUPS support and the + resulting binaries won't support CUPS. -1) cd samba[-<version>]. For example, "cd samba-2.2.5". + * The list above is current as of samba-3.0.0beta3, but it can get + out of date. The best way to check what packages are required to + build the samba packages on Debian is to look for the Build-Depends: + field in the file debian/control. + +1) cd samba[-<version>]. For example, "cd samba-3.0.0beta3". 2) cp -a packaging/Debian/debian/ debian It's important that you copy instead of symlink because the build tools in Potato have a problem that prevents the build to work with @@ -43,9 +58,8 @@ devscripts, etc.): Debian version numbers! Don't complain later if you can't upgrade to official versions of the Samba packages for Debian.) - Edit the changelog and make sure the version is right. For example, - for Samba 2.2.4, the version number should something like 2.2.4-0.1 - (use a number less than 1 like 0.1, 0.2, etc. so there is no conflict - with future upgrades to the official Debian packages.) + for Samba 3.0.0beta3, the version number should something like + 3.0.0beta3-0.1. 4) Run 'debian/rules binary'. - It is better that you prefix the above command with 'fakeroot'. If you have problems you might try building as root. @@ -58,5 +72,3 @@ better things to do and know nothing about the Debian packaging system. Eloy A. Paris <peloy@debian.org> Steve Langasek <vorlon@debian.org> -$Id: README.build-upstream,v 1.2 2003/06/01 07:12:51 peloy Exp $ - diff --git a/packaging/Debian/debian/README.debian b/packaging/Debian/debian/README.debian index d73f91a154..3802e329e5 100644 --- a/packaging/Debian/debian/README.debian +++ b/packaging/Debian/debian/README.debian @@ -11,9 +11,9 @@ samba and sambades (merged together for longer than we can remember.) Contents of this README file: 1. Notes -2. Packages Generated from the Samba Sources -3. Support for NT Domains -4. Samba and LDAP +2. Upgrading from Samba 2.2 +3. Packages Generated from the Samba Sources +4. Support for NT Domains 5. Reporting bugs @@ -36,7 +36,45 @@ Contents of this README file: (/var/log/{nmb,smb} were moved to the new location. -2. Packages Generated from the Samba Sources +2. Upgrading from Samba 2.2 +--------------------------- + +Samba 3.0 provides greatly improved support for modern Windows systems, +including support for Unicode and LDAP. In the process, Samba 3.0 +necessarily also breaks backward compatiblity with past releases. These +issues are documented herein; if you are aware of other problems related +to upgrading from Samba 2.2, please let us know at +<samba@packages.debian.org>. + +Samba and LDAP +-------------- +Starting with Samba 2.999+3.0cvs20020723-1 we are building Samba with +LDAP support. However, the LDAP schema for Samba 3.0 differs +substantially from the schema used by many sites with Samba 2.2 (not +enabled in the Debian packages). If upgrading from an LDAP-enabled 2.2, +you will need to run the convertSambaAccount script found in +/usr/share/doc/samba-doc/examples/LDAP. A copy of the schema itself can +also be found at /usr/share/doc/samba-doc/examples/LDAP/samba.schema. + +Character Sets +-------------- +Samba 3.0 introduces support for negotiating Unicode (UCS-2LE) with +Windows clients. Owing to the close similarity between Windows and Unix +NLS charsets, in the past, many users were able to pass filenames +containing non-ASCII characters between clients and servers without +configuring Samba to know what character set was in use. Now, Samba +must be able to convert Unix filenames to Unicode before sending to the +client, so Samba must know what character set the filenames are being +converted from. If you will be sharing files with non-ASCII names, and +the filenames are not encoded with UTF-8, you will need to tell Samba +which character set to use with the 'unix charset' option. + +If you had previously specified 'character set' and 'client code page' +options under 2.2, these settings should be automatically converted for +you. + + +3. Packages Generated from the Samba Sources -------------------------------------------- Currently, the Samba sources produce the following binary packages: @@ -66,7 +104,7 @@ with glibc2.1 get cleared out (the problem is with glibc, not with Samba itself). -3. Support for NT Domains +4. Support for NT Domains ------------------------- Samba 2.2 includes preliminary support for NT domains. A Samba server @@ -86,13 +124,6 @@ Please note that NT domain PDC support is far from complete and is still experimental. -4. Samba and LDAP ------------------ - -Starting with Samba 2.999+3.0cvs20020723-1 we are building Samba with -ldapsam support. - - 5. Reporting Bugs ----------------- @@ -130,4 +161,3 @@ doesn't mean that it doesn't work for others. So again: think _twice_. Eloy A. Paris <peloy@debian.org> Steve Langasek <vorlon@debian.org> -$Id: README.debian,v 1.3 2003/06/01 07:12:51 peloy Exp $ diff --git a/packaging/Debian/debian/changelog b/packaging/Debian/debian/changelog index 28d71269bf..a3d27b56d4 100644 --- a/packaging/Debian/debian/changelog +++ b/packaging/Debian/debian/changelog @@ -1,15 +1,100 @@ -samba (3.0beta1-1) unstable; urgency=low +samba (3.0.0beta3-0.1) unstable; urgency=low * Local build. - -- Debian User <somebody@somewhere> Sat, 31 May 2003 22:49:18 -0400 - -samba (2.999+3.0.alpha24-4) unstable; urgency=low + -- Debian User <somebody@somwhere.net> Tue, 15 Jul 2003 11:05:39 -0400 + +samba (3.0.0beta2-2) unstable; urgency=low + + * Drag new unpackaged tools into the packages: smbcquotas (smbclient), + vfs modules (samba), smbtree(1) manpage (smbclient), tdbbackup(8) + manpage (samba). (closes: #151158) + * Switch to DH_COMPAT level 4: + - no explicit conffile listings needed + - the postinst for libsmbclient is now completely autogenerated + - use the default init script handling (with support for + invoke-rc.d) in debhelper, instead of the currently buggy upgrade + path (closes: #185439) + - add support for ${misc:Depends} in control for those packages with + init scripts + + -- Steve Langasek <vorlon@debian.org> Sat, 12 Jul 2003 19:27:31 -0500 + +samba (3.0.0beta2-1) unstable; urgency=low + + * New upstream release + - The smb.conf(5) manpage documents config options again + (closes: #197963). + - Handling of winbind/idmap has been restructured; domain members + should be able to map domain accounts to local accounts again + (closes: #196815). + - Use the locale charset for 'display charset' by default + (closes: #194406). + - Fix for segfault in smbclient when using the -b option + (closes: #196833). + - Handle an empty 'passdb backend' list gracefully (closes: #193946). + * Don't set 'display charset' anymore on upgrade, since this is now + grabbed from the locale by default -- a much better option. + * Removed time.c.patch which is now in the upstream sources. + * Update FHS patch for two new tdb files (netsamlogon_cache.tdb, + privilege.tdb). + * Remove python-linker.patch, since the Kerberos package has been + fixed to no longer use rpath + * Remove configure.patch: the hppa glibc bug this was added for is + long since fixed, and upstream isn't interested in supporting this + kludge. + * Update references to missing documentation in sample smb.conf file + (closes: #187632). + * Fix handling of krb5 link line, building on a patch from Stefan + Metzmacher <metze@metzemix.de>. + * Add patch so smbclient's tar support works with popt + (closes: #194921). + + -- Steve Langasek <vorlon@debian.org> Wed, 2 Jul 2003 20:59:09 -0500 + +samba (3.0.0beta1-2) unstable; urgency=low + + * Update build-deps to libacl1-dev (>= 2.2.11-1), libacl1 (>= 2.2.11-1) + to make sure we get the right shlib dependencies (closes: #193149). + * Update the dhcp config hooks so they're suitable for sourcing (i.e., + don't call "exit") (closes: #196477). + * Bring package into line with current policy by adding support for + the DEB_BUILD_OPTIONS flag, and enabling debugging symbols (-gstabs) + by default + * Make sure libpam-smbpass is a self-contained DSO. + * Fix a typo in samba-common.dhcp that caused us to spuriously rewrite + the server list. + * Fix python install script to ignore -Wl linker flags, as seen in the + output from the latest krb5-config. + * Add LDAP and Unicode information about upgrading from 2.2 to + README.debian. + * Remove dangerous and confusing browse options from the default + smb.conf (closes: #198804). + * Reorder smb.conf options for clearer grouping, and clarify the + comments. + * Add a default [print$] share to the sample smb.conf, and create the + necessary tree under /var/lib/samba/printers. (closes: #168173) + * s/winbind/idmap/ in smb.conf, since the option names have changed. + * Fix the patch for postexec handling, so that we chdir("/") at the + right time. + + -- Steve Langasek <vorlon@debian.org> Thu, 12 Jun 2003 15:02:00 -0500 + +samba (3.0.0beta1-1) unstable; urgency=low + * New upstream version. + - fix for empty browselist bug (closes: #194553) + - fix for tab completion segfault in smbclient (closes: #194776) + - Samba now works as a domain member again without segfaulting + (closes: #194134, #194394, #194775) + - WinXP machines can join a Samba-controlled domain again + (closes: #195362) * Build-depend on python-dev >= 2.2 instead of on just python-dev (without version). + * Added Vorlon'n patch to source/lib/time.c to fix #194075. + (closes: #194075) - -- Eloy A. Paris <peloy@debian.org> Sat, 31 May 2003 18:46:05 -0400 + -- Eloy A. Paris <peloy@debian.org> Sun, 8 Jun 2003 22:26:43 -0400 samba (2.999+3.0.alpha24-3) unstable; urgency=low diff --git a/packaging/Debian/debian/control b/packaging/Debian/debian/control index 74f60c3213..ddbf9e8e3a 100644 --- a/packaging/Debian/debian/control +++ b/packaging/Debian/debian/control @@ -3,12 +3,12 @@ Section: net Priority: optional Maintainer: Eloy A. Paris <peloy@debian.org> Uploaders: Steve Langasek <vorlon@debian.org> -Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline4-dev, libcupsys2-dev, autoconf, libacl1-dev | acl-dev (>= 2.0.0), libkrb5-dev, libldap2-dev, po-debconf, python-dev (>= 2.2) -Standards-Version: 3.1.1 +Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline4-dev, libcupsys2-dev, autoconf, libacl1-dev (>= 2.2.11-1), libacl1 (>= 2.2.11-1), libkrb5-dev, libldap2-dev, po-debconf, python-dev (>= 2.2) +Standards-Version: 3.5.10 Package: samba Architecture: any -Depends: debconf, samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends} +Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}, ${misc:Depends} Replaces: samba-common (<= 2.0.5a-2) Suggests: samba-doc Description: a LanManager-like file and printer server for Unix @@ -163,7 +163,7 @@ Package: winbind Section: net Priority: optional Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: samba (<= 2.2.3-2) Description: service to resolve user and group information from Windows NT servers This package provides the winbindd daemon, which provides a diff --git a/packaging/Debian/debian/patches/documentation.patch b/packaging/Debian/debian/patches/documentation.patch index 5ced2f0e4b..65f7421ab4 100644 --- a/packaging/Debian/debian/patches/documentation.patch +++ b/packaging/Debian/debian/patches/documentation.patch @@ -17,90 +17,85 @@ diff -uNr samba-2.999+3.0.alpha21.orig/docs/htmldocs/using_samba/ch06_05.html sa domain logons = yes security = user </pre></div><DIV CLASS="sect3"> -diff -uNr samba-2.999+3.0.alpha21.orig/docs/manpages/swat.8 samba-2.999+3.0.alpha21/docs/manpages/swat.8 ---- samba-2.999+3.0.alpha21.orig/docs/manpages/swat.8 2002-11-26 20:54:13.000000000 -0600 -+++ samba-2.999+3.0.alpha21/docs/manpages/swat.8 2002-12-16 23:15:46.000000000 -0600 -@@ -42,19 +42,26 @@ - server. \fR +--- samba-2.2.2.cvs20020120.orig/swat/README ++++ samba-2.2.2.cvs20020120/swat/README +@@ -1,3 +1,11 @@ ++[Debian-specific Note: you can safely skip the installation notes in ++this document. swat was configured for you when the package was ++installed. For security reasons, swat is not enabled. To enable it, you ++need to edit /etc/inetd.conf, uncomment the swat entry, and reload ++inetd. Please note that the file locations given in this file are not ++correct for the Debian version of swat. The correct file locations are ++given in swat's man page.] ++ + This is a brief description of how to install and use the Samba Web + Administration Tool on your machine. + +--- samba_3_0/docs/manpages/swat.8.orig 2003-06-06 16:16:24.000000000 -0400 ++++ samba_3_0/docs/manpages/swat.8 2003-06-06 16:25:13.000000000 -0400 +@@ -89,6 +89,13 @@ .SH "INSTALLATION" + .PP +\fBDebian-specific Note\fR: all these steps have already been done for +you. However, by default, swat is not enabled. This has been done for +security reasons. To enable swat you need to edit /etc/inetd.conf, +uncomment the swat entry (usually at the end of the file), and then +restart inetd. ++ +.PP - After you compile SWAT you need to run \fBmake install - \fR to install the \fBswat\fR binary --and the various help files and images. A default install would put --these in: -+and the various help files and images. Under \fBDebian\fR, these -+files are in (please note that these locations are different than the -+default location): - .TP 0.2i + Swat is included as binary package with most distributions\&. The package manager in this case takes care of the installation and configuration\&. This section is only for those who have compiled swat from scratch\&. + + .PP +@@ -96,15 +103,15 @@ + + .TP 3 \(bu -/usr/local/samba/bin/swat -+/usr/sbin/* - .TP 0.2i ++/usr/sbin/swat + + .TP \(bu -/usr/local/samba/swat/images/* +/usr/share/samba/swat/images/* - .TP 0.2i + + .TP \(bu -/usr/local/samba/swat/help/* +/usr/share/samba/swat/help/* - .SS "INETD INSTALLATION" - .PP - You need to edit your \fI/etc/inetd.conf -@@ -62,7 +69,7 @@ - to enable SWAT to be launched via \fBinetd\fR. - .PP - In \fI/etc/services\fR you need to --add a line like this: -+add a line like this (not needed for Debian): + + .LP + +@@ -114,7 +121,7 @@ + You need to edit your \fI/etc/inetd\&.conf \fR and \fI/etc/services\fR to enable SWAT to be launched via \fBinetd\fR\&. + .PP - \fBswat 901/tcp\fR +-In \fI/etc/services\fR you need to add a line like this: ++In \fI/etc/services\fR you need to add a line like this (not needed for Debian): + .PP -@@ -76,10 +83,11 @@ - \fBinetd\fR daemon). + \fBswat 901/tcp\fR +@@ -126,10 +133,10 @@ + the choice of port number isn't really important except that it should be less than 1024 and not currently used (using a number above 1024 presents an obscure security hole depending on the implementation details of your\fBinetd\fR daemon)\&. + .PP - In \fI/etc/inetd.conf\fR you should --add a line like this: -+add a line like this (not needed for Debian, the postinst script takes -+care of this): +-In \fI/etc/inetd\&.conf\fR you should add a line like this: ++In \fI/etc/inetd\&.conf\fR you should add a line like this (not needed for Debian since the maintainer scripts do it. You need to uncomment the line, though, because it is added commented out for security reasons): + .PP - \fBswat stream tcp nowait.400 root --/usr/local/samba/bin/swat swat\fR -+/usr/sbin/swat swat\fR +-\fBswat stream tcp nowait.400 root /usr/local/samba/bin/swat swat\fR ++\fBswat stream tcp nowait.400 root /usr/sbin/swat swat\fR + .PP - One you have edited \fI/etc/services\fR - and \fI/etc/inetd.conf\fR you need to send a -@@ -105,11 +113,10 @@ - (e.g., swat) to service port (e.g., 901) and protocol type - (e.g., tcp). + One you have edited \fI/etc/services\fR and \fI/etc/inetd\&.conf\fR you need to send a HUP signal to inetd\&. To do this use \fBkill -1 PID \fR where PID is the process ID of the inetd daemon\&. +@@ -155,8 +162,8 @@ + + .TP --\fB\fI/usr/local/samba/lib/smb.conf\fB\fR -+\fB\fI/etc/samba/smb.conf\fB\fR - This is the default location of the \fIsmb.conf(5) --\fR server configuration file that swat edits. Other --common places that systems install this file are \fI /usr/samba/lib/smb.conf\fR and \fI/etc/smb.conf --\fR. This file describes all the services the server -+\fRserver configuration file that swat edits. -+This file describes all the services the server - is to make available to clients. - .SH "WARNINGS" - .PP ---- samba-2.2.2.cvs20020120.orig/swat/README -+++ samba-2.2.2.cvs20020120/swat/README -@@ -1,3 +1,11 @@ -+[Debian-specific Note: you can safely skip the installation notes in -+this document. swat was configured for you when the package was -+installed. For security reasons, swat is not enabled. To enable it, you -+need to edit /etc/inetd.conf, uncomment the swat entry, and reload -+inetd. Please note that the file locations given in this file are not -+correct for the Debian version of swat. The correct file locations are -+given in swat's man page.] -+ - This is a brief description of how to install and use the Samba Web - Administration Tool on your machine. +-\fI/usr/local/samba/lib/smb\&.conf\fR +-This is the default location of the \fBsmb.conf\fR(5) server configuration file that swat edits\&. Other common places that systems install this file are \fI /usr/samba/lib/smb\&.conf\fR and \fI/etc/smb\&.conf \fR\&. This file describes all the services the server is to make available to clients\&. ++\fI/etc/samba/smb\&.conf\fR ++This is the default location of the \fBsmb.conf\fR(5) server configuration file that swat edits\&. This file describes all the services the server is to make available to clients\&. + + .SH "WARNINGS" diff --git a/packaging/Debian/debian/patches/fhs.patch b/packaging/Debian/debian/patches/fhs.patch index 5972b52434..b5c7c6c676 100644 --- a/packaging/Debian/debian/patches/fhs.patch +++ b/packaging/Debian/debian/patches/fhs.patch @@ -1,7 +1,7 @@ -diff -uNr samba-3.0alpha23.orig/source/Makefile.in samba-3.0alpha23/source/Makefile.in ---- samba-3.0alpha23.orig/source/Makefile.in 2003-03-30 20:28:28.000000000 -0600 -+++ samba-3.0alpha23/source/Makefile.in 2003-04-04 21:04:05.000000000 -0600 -@@ -65,6 +65,7 @@ +diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makefile.in +--- samba-3.0.0beta2.orig/source/Makefile.in 2003-07-02 23:26:46.000000000 -0500 ++++ samba-3.0.0beta2/source/Makefile.in 2003-07-02 23:19:46.000000000 -0500 +@@ -68,6 +68,7 @@ CONFIGDIR = @configdir@ VARDIR = @localstatedir@ MANDIR = @mandir@ @@ -9,7 +9,7 @@ diff -uNr samba-3.0alpha23.orig/source/Makefile.in samba-3.0alpha23/source/Makef # The permissions to give the executables INSTALLPERMS = 0755 -@@ -88,6 +89,13 @@ +@@ -91,6 +92,13 @@ # the directory where lock files go LOCKDIR = @lockdir@ @@ -23,7 +23,7 @@ diff -uNr samba-3.0alpha23.orig/source/Makefile.in samba-3.0alpha23/source/Makef # the directory where pid files go PIDDIR = @piddir@ # man pages language(s) -@@ -113,7 +121,7 @@ +@@ -115,7 +123,7 @@ PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\" PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \ -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\" @@ -32,7 +32,7 @@ diff -uNr samba-3.0alpha23.orig/source/Makefile.in samba-3.0alpha23/source/Makef PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS) # Note that all executable programs now provide for an optional executable suffix. -@@ -1146,7 +1154,7 @@ +@@ -1123,7 +1131,7 @@ @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS) installdat: installdirs @@ -41,9 +41,9 @@ diff -uNr samba-3.0alpha23.orig/source/Makefile.in samba-3.0alpha23/source/Makef installswat: installdirs @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir) -diff -uNr samba-3.0alpha23.orig/source/configure.in samba-3.0alpha23/source/configure.in ---- samba-3.0alpha23.orig/source/configure.in 2003-04-04 21:03:52.000000000 -0600 -+++ samba-3.0alpha23/source/configure.in 2003-04-04 21:04:05.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/configure.in samba-3.0.0beta2/source/configure.in +--- samba-3.0.0beta2.orig/source/configure.in 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/configure.in 2003-07-02 23:19:02.000000000 -0500 @@ -17,18 +17,25 @@ AC_ARG_WITH(fhs, [ --with-fhs Use FHS-compliant paths (default=no)], @@ -83,9 +83,9 @@ diff -uNr samba-3.0alpha23.orig/source/configure.in samba-3.0alpha23/source/conf dnl Unique-to-Samba variables we'll be playing with. AC_SUBST(SHELL) -diff -uNr samba-3.0alpha23.orig/source/dynconfig.c samba-3.0alpha23/source/dynconfig.c ---- samba-3.0alpha23.orig/source/dynconfig.c 2003-02-14 16:34:36.000000000 -0600 -+++ samba-3.0alpha23/source/dynconfig.c 2003-04-04 21:04:05.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/dynconfig.c samba-3.0.0beta2/source/dynconfig.c +--- samba-3.0.0beta2.orig/source/dynconfig.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/dynconfig.c 2003-07-02 23:19:02.000000000 -0500 @@ -53,6 +53,13 @@ pstring dyn_LMHOSTSFILE = LMHOSTSFILE; @@ -128,10 +128,10 @@ diff -uNr samba-3.0alpha23.orig/source/dynconfig.c samba-3.0alpha23/source/dynco + return lp_lockdir(); +#endif +} -diff -uNr samba-3.0alpha23.orig/source/groupdb/mapping.c samba-3.0alpha23/source/groupdb/mapping.c ---- samba-3.0alpha23.orig/source/groupdb/mapping.c 2003-03-30 20:28:28.000000000 -0600 -+++ samba-3.0alpha23/source/groupdb/mapping.c 2003-04-04 21:04:05.000000000 -0600 -@@ -214,7 +214,7 @@ +diff -uNr samba-3.0.0beta2.orig/source/groupdb/mapping.c samba-3.0.0beta2/source/groupdb/mapping.c +--- samba-3.0.0beta2.orig/source/groupdb/mapping.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/groupdb/mapping.c 2003-07-02 23:19:02.000000000 -0500 +@@ -134,7 +134,7 @@ if (tdb && local_pid == sys_getpid()) return True; @@ -140,9 +140,9 @@ diff -uNr samba-3.0alpha23.orig/source/groupdb/mapping.c samba-3.0alpha23/source if (!tdb) { DEBUG(0,("Failed to open group mapping database\n")); return False; -diff -uNr samba-3.0alpha23.orig/source/include/dynconfig.h samba-3.0alpha23/source/include/dynconfig.h ---- samba-3.0alpha23.orig/source/include/dynconfig.h 2003-02-14 16:34:36.000000000 -0600 -+++ samba-3.0alpha23/source/include/dynconfig.h 2003-04-04 21:04:05.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/include/dynconfig.h samba-3.0.0beta2/source/include/dynconfig.h +--- samba-3.0.0beta2.orig/source/include/dynconfig.h 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/include/dynconfig.h 2003-07-02 23:19:02.000000000 -0500 @@ -31,8 +31,12 @@ extern pstring dyn_CONFIGFILE; extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE; @@ -154,11 +154,11 @@ diff -uNr samba-3.0alpha23.orig/source/include/dynconfig.h samba-3.0alpha23/sour extern const pstring dyn_SMB_PASSWD_FILE; extern const pstring dyn_PRIVATE_DIR; + -+char *dyn_STATEDIR(); -+char *dyn_CACHEDIR(); -diff -uNr samba-3.0alpha23.orig/source/intl/lang_tdb.c samba-3.0alpha23/source/intl/lang_tdb.c ---- samba-3.0alpha23.orig/source/intl/lang_tdb.c 2003-01-03 08:41:24.000000000 -0600 -+++ samba-3.0alpha23/source/intl/lang_tdb.c 2003-04-04 21:04:05.000000000 -0600 ++char *dyn_STATEDIR(void); ++char *dyn_CACHEDIR(void); +diff -uNr samba-3.0.0beta2.orig/source/intl/lang_tdb.c samba-3.0.0beta2/source/intl/lang_tdb.c +--- samba-3.0.0beta2.orig/source/intl/lang_tdb.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/intl/lang_tdb.c 2003-07-02 23:19:02.000000000 -0500 @@ -123,7 +123,7 @@ /* if no lang then we don't translate */ if (!lang) return True; @@ -177,9 +177,9 @@ diff -uNr samba-3.0alpha23.orig/source/intl/lang_tdb.c samba-3.0alpha23/source/i tdb = tdb_open_log(path, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0644); if (!tdb) { -diff -uNr samba-3.0alpha23.orig/source/lib/account_pol.c samba-3.0alpha23/source/lib/account_pol.c ---- samba-3.0alpha23.orig/source/lib/account_pol.c 2003-01-03 08:41:24.000000000 -0600 -+++ samba-3.0alpha23/source/lib/account_pol.c 2003-04-04 21:04:06.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/lib/account_pol.c samba-3.0.0beta2/source/lib/account_pol.c +--- samba-3.0.0beta2.orig/source/lib/account_pol.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/lib/account_pol.c 2003-07-02 23:19:02.000000000 -0500 @@ -36,7 +36,7 @@ if (tdb && local_pid == sys_getpid()) @@ -189,10 +189,10 @@ diff -uNr samba-3.0alpha23.orig/source/lib/account_pol.c samba-3.0alpha23/source if (!tdb) { DEBUG(0,("Failed to open account policy database\n")); return False; -diff -uNr samba-3.0alpha23.orig/source/lib/util.c samba-3.0alpha23/source/lib/util.c ---- samba-3.0alpha23.orig/source/lib/util.c 2003-03-30 20:28:28.000000000 -0600 -+++ samba-3.0alpha23/source/lib/util.c 2003-04-04 21:04:06.000000000 -0600 -@@ -2228,6 +2228,61 @@ +diff -uNr samba-3.0.0beta2.orig/source/lib/util.c samba-3.0.0beta2/source/lib/util.c +--- samba-3.0.0beta2.orig/source/lib/util.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/lib/util.c 2003-07-02 23:19:02.000000000 -0500 +@@ -2252,6 +2252,61 @@ } /** @@ -254,9 +254,9 @@ diff -uNr samba-3.0alpha23.orig/source/lib/util.c samba-3.0alpha23/source/lib/ut * @brief Returns the platform specific shared library extension. * * @retval Pointer to a static #fstring containing the extension. -diff -uNr samba-3.0alpha23.orig/source/lib/util_unistr.c samba-3.0alpha23/source/lib/util_unistr.c ---- samba-3.0alpha23.orig/source/lib/util_unistr.c 2003-02-27 09:22:58.000000000 -0600 -+++ samba-3.0alpha23/source/lib/util_unistr.c 2003-04-04 21:04:06.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/lib/util_unistr.c samba-3.0.0beta2/source/lib/util_unistr.c +--- samba-3.0.0beta2.orig/source/lib/util_unistr.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/lib/util_unistr.c 2003-07-02 23:19:02.000000000 -0500 @@ -54,8 +54,8 @@ if (initialised) return; initialised = 1; @@ -277,30 +277,30 @@ diff -uNr samba-3.0alpha23.orig/source/lib/util_unistr.c samba-3.0alpha23/source if (valid_file) { valid_table = valid_file; mapped_file = 1; -diff -uNr samba-3.0alpha23.orig/source/libsmb/netlogon_unigrp.c samba-3.0alpha23/source/libsmb/netlogon_unigrp.c ---- samba-3.0alpha23.orig/source/libsmb/netlogon_unigrp.c 2003-01-02 10:22:58.000000000 -0600 -+++ samba-3.0alpha23/source/libsmb/netlogon_unigrp.c 2003-04-04 21:04:06.000000000 -0600 -@@ -41,7 +41,7 @@ - BOOL uni_group_cache_init(void) +diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/source/libsmb/samlogon_cache.c +--- samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c 2003-07-01 09:40:37.000000000 -0500 ++++ samba-3.0.0beta2/source/libsmb/samlogon_cache.c 2003-07-02 23:19:02.000000000 -0500 +@@ -34,7 +34,7 @@ + BOOL netsamlogon_cache_init(void) { - if (!netlogon_unigrp_tdb) { -- netlogon_unigrp_tdb = tdb_open_log(lock_path("netlogon_unigrp.tdb"), 0, -+ netlogon_unigrp_tdb = tdb_open_log(state_path("netlogon_unigrp.tdb"), 0, - TDB_DEFAULT, O_RDWR | O_CREAT, 0644); + if (!netsamlogon_tdb) { +- netsamlogon_tdb = tdb_open_log(lock_path(NETSAMLOGON_TDB), 0, ++ netsamlogon_tdb = tdb_open_log(cache_path(NETSAMLOGON_TDB), 0, + TDB_DEFAULT, O_RDWR | O_CREAT, 0600); } -@@ -119,7 +119,7 @@ - return NULL; - } - if (!netlogon_unigrp_tdb) { -- netlogon_unigrp_tdb = tdb_open_log(lock_path("netlogon_unigrp.tdb"), 0, -+ netlogon_unigrp_tdb = tdb_open_log(state_path("netlogon_unigrp.tdb"), 0, - TDB_DEFAULT, O_RDWR, 0644); - } - if (!netlogon_unigrp_tdb) { -diff -uNr samba-3.0alpha23.orig/source/nmbd/nmbd_serverlistdb.c samba-3.0alpha23/source/nmbd/nmbd_serverlistdb.c ---- samba-3.0alpha23.orig/source/nmbd/nmbd_serverlistdb.c 2002-12-12 09:07:32.000000000 -0600 -+++ samba-3.0alpha23/source/nmbd/nmbd_serverlistdb.c 2003-04-04 21:04:06.000000000 -0600 +@@ -67,7 +67,7 @@ + winbindd_cache.tdb open. Open the tdb if a NULL is passed. */ + + if (!tdb) { +- tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000, ++ tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 5000, + TDB_DEFAULT, O_RDWR, 0600); + if (!tdb) { + DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n")); +diff -uNr samba-3.0.0beta2.orig/source/nmbd/nmbd_serverlistdb.c samba-3.0.0beta2/source/nmbd/nmbd_serverlistdb.c +--- samba-3.0.0beta2.orig/source/nmbd/nmbd_serverlistdb.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/nmbd/nmbd_serverlistdb.c 2003-07-02 23:19:02.000000000 -0500 @@ -343,7 +343,7 @@ updatecount++; @@ -310,21 +310,54 @@ diff -uNr samba-3.0alpha23.orig/source/nmbd/nmbd_serverlistdb.c samba-3.0alpha23 trim_string(fname,NULL,"/"); pstrcat(fname,"/"); pstrcat(fname,SERVER_LIST); -diff -uNr samba-3.0alpha23.orig/source/nsswitch/winbindd_cache.c samba-3.0alpha23/source/nsswitch/winbindd_cache.c ---- samba-3.0alpha23.orig/source/nsswitch/winbindd_cache.c 2002-10-16 12:52:31.000000000 -0500 -+++ samba-3.0alpha23/source/nsswitch/winbindd_cache.c 2003-04-04 21:04:06.000000000 -0600 -@@ -53,7 +53,7 @@ - } - if (opt_nocache) return; +diff -uNr samba-3.0.0beta2.orig/source/nmbd/nmbd_winsserver.c samba-3.0.0beta2/source/nmbd/nmbd_winsserver.c +--- samba-3.0.0beta2.orig/source/nmbd/nmbd_winsserver.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/nmbd/nmbd_winsserver.c 2003-07-02 23:19:02.000000000 -0500 +@@ -230,7 +230,7 @@ + + add_samba_names_to_subnet(wins_server_subnet); + +- if((fp = x_fopen(lock_path(WINS_LIST),O_RDONLY,0)) == NULL) ++ if((fp = x_fopen(state_path(WINS_LIST),O_RDONLY,0)) == NULL) + { + DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n", + WINS_LIST, strerror(errno) )); +@@ -1836,7 +1836,7 @@ + } + } + +- slprintf(fname,sizeof(fname)-1,"%s/%s", lp_lockdir(), WINS_LIST); ++ slprintf(fname,sizeof(fname)-1,"%s/%s", dyn_STATEDIR(), WINS_LIST); + all_string_sub(fname,"//", "/", 0); + slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid()); + +diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c samba-3.0.0beta2/source/nsswitch/winbindd_cache.c +--- samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/nsswitch/winbindd_cache.c 2003-07-02 23:19:02.000000000 -0500 +@@ -56,7 +56,7 @@ + if (opt_nocache) + return; - wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000, + wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 5000, TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT, 0600); if (!wcache->tdb) { -diff -uNr samba-3.0alpha23.orig/source/param/loadparm.c samba-3.0alpha23/source/param/loadparm.c ---- samba-3.0alpha23.orig/source/param/loadparm.c 2003-03-30 20:28:29.000000000 -0600 -+++ samba-3.0alpha23/source/param/loadparm.c 2003-04-04 21:04:06.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_util.c samba-3.0.0beta2/source/nsswitch/winbindd_util.c +--- samba-3.0.0beta2.orig/source/nsswitch/winbindd_util.c 2003-07-01 15:44:25.000000000 -0500 ++++ samba-3.0.0beta2/source/nsswitch/winbindd_util.c 2003-07-02 23:19:02.000000000 -0500 +@@ -747,7 +747,7 @@ + SMB_STRUCT_STAT stbuf; + TDB_CONTEXT *idmap_tdb; + +- pstrcpy(idmap_name, lock_path("winbindd_idmap.tdb")); ++ pstrcpy(idmap_name, state_path("winbindd_idmap.tdb")); + + if (!file_exist(idmap_name, &stbuf)) { + /* nothing to convert return */ +diff -uNr samba-3.0.0beta2.orig/source/param/loadparm.c samba-3.0.0beta2/source/param/loadparm.c +--- samba-3.0.0beta2.orig/source/param/loadparm.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/param/loadparm.c 2003-07-02 23:19:02.000000000 -0500 @@ -104,6 +104,9 @@ char *szAddPrinterCommand; char *szDeletePrinterCommand; @@ -335,7 +368,7 @@ diff -uNr samba-3.0alpha23.orig/source/param/loadparm.c samba-3.0alpha23/source/ char *szLockDir; char *szPidDir; char *szRootdir; -@@ -1053,8 +1056,13 @@ +@@ -1055,8 +1058,13 @@ {"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE}, {"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, @@ -349,9 +382,36 @@ diff -uNr samba-3.0alpha23.orig/source/param/loadparm.c samba-3.0alpha23/source/ {"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, #ifdef WITH_UTMP {"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, -diff -uNr samba-3.0alpha23.orig/source/passdb/secrets.c samba-3.0alpha23/source/passdb/secrets.c ---- samba-3.0alpha23.orig/source/passdb/secrets.c 2003-03-30 20:28:29.000000000 -0600 -+++ samba-3.0alpha23/source/passdb/secrets.c 2003-04-04 21:04:06.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/passdb/pdb_tdb.c samba-3.0.0beta2/source/passdb/pdb_tdb.c +--- samba-3.0.0beta2.orig/source/passdb/pdb_tdb.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/passdb/pdb_tdb.c 2003-07-02 23:19:02.000000000 -0500 +@@ -526,10 +526,7 @@ + if (location) { + tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location); + } else { +- pstring tdbfile; +- get_private_directory(tdbfile); +- pstrcat(tdbfile, "/"); +- pstrcat(tdbfile, PASSDB_FILE_NAME); ++ char *tdbfile = state_path(PASSDB_FILE_NAME); + tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, tdbfile); + } + +diff -uNr samba-3.0.0beta2.orig/source/passdb/privileges.c samba-3.0.0beta2/source/passdb/privileges.c +--- samba-3.0.0beta2.orig/source/passdb/privileges.c 2003-06-07 12:57:35.000000000 -0500 ++++ samba-3.0.0beta2/source/passdb/privileges.c 2003-07-02 23:19:02.000000000 -0500 +@@ -62,7 +62,7 @@ + /* initialise the privilege database */ + BOOL privilege_init(void) + { +- tdb = tdb_open_log(lock_path("privilege.tdb"), 0, TDB_DEFAULT, ++ tdb = tdb_open_log(state_path("privilege.tdb"), 0, TDB_DEFAULT, + O_RDWR|O_CREAT, 0600); + if (!tdb) { + DEBUG(0,("Failed to open privilege database\n")); +diff -uNr samba-3.0.0beta2.orig/source/passdb/secrets.c samba-3.0.0beta2/source/passdb/secrets.c +--- samba-3.0.0beta2.orig/source/passdb/secrets.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/passdb/secrets.c 2003-07-02 23:19:02.000000000 -0500 @@ -37,8 +37,7 @@ if (tdb) return True; @@ -362,10 +422,10 @@ diff -uNr samba-3.0alpha23.orig/source/passdb/secrets.c samba-3.0alpha23/source/ tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); -diff -uNr samba-3.0alpha23.orig/source/printing/nt_printing.c samba-3.0alpha23/source/printing/nt_printing.c ---- samba-3.0alpha23.orig/source/printing/nt_printing.c 2003-03-30 20:28:29.000000000 -0600 -+++ samba-3.0alpha23/source/printing/nt_printing.c 2003-04-04 21:04:07.000000000 -0600 -@@ -271,28 +271,28 @@ +diff -uNr samba-3.0.0beta2.orig/source/printing/nt_printing.c samba-3.0.0beta2/source/printing/nt_printing.c +--- samba-3.0.0beta2.orig/source/printing/nt_printing.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/printing/nt_printing.c 2003-07-02 23:19:02.000000000 -0500 +@@ -287,28 +287,28 @@ if (tdb_drivers) tdb_close(tdb_drivers); @@ -400,9 +460,9 @@ diff -uNr samba-3.0alpha23.orig/source/printing/nt_printing.c samba-3.0alpha23/s return False; } -diff -uNr samba-3.0alpha23.orig/source/printing/printing.c samba-3.0alpha23/source/printing/printing.c ---- samba-3.0alpha23.orig/source/printing/printing.c 2003-03-30 20:28:29.000000000 -0600 -+++ samba-3.0alpha23/source/printing/printing.c 2003-04-04 21:04:08.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/printing/printing.c samba-3.0.0beta2/source/printing/printing.c +--- samba-3.0.0beta2.orig/source/printing/printing.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/printing/printing.c 2003-07-02 23:19:02.000000000 -0500 @@ -174,8 +174,8 @@ if (local_pid == sys_getpid()) return True; @@ -414,9 +474,9 @@ diff -uNr samba-3.0alpha23.orig/source/printing/printing.c samba-3.0alpha23/sour mkdir(printing_path,0755); local_pid = sys_getpid(); -diff -uNr samba-3.0alpha23.orig/source/printing/printing_db.c samba-3.0alpha23/source/printing/printing_db.c ---- samba-3.0alpha23.orig/source/printing/printing_db.c 2003-02-14 16:34:37.000000000 -0600 -+++ samba-3.0alpha23/source/printing/printing_db.c 2003-04-04 21:04:08.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/printing/printing_db.c samba-3.0.0beta2/source/printing/printing_db.c +--- samba-3.0.0beta2.orig/source/printing/printing_db.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/printing/printing_db.c 2003-07-02 23:19:02.000000000 -0500 @@ -86,7 +86,7 @@ DLIST_ADD(print_db_head, p); } @@ -426,9 +486,9 @@ diff -uNr samba-3.0alpha23.orig/source/printing/printing_db.c samba-3.0alpha23/s pstrcat(printdb_path, printername); pstrcat(printdb_path, ".tdb"); -diff -uNr samba-3.0alpha23.orig/source/registry/reg_db.c samba-3.0alpha23/source/registry/reg_db.c ---- samba-3.0alpha23.orig/source/registry/reg_db.c 2002-08-26 09:46:07.000000000 -0500 -+++ samba-3.0alpha23/source/registry/reg_db.c 2003-04-04 21:04:08.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/registry/reg_db.c samba-3.0.0beta2/source/registry/reg_db.c +--- samba-3.0.0beta2.orig/source/registry/reg_db.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/registry/reg_db.c 2003-07-02 23:19:02.000000000 -0500 @@ -131,13 +131,13 @@ * if we need to init the data in the registry */ @@ -446,9 +506,9 @@ diff -uNr samba-3.0alpha23.orig/source/registry/reg_db.c samba-3.0alpha23/source return False; } -diff -uNr samba-3.0alpha23.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0alpha23/source/rpc_server/srv_srvsvc_nt.c ---- samba-3.0alpha23.orig/source/rpc_server/srv_srvsvc_nt.c 2003-03-30 20:28:31.000000000 -0600 -+++ samba-3.0alpha23/source/rpc_server/srv_srvsvc_nt.c 2003-04-04 21:04:08.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0.0beta2/source/rpc_server/srv_srvsvc_nt.c +--- samba-3.0.0beta2.orig/source/rpc_server/srv_srvsvc_nt.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/rpc_server/srv_srvsvc_nt.c 2003-07-02 23:19:02.000000000 -0500 @@ -133,10 +133,10 @@ if (share_tdb && local_pid == sys_getpid()) @@ -462,9 +522,21 @@ diff -uNr samba-3.0alpha23.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0alpha return False; } -diff -uNr samba-3.0alpha23.orig/source/smbd/lanman.c samba-3.0alpha23/source/smbd/lanman.c ---- samba-3.0alpha23.orig/source/smbd/lanman.c 2003-02-25 14:51:35.000000000 -0600 -+++ samba-3.0alpha23/source/smbd/lanman.c 2003-04-04 21:04:08.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/sam/idmap_tdb.c samba-3.0.0beta2/source/sam/idmap_tdb.c +--- samba-3.0.0beta2.orig/source/sam/idmap_tdb.c 2003-07-01 15:44:26.000000000 -0500 ++++ samba-3.0.0beta2/source/sam/idmap_tdb.c 2003-07-02 23:19:02.000000000 -0500 +@@ -495,7 +495,7 @@ + BOOL tdb_is_new = False; + + /* use the old database if present */ +- tdbfile = strdup(lock_path("winbindd_idmap.tdb")); ++ tdbfile = strdup(state_path("winbindd_idmap.tdb")); + if (!tdbfile) { + DEBUG(0, ("idmap_init: out of memory!\n")); + return NT_STATUS_NO_MEMORY; +diff -uNr samba-3.0.0beta2.orig/source/smbd/lanman.c samba-3.0.0beta2/source/smbd/lanman.c +--- samba-3.0.0beta2.orig/source/smbd/lanman.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/smbd/lanman.c 2003-07-02 23:19:02.000000000 -0500 @@ -966,9 +966,9 @@ BOOL local_list_only; int i; @@ -477,9 +549,9 @@ diff -uNr samba-3.0alpha23.orig/source/smbd/lanman.c samba-3.0alpha23/source/smb return(0); } -diff -uNr samba-3.0alpha23.orig/source/wrepld/process.c samba-3.0alpha23/source/wrepld/process.c ---- samba-3.0alpha23.orig/source/wrepld/process.c 2003-01-14 10:01:01.000000000 -0600 -+++ samba-3.0alpha23/source/wrepld/process.c 2003-04-04 21:04:09.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/wrepld/process.c samba-3.0.0beta2/source/wrepld/process.c +--- samba-3.0.0beta2.orig/source/wrepld/process.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/wrepld/process.c 2003-07-02 23:19:02.000000000 -0500 @@ -197,7 +197,7 @@ { TDB_CONTEXT *tdb; @@ -498,70 +570,14 @@ diff -uNr samba-3.0alpha23.orig/source/wrepld/process.c samba-3.0alpha23/source/ if (!tdb) { DEBUG(2,("send_entry_request: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) )); return; -diff -uNr samba-3.0alpha23.orig/source/passdb/pdb_tdb.c samba-3.0alpha23/source/passdb/pdb_tdb.c ---- samba-3.0alpha23.orig/source/passdb/pdb_tdb.c 2003-03-30 20:28:29.000000000 -0600 -+++ samba-3.0alpha23/source/passdb/pdb_tdb.c 2003-04-30 13:51:43.000000000 -0500 -@@ -943,10 +943,7 @@ - if (location) { - tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location); - } else { -- pstring tdbfile; -- get_private_directory(tdbfile); -- pstrcat(tdbfile, "/"); -- pstrcat(tdbfile, PASSDB_FILE_NAME); -+ char *tdbfile = state_path(PASSDB_FILE_NAME); - tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, tdbfile); - } - ---- samba-3.0alpha24/source/nmbd/nmbd_winsserver.c.orig 2003-05-18 19:12:27.000000000 -0400 -+++ samba-3.0alpha24/source/nmbd/nmbd_winsserver.c 2003-05-18 19:18:04.000000000 -0400 -@@ -230,7 +230,7 @@ - - add_samba_names_to_subnet(wins_server_subnet); - -- if((fp = x_fopen(lock_path(WINS_LIST),O_RDONLY,0)) == NULL) -+ if((fp = x_fopen(state_path(WINS_LIST),O_RDONLY,0)) == NULL) - { - DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n", - WINS_LIST, strerror(errno) )); -@@ -1836,7 +1836,7 @@ - } - } - -- slprintf(fname,sizeof(fname)-1,"%s/%s", lp_lockdir(), WINS_LIST); -+ slprintf(fname,sizeof(fname)-1,"%s/%s", dyn_STATEDIR(), WINS_LIST); - all_string_sub(fname,"//", "/", 0); - slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid()); - ---- samba-3.0alpha24/source/nsswitch/winbindd_idmap_tdb.c.orig 2003-05-18 19:22:14.000000000 -0400 -+++ samba-3.0alpha24/source/nsswitch/winbindd_idmap_tdb.c 2003-05-18 19:27:14.000000000 -0400 -@@ -283,16 +283,16 @@ - SMB_STRUCT_STAT stbuf; - - /* move to the new database on first startup */ -- if (!file_exist(lock_path("idmap.tdb"), &stbuf)) { -- if (file_exist(lock_path("winbindd_idmap.tdb"), &stbuf)) { -+ if (!file_exist(state_path("idmap.tdb"), &stbuf)) { -+ if (file_exist(state_path("winbindd_idmap.tdb"), &stbuf)) { - char *cmd = NULL; - - /* lazy file copy */ -- if (asprintf(&cmd, "cp -p %s/winbindd_idmap.tdb %s/idmap.tdb", lp_lockdir(), lp_lockdir()) != -1) { -+ if (asprintf(&cmd, "cp -p %s/winbindd_idmap.tdb %s/idmap.tdb", dyn_STATEDIR(), dyn_STATEDIR()) != -1) { - system(cmd); - free(cmd); - } -- if (!file_exist(lock_path("idmap.tdb"), &stbuf)) { -+ if (!file_exist(state_path("idmap.tdb"), &stbuf)) { - DEBUG(0, ("idmap_init: Unable to make a new database copy\n")); - return False; - } -@@ -300,7 +300,7 @@ - } +--- samba_3_0/source/nsswitch/winbindd_acct.c.orig 2003-07-15 13:03:59.000000000 -0400 ++++ samba_3_0/source/nsswitch/winbindd_acct.c 2003-07-15 13:04:42.000000000 -0400 +@@ -73,7 +73,7 @@ + + /* Nope. Try to open it */ - /* Open tdb cache */ -- if (!(idmap_tdb = tdb_open_log(lock_path("idmap.tdb"), 0, -+ if (!(idmap_tdb = tdb_open_log(state_path("idmap.tdb"), 0, - TDB_DEFAULT, O_RDWR | O_CREAT, - 0600))) { - DEBUG(0, +- if (!(account_tdb = tdb_open_log(lock_path("winbindd_idmap.tdb"), 0, ++ if (!(account_tdb = tdb_open_log(state_path("winbindd_idmap.tdb"), 0, + TDB_DEFAULT, O_RDWR | O_CREAT, 0600))) + { + /* last chance -- maybe idmap has already opened it */ diff --git a/packaging/Debian/debian/patches/samba.patch b/packaging/Debian/debian/patches/samba.patch index 60968aae36..bface14166 100644 --- a/packaging/Debian/debian/patches/samba.patch +++ b/packaging/Debian/debian/patches/samba.patch @@ -1,6 +1,6 @@ -diff -uNr samba-3.0alpha23.orig/source/client/smbmount.c samba-3.0alpha23/source/client/smbmount.c ---- samba-3.0alpha23.orig/source/client/smbmount.c 2003-03-30 20:28:28.000000000 -0600 -+++ samba-3.0alpha23/source/client/smbmount.c 2003-04-04 21:05:58.000000000 -0600 +diff -uNr samba-3.0.0beta1.orig/source/client/smbmount.c samba-3.0.0beta1/source/client/smbmount.c +--- samba-3.0.0beta1.orig/source/client/smbmount.c 2003-06-07 12:57:32.000000000 -0500 ++++ samba-3.0.0beta1/source/client/smbmount.c 2003-06-30 20:12:22.000000000 -0500 @@ -765,7 +765,7 @@ *lp = 0; pstrcpy(password,lp+1); @@ -19,18 +19,18 @@ diff -uNr samba-3.0alpha23.orig/source/client/smbmount.c samba-3.0alpha23/source } else if(!strcmp(opts, "credentials")) { pstrcpy(credentials,opteq+1); } else if(!strcmp(opts, "netbiosname")) { -@@ -889,7 +889,7 @@ +@@ -889,7 +901,7 @@ *p = 0; pstrcpy(password,p+1); got_pass = True; - memset(strchr_m(getenv("USER"),'%')+1,'X',strlen(password)); + memset(strchr_m(getenv("USER"),'%')+1,'\0',strlen(password)); } - strupper(username); + strupper_m(username); } -diff -uNr samba-3.0alpha23.orig/source/script/installbin.sh samba-3.0alpha23/source/script/installbin.sh ---- samba-3.0alpha23.orig/source/script/installbin.sh 2002-04-22 13:16:20.000000000 -0500 -+++ samba-3.0alpha23/source/script/installbin.sh 2003-04-04 21:05:58.000000000 -0600 +diff -uNr samba-3.0.0beta1.orig/source/script/installbin.sh samba-3.0.0beta1/source/script/installbin.sh +--- samba-3.0.0beta1.orig/source/script/installbin.sh 2002-04-22 13:16:20.000000000 -0500 ++++ samba-3.0.0beta1/source/script/installbin.sh 2003-06-30 20:12:22.000000000 -0500 @@ -22,9 +22,11 @@ chmod $INSTALLPERMS $BINDIR/$p2 @@ -46,27 +46,31 @@ diff -uNr samba-3.0alpha23.orig/source/script/installbin.sh samba-3.0alpha23/sou done -diff -uNr samba-3.0alpha23.orig/source/smbd/service.c samba-3.0alpha23/source/smbd/service.c ---- samba-3.0alpha23.orig/source/smbd/service.c 2003-03-30 20:28:31.000000000 -0600 -+++ samba-3.0alpha23/source/smbd/service.c 2003-04-04 21:05:58.000000000 -0600 -@@ -895,6 +895,14 @@ - change_to_root_user(); - } +diff -uNr samba-3.0.0beta1.orig/source/smbd/service.c samba-3.0.0beta1/source/smbd/service.c +--- samba-3.0.0beta1.orig/source/smbd/service.c 2003-06-07 12:57:39.000000000 -0500 ++++ samba-3.0.0beta1/source/smbd/service.c 2003-06-30 20:12:57.000000000 -0500 +@@ -880,6 +880,9 @@ + file_close_conn(conn); + dptr_closecnum(conn); -+ /* If our root postexec command includes a call to 'unmount', we want -+ to make sure we aren't blocking the mount point. */ -+ /* I think this patch should go here, but I am not sure since -+ the code looks very different than in Samba 2.2.2. Will come -+ back later; should check what change_to_root_user() does. Eloy.- -+ vfs_ChDir(conn,"/"); -+ /* ++ /* make sure we leave the directory available for unmount */ ++ vfs_ChDir(conn, "/"); + - change_to_root_user(); - /* execute any "root postexec = " line */ - if (*lp_rootpostexec(SNUM(conn))) { -diff -uNr samba-3.0alpha23.orig/source/smbwrapper/smbsh.c samba-3.0alpha23/source/smbwrapper/smbsh.c ---- samba-3.0alpha23.orig/source/smbwrapper/smbsh.c 2003-03-30 20:28:31.000000000 -0600 -+++ samba-3.0alpha23/source/smbwrapper/smbsh.c 2003-04-04 21:05:58.000000000 -0600 + /* execute any "postexec = " line */ + if (*lp_postexec(SNUM(conn)) && + change_to_user(conn, vuid)) { +@@ -899,8 +902,5 @@ + smbrun(cmd,NULL); + } + +- /* make sure we leave the directory available for unmount */ +- vfs_ChDir(conn, "/"); +- + conn_free(conn); + } +diff -uNr samba-3.0.0beta1.orig/source/smbwrapper/smbsh.c samba-3.0.0beta1/source/smbwrapper/smbsh.c +--- samba-3.0.0beta1.orig/source/smbwrapper/smbsh.c 2003-06-07 12:57:40.000000000 -0500 ++++ samba-3.0.0beta1/source/smbwrapper/smbsh.c 2003-06-30 20:12:22.000000000 -0500 @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) { @@ -76,9 +80,9 @@ diff -uNr samba-3.0alpha23.orig/source/smbwrapper/smbsh.c samba-3.0alpha23/sourc pstring line, wd; int opt; extern char *optarg; -diff -uNr samba-3.0alpha23.orig/source/web/diagnose.c samba-3.0alpha23/source/web/diagnose.c ---- samba-3.0alpha23.orig/source/web/diagnose.c 2003-01-18 13:03:58.000000000 -0600 -+++ samba-3.0alpha23/source/web/diagnose.c 2003-04-04 21:05:58.000000000 -0600 +diff -uNr samba-3.0.0beta1.orig/source/web/diagnose.c samba-3.0.0beta1/source/web/diagnose.c +--- samba-3.0.0beta1.orig/source/web/diagnose.c 2003-06-07 12:57:41.000000000 -0500 ++++ samba-3.0.0beta1/source/web/diagnose.c 2003-06-30 20:12:22.000000000 -0500 @@ -70,6 +70,7 @@ static struct cli_state cli; extern struct in_addr loopback_ip; diff --git a/packaging/Debian/debian/po/es.po b/packaging/Debian/debian/po/es.po index 22f4fe58b0..1c5854b480 100644 --- a/packaging/Debian/debian/po/es.po +++ b/packaging/Debian/debian/po/es.po @@ -13,14 +13,15 @@ # msgid "" msgstr "" -"Project-Id-Version: Samba for Debian 2.999+3.0.alpha21-4\n" -"POT-Creation-Date: 2003-04-30 13:11-0500\n" -"PO-Revision-Date: 2003-03-09 20:27-0600\n" +"Project-Id-Version: Samba for Debian 3.0.0beta2-1\n" +"POT-Creation-Date: 2003-07-02 21:50-0500\n" +"PO-Revision-Date: 2003-07-02 21:51-0500\n" "Last-Translator: Steve Langasek <vorlon@debian.org>\n" "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" #. Description #: ../samba-common.templates:3 @@ -32,18 +33,15 @@ msgstr "Juego de caracteres para el sistema de ficheros Unix" #: ../samba-common.templates:3 msgid "" "You currently have a \"character set\" configured in your smb.conf. In " -"Samba 3.0, this option is replaced by two new options, \"unix charset\" and " -"\"display charset\". Please specify the character set you wish to use for " -"these new options, which control how Samba interprets filenames on the file " -"system and how smbclient will interpret these names when you connect to a " -"file server." +"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please " +"specify the character set you wish to use for theis new option, which " +"controls how Samba interprets filenames on the file system." msgstr "" "Actualmente hay una opción de \"character set\" en smb.conf. En Samba 3.0 " -"esta opción ha sido reemplazado por dos opciones nuevas: \"unix charset\" y " -"\"display charset\". Por favor, indique el juego de caracteres que desea " -"usar para estas opciones nuevas, que controlan cómo Samba interpretará los " -"nombres en el sistema de ficheros y también cómo smbclient los interpretará " -"al conectarse a un servidor de ficheros." +"esta opción ha sido reemplazado por una opción nueva: \"unix charset\". Por " +"favor, indique el juego de caracteres que desea usar para esta opción " +"nueva, que controla cómo Samba interpretará los nombres en el sistema de " +"ficheros." #. Description #: ../samba-common.templates:3 @@ -51,12 +49,12 @@ msgid "If you leave this option blank, your smb.conf will not be changed." msgstr "Si deja en blanco este campo, no se cambiará smb.conf." #. Description -#: ../samba-common.templates:15 +#: ../samba-common.templates:13 msgid "Character Set for DOS clients" msgstr "Juego de caracteres para los clientes DOS" #. Description -#: ../samba-common.templates:15 +#: ../samba-common.templates:13 msgid "" "You currently have a \"client code page\" set in your smb.conf. In Samba " "3.0, this option is replaced by the option \"dos charset\". Please specify " @@ -73,13 +71,13 @@ msgstr "" "cambiará smb.conf." #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "Modify smb.conf to use WINS settings from DHCP?" msgstr "" "¿Modificar smb.conf para usar la configuración WINS que proviene de DHCP?" #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "" "If your computer gets IP address information from a DHCP server on the " "network, the DHCP server may also provide information about WINS servers " @@ -94,7 +92,7 @@ msgstr "" "de /etc/samba/dhcp.conf." #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "" "You must have the dhcp3-client package installed to take advantage of this " "feature." @@ -102,12 +100,12 @@ msgstr "" "Hay que instalar el paquete dhcp3-client para aprovechar esta funcionalidad." #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "Configure smb.conf through debconf?" msgstr "¿Configurar smb.conf mediante debconf?" #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "" "The rest of the configuration of Samba deals with questions that affect " "parameters in /etc/samba/smb.conf, which is the file used to configure the " @@ -123,7 +121,7 @@ msgstr "" "arregle a mano." #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "" "If you don't use debconf to configure smb.conf, you will have to handle any " "configuration changes yourself, and will not be able to take advantage of " @@ -136,12 +134,12 @@ msgstr "" "sea posible." #. Description -#: ../samba-common.templates:54 +#: ../samba-common.templates:52 msgid "Workgroup/Domain Name?" msgstr "Nombre del dominio o del grupo de trabajo" #. Description -#: ../samba-common.templates:54 +#: ../samba-common.templates:52 msgid "" "This controls what workgroup your server will appear to be in when queried " "by clients. Note that this parameter also controls the Domain name used with " @@ -152,12 +150,12 @@ msgstr "" "de dominio que se usa con la configuración security=domain." #. Description -#: ../samba-common.templates:62 +#: ../samba-common.templates:60 msgid "Use password encryption?" msgstr "¿Utilizar contraseñas cifradas?" #. Description -#: ../samba-common.templates:62 +#: ../samba-common.templates:60 msgid "" "Recent Windows clients communicate with SMB servers using encrypted " "passwords. If you want to use clear text passwords you will need to change a " diff --git a/packaging/Debian/debian/po/fr.po b/packaging/Debian/debian/po/fr.po index bb8cf41e35..130a92ee11 100644 --- a/packaging/Debian/debian/po/fr.po +++ b/packaging/Debian/debian/po/fr.po @@ -13,14 +13,15 @@ # msgid "" msgstr "" -"Project-Id-Version: Samba for Debian 2.999+3.0.alpha23-1\n" -"POT-Creation-Date: 2003-04-30 13:11-0500\n" -"PO-Revision-Date: 2003-04-19 08:28-0100\n" -"Last-Translator: Christian Perrier <bubulle@debian.org>\n" +"Project-Id-Version: Samba for Debian 3.0.0beta2-1\n" +"POT-Creation-Date: 2003-07-02 21:50-0500\n" +"PO-Revision-Date: 2003-07-02 21:52-0500\n" +"Last-Translator: Steve Langasek <vorlon@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" #. Description #: ../samba-common.templates:3 @@ -31,20 +32,15 @@ msgstr "Jeu de caractères pour les systèmes de fichiers Unix" #: ../samba-common.templates:3 msgid "" "You currently have a \"character set\" configured in your smb.conf. In " -"Samba 3.0, this option is replaced by two new options, \"unix charset\" and " -"\"display charset\". Please specify the character set you wish to use for " -"these new options, which control how Samba interprets filenames on the file " -"system and how smbclient will interpret these names when you connect to a " -"file server." +"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please " +"specify the character set you wish to use for theis new option, which " +"controls how Samba interprets filenames on the file system." msgstr "" "Une instruction « character set » (jeu de caractères) est utilisée dans " -"votre fichier smb.conf. Avec Samba 3.0, cette option est remplacée par deux " -"nouvelles options, « unix charset » (jeu de caractères Unix) et « display " -"charset » (jeu de caractères à l'affichage). Veuillez indiquer le jeu de " -"caractères que vous voulez utiliser avec chacune de ces deux options. La " -"première permet d'interpréter les noms de fichiers sur le système et la " -"seconde permet à smbclient d'interpréter ces noms lors d'une connexion à un " -"serveur de fichiers." +"votre fichier smb.conf. Avec Samba 3.0, cette option est remplacée par une " +"nouvelle option, « unix charset » (jeu de caractères Unix). Veuillez " +"indiquer le jeu de caractères que vous voulez utiliser avec cette option, " +"qui permet d'interpréter les noms de fichiers sur le système." #. Description #: ../samba-common.templates:3 @@ -54,12 +50,12 @@ msgstr "" "réponse." #. Description -#: ../samba-common.templates:15 +#: ../samba-common.templates:13 msgid "Character Set for DOS clients" msgstr "Jeu de caractères pour les clients DOS" #. Description -#: ../samba-common.templates:15 +#: ../samba-common.templates:13 msgid "" "You currently have a \"client code page\" set in your smb.conf. In Samba " "3.0, this option is replaced by the option \"dos charset\". Please specify " @@ -78,12 +74,12 @@ msgstr "" "sans réponse. " #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "Modify smb.conf to use WINS settings from DHCP?" msgstr "Modifier smb.conf pour utiliser les paramètres WINS fournis par DHCP ?" #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "" "If your computer gets IP address information from a DHCP server on the " "network, the DHCP server may also provide information about WINS servers " @@ -98,19 +94,19 @@ msgstr "" "serveur DHCP soient lus dans /etc/samba/dhcp.conf." #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "" "You must have the dhcp3-client package installed to take advantage of this " "feature." msgstr "Pour cela, le paquet dhcp3-client doit être installé." #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "Configure smb.conf through debconf?" msgstr "Voulez-vous configurer smb.conf avec debconf ?" #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "" "The rest of the configuration of Samba deals with questions that affect " "parameters in /etc/samba/smb.conf, which is the file used to configure the " @@ -125,7 +121,7 @@ msgstr "" "il vaut mieux gérer manuellement le contenu de ce fichier." #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "" "If you don't use debconf to configure smb.conf, you will have to handle any " "configuration changes yourself, and will not be able to take advantage of " @@ -138,12 +134,12 @@ msgstr "" "est conseillé d'utiliser debconf." #. Description -#: ../samba-common.templates:54 +#: ../samba-common.templates:52 msgid "Workgroup/Domain Name?" msgstr "Groupe de travail et nom de domaine ?" #. Description -#: ../samba-common.templates:54 +#: ../samba-common.templates:52 msgid "" "This controls what workgroup your server will appear to be in when queried " "by clients. Note that this parameter also controls the Domain name used with " @@ -154,12 +150,12 @@ msgstr "" "« security=domain »." #. Description -#: ../samba-common.templates:62 +#: ../samba-common.templates:60 msgid "Use password encryption?" msgstr "Voulez-vous chiffrer les mots de passe ?" #. Description -#: ../samba-common.templates:62 +#: ../samba-common.templates:60 msgid "" "Recent Windows clients communicate with SMB servers using encrypted " "passwords. If you want to use clear text passwords you will need to change a " diff --git a/packaging/Debian/debian/po/pt_BR.po b/packaging/Debian/debian/po/pt_BR.po index a6f02f7706..63ffd9a983 100644 --- a/packaging/Debian/debian/po/pt_BR.po +++ b/packaging/Debian/debian/po/pt_BR.po @@ -13,14 +13,15 @@ # msgid "" msgstr "" -"Project-Id-Version: samba_2.999+3.0.alpha20-4\n" -"POT-Creation-Date: 2003-04-30 13:11-0500\n" -"PO-Revision-Date: 2003-04-05 13:30-0300\n" -"Last-Translator: André Luís Lopes <andrelop@ig.com.br>\n" +"Project-Id-Version: samba_3.0.0beta2-1\n" +"POT-Creation-Date: 2003-07-02 21:50-0500\n" +"PO-Revision-Date: 2003-07-02 21:56-0500\n" +"Last-Translator: Steve Langasek <vorlon@debian.org>\n" "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" #. Description #: ../samba-common.templates:3 @@ -29,21 +30,19 @@ msgstr "Conjunto de caracteres para sistema de arquivos Unix" #. Description #: ../samba-common.templates:3 +#, fuzzy msgid "" "You currently have a \"character set\" configured in your smb.conf. In " -"Samba 3.0, this option is replaced by two new options, \"unix charset\" and " -"\"display charset\". Please specify the character set you wish to use for " -"these new options, which control how Samba interprets filenames on the file " -"system and how smbclient will interpret these names when you connect to a " -"file server." +"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please " +"specify the character set you wish to use for theis new option, which " +"controls how Samba interprets filenames on the file system." msgstr "" "Atualmente existe um \"conjunto de caracteres\" (\"character set\") " "configurado em seu arquivo smb.conf. No Samba 3.0, esta opção foi " -"substituída por duas novas opções, \"unix charset\" e \"display charset\". " -"Por favor especifique o conjunto de caracteres a ser usado para essas novas " -"opções, as quais controlam como o Samba interpreta nomes de arquivos no " -"sistema de arquivos e como o smbclient irá interpretar esses nomes quando " -"você se conectar a um servidor de arquivos, respectivamente." +"substituída por uma nova opção, \"unix charset\". Por favor especifique " +"o conjunto de caracteres a ser usado para essa nova opção, a qual " +"controla como o Samba interpreta nomes de arquivos no sistema de " +"arquivos." #. Description #: ../samba-common.templates:3 @@ -53,12 +52,12 @@ msgstr "" "modificado." #. Description -#: ../samba-common.templates:15 +#: ../samba-common.templates:13 msgid "Character Set for DOS clients" msgstr "Conjunto de caracteres para clientes DOS" #. Description -#: ../samba-common.templates:15 +#: ../samba-common.templates:13 msgid "" "You currently have a \"client code page\" set in your smb.conf. In Samba " "3.0, this option is replaced by the option \"dos charset\". Please specify " @@ -76,12 +75,12 @@ msgstr "" "será modificado." #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "Modify smb.conf to use WINS settings from DHCP?" msgstr "Modificar smb.conf para usar configurações WINS fornecidas via DHCP ?" #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "" "If your computer gets IP address information from a DHCP server on the " "network, the DHCP server may also provide information about WINS servers " @@ -97,7 +96,7 @@ msgstr "" "arquivo smb.conf." #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "" "You must have the dhcp3-client package installed to take advantage of this " "feature." @@ -106,12 +105,12 @@ msgstr "" "recurso." #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "Configure smb.conf through debconf?" msgstr "Configurar smb.conf através do debconf ?" #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "" "The rest of the configuration of Samba deals with questions that affect " "parameters in /etc/samba/smb.conf, which is the file used to configure the " @@ -127,7 +126,7 @@ msgstr "" "lo funcional novamente." #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "" "If you don't use debconf to configure smb.conf, you will have to handle any " "configuration changes yourself, and will not be able to take advantage of " @@ -140,12 +139,12 @@ msgstr "" "Por esse motivo, é recomendado usar o debconf, caso seja possível." #. Description -#: ../samba-common.templates:54 +#: ../samba-common.templates:52 msgid "Workgroup/Domain Name?" msgstr "Nome de Domínio/Grupo de Trabalho ?" #. Description -#: ../samba-common.templates:54 +#: ../samba-common.templates:52 msgid "" "This controls what workgroup your server will appear to be in when queried " "by clients. Note that this parameter also controls the Domain name used with " @@ -157,12 +156,12 @@ msgstr "" "security=domain." #. Description -#: ../samba-common.templates:62 +#: ../samba-common.templates:60 msgid "Use password encryption?" msgstr "Usar encriptação de senhas ?" #. Description -#: ../samba-common.templates:62 +#: ../samba-common.templates:60 msgid "" "Recent Windows clients communicate with SMB servers using encrypted " "passwords. If you want to use clear text passwords you will need to change a " diff --git a/packaging/Debian/debian/po/templates.pot b/packaging/Debian/debian/po/templates.pot index 4798ca9cfa..b636ba2e48 100644 --- a/packaging/Debian/debian/po/templates.pot +++ b/packaging/Debian/debian/po/templates.pot @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-04-30 13:11-0500\n" +"POT-Creation-Date: 2003-07-02 21:50-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -32,11 +32,9 @@ msgstr "" #: ../samba-common.templates:3 msgid "" "You currently have a \"character set\" configured in your smb.conf. In " -"Samba 3.0, this option is replaced by two new options, \"unix charset\" and " -"\"display charset\". Please specify the character set you wish to use for " -"these new options, which control how Samba interprets filenames on the file " -"system and how smbclient will interpret these names when you connect to a " -"file server." +"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please " +"specify the character set you wish to use for theis new option, which " +"controls how Samba interprets filenames on the file system." msgstr "" #. Description @@ -45,12 +43,12 @@ msgid "If you leave this option blank, your smb.conf will not be changed." msgstr "" #. Description -#: ../samba-common.templates:15 +#: ../samba-common.templates:13 msgid "Character Set for DOS clients" msgstr "" #. Description -#: ../samba-common.templates:15 +#: ../samba-common.templates:13 msgid "" "You currently have a \"client code page\" set in your smb.conf. In Samba " "3.0, this option is replaced by the option \"dos charset\". Please specify " @@ -61,12 +59,12 @@ msgid "" msgstr "" #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "Modify smb.conf to use WINS settings from DHCP?" msgstr "" #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "" "If your computer gets IP address information from a DHCP server on the " "network, the DHCP server may also provide information about WINS servers " @@ -76,19 +74,19 @@ msgid "" msgstr "" #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "" "You must have the dhcp3-client package installed to take advantage of this " "feature." msgstr "" #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "Configure smb.conf through debconf?" msgstr "" #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "" "The rest of the configuration of Samba deals with questions that affect " "parameters in /etc/samba/smb.conf, which is the file used to configure the " @@ -98,7 +96,7 @@ msgid "" msgstr "" #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "" "If you don't use debconf to configure smb.conf, you will have to handle any " "configuration changes yourself, and will not be able to take advantage of " @@ -107,12 +105,12 @@ msgid "" msgstr "" #. Description -#: ../samba-common.templates:54 +#: ../samba-common.templates:52 msgid "Workgroup/Domain Name?" msgstr "" #. Description -#: ../samba-common.templates:54 +#: ../samba-common.templates:52 msgid "" "This controls what workgroup your server will appear to be in when queried " "by clients. Note that this parameter also controls the Domain name used with " @@ -120,12 +118,12 @@ msgid "" msgstr "" #. Description -#: ../samba-common.templates:62 +#: ../samba-common.templates:60 msgid "Use password encryption?" msgstr "" #. Description -#: ../samba-common.templates:62 +#: ../samba-common.templates:60 msgid "" "Recent Windows clients communicate with SMB servers using encrypted " "passwords. If you want to use clear text passwords you will need to change a " diff --git a/packaging/Debian/debian/rules b/packaging/Debian/debian/rules index 79be52a044..0539484089 100755 --- a/packaging/Debian/debian/rules +++ b/packaging/Debian/debian/rules @@ -4,14 +4,13 @@ # solve build problems) introduced in Samba 2.2.1a-5. These # modification were made by Steve Langasek <vorlon@netexpress.net>. # -# $Id: rules,v 1.3 2003/06/01 07:12:51 peloy Exp $ # # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 # This is the debhelper compatability version to use. -export DH_COMPAT=2 +export DH_COMPAT=4 # This has to be exported to make some magic below work. export DH_OPTIONS @@ -24,6 +23,22 @@ DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) export DEB_HOST_GNU_TYPE export DEB_BUILD_GNU_TYPE + +# Support the DEB_BUILD_OPTIONS variable +CFLAGS = -gstabs -Wall +INSTALL = install + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL += -s +endif + + DESTDIR=`pwd`/debian/tmp SWATDIR=`pwd`/debian/swat SAMBABOOK=`pwd`/debian/swat @@ -33,7 +48,7 @@ IVARS = BASEDIR=$(DESTDIR)/usr \ BINDIR=$(DESTDIR)/usr/bin \ SBINDIR=$(DESTDIR)/usr/sbin \ MANDIR=$(DESTDIR)/usr/share/man \ - LIBDIR=$(DESTDIR)/etc/samba \ + LIBDIR=$(DESTDIR)/usr/lib/samba \ VARDIR=$(DESTDIR)/var \ INCLUDEDIR=$(DESTDIR)/usr/include \ SWATDIR=$(SWATDIR)/usr/share/samba/swat \ @@ -61,7 +76,7 @@ configure-stamp: cp -f debian/config.cache source/config.cache; \ fi - [ -f source/Makefile ] || (cd source && ./configure \ + [ -f source/Makefile ] || (cd source && CFLAGS="$(CFLAGS)" ./configure \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --cache-file=./config.cache \ @@ -260,7 +275,7 @@ binary-arch: build install fi # dh_installemacsen # dh_installpam - DH_OPTIONS= dh_installinit -psamba -n + DH_OPTIONS= dh_installinit -psamba -- "defaults 20 19" DH_OPTIONS= dh_installinit -pwinbind dh_installcron # dh_installmanpages diff --git a/packaging/Debian/debian/samba-common.config b/packaging/Debian/debian/samba-common.config index b5ab6e81d5..ed76b95cb8 100644 --- a/packaging/Debian/debian/samba-common.config +++ b/packaging/Debian/debian/samba-common.config @@ -78,7 +78,6 @@ if [ -f $FILE ]; then CHARSET=`smbconf_retr "character set"` CODEPAGE=`smbconf_retr "client code page"` - DISPLAYCHARSET=`smbconf_retr "display charset"` UNIXCHARSET=`smbconf_retr "unix charset"` DOSCHARSET=`smbconf_retr "dos charset"` @@ -110,10 +109,10 @@ db_input medium samba-common/encrypt_passwords || true db_go # Handle migrating character sets -if [ -n "$CHARSET" -a -z "$DISPLAYCHARSET" -a -z "$UNIXCHARSET" ] +if [ -n "$CHARSET" -a -z "$UNIXCHARSET" ] then - DISPLAYCHARSET=`echo $CHARSET | sed -e's/iso-/ISO/i'` - db_set samba-common/character_set "$DISPLAYCHARSET" + UNIXCHARSET=`echo $CHARSET | sed -e's/iso-/ISO/i'` + db_set samba-common/character_set "$UNIXCHARSET" # FIXME: should eventually be low. db_input medium samba-common/character_set || true db_go diff --git a/packaging/Debian/debian/samba-common.dhcp b/packaging/Debian/debian/samba-common.dhcp index 0ec8a0ff80..3b2fa4ba19 100644 --- a/packaging/Debian/debian/samba-common.dhcp +++ b/packaging/Debian/debian/samba-common.dhcp @@ -1,29 +1,34 @@ #!/bin/sh -# No need to continue if we're called with an unsupported option +netbios_setup() { + # No need to continue if we're called with an unsupported option -if [ "$reason" != BOUND ] && [ "$reason" != RENEW ] \ - && [ "$reason" != REBIND ] && [ "$reason" != REBOOT ] \ - && [ "$reason" != EXPIRE ] && [ "$reason" != FAIL ] -then - exit 0 -fi + if [ "$reason" != BOUND ] && [ "$reason" != RENEW ] \ + && [ "$reason" != REBIND ] && [ "$reason" != REBOOT ] \ + && [ "$reason" != EXPIRE ] && [ "$reason" != FAIL ] + then + return + fi -umask 022 + umask 022 -if [ -z "$new_netbios_name_servers" ] || [ "$reason" = FAIL ] \ - || [ "$reason" = EXPIRE ] -then - # FIXME: add sed magic to only remove wins servers - # associated with this interface - echo -n > /etc/samba/dhcp.conf -elif [ "$new_netbios_name_servers" != "old_netbios_name_servers" ] -then - for server in $new_netbios_name_servers - do - serverlist="$serverlist $interface:$server" - done - # FIXME: add sed magic to only update wins servers - # associated with this interface - echo " wins server =$serverlist" > /etc/samba/dhcp.conf -fi + if [ -z "$new_netbios_name_servers" ] || [ "$reason" = FAIL ] \ + || [ "$reason" = EXPIRE ] + then + # FIXME: add sed magic to only remove wins servers + # associated with this interface + echo -n > /etc/samba/dhcp.conf + elif [ "$new_netbios_name_servers" != "$old_netbios_name_servers" ] + then + local serverlist="" + for server in $new_netbios_name_servers + do + serverlist="$serverlist $interface:$server" + done + # FIXME: add sed magic to only update wins servers + # associated with this interface + echo " wins server =$serverlist" > /etc/samba/dhcp.conf + fi +} + +netbios_setup diff --git a/packaging/Debian/debian/samba-common.postinst b/packaging/Debian/debian/samba-common.postinst index b3f3c5e9fd..6c6eb9bf53 100644 --- a/packaging/Debian/debian/samba-common.postinst +++ b/packaging/Debian/debian/samba-common.postinst @@ -1,6 +1,5 @@ #!/bin/sh # -# $Id: samba-common.postinst,v 1.2 2003/06/01 07:12:51 peloy Exp $ # set -e @@ -80,15 +79,14 @@ if [ "${RET}" = "true" ]; then if ! grep -q "^[[:space:]]*unix charset[[:space:]]*=" /etc/samba/smb.conf then db_get samba-common/character_set || true - DISPLAYCHARSET="${RET}" - if [ -n "$DISPLAYCHARSET" ] + UNIXCHARSET="${RET}" + if [ -n "$UNIXCHARSET" ] then sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i s/^\([[:space:]]*\)character set/\1character set/i /^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ { /^[[:space:]]*character set[[:space:]]*=/c \\ - display charset = $DISPLAYCHARSET\\ - unix charset = $DISPLAYCHARSET + unix charset = $UNIXCHARSET }" < /etc/samba/smb.conf > ${TMPFILE} mv -f ${TMPFILE} /etc/samba/smb.conf fi diff --git a/packaging/Debian/debian/samba-common.postrm b/packaging/Debian/debian/samba-common.postrm index 0f005e1055..8a4b6d3d55 100644 --- a/packaging/Debian/debian/samba-common.postrm +++ b/packaging/Debian/debian/samba-common.postrm @@ -1,6 +1,5 @@ #!/bin/sh # -# $Id: samba-common.postrm,v 1.3 2003/06/01 07:12:51 peloy Exp $ # if [ "$1" = purge ]; then diff --git a/packaging/Debian/debian/samba-common.templates b/packaging/Debian/debian/samba-common.templates index 83621408df..e5f7b1ae0c 100644 --- a/packaging/Debian/debian/samba-common.templates +++ b/packaging/Debian/debian/samba-common.templates @@ -2,11 +2,9 @@ Template: samba-common/character_set Type: string _Description: Character Set for Unix filesystem You currently have a "character set" configured in your smb.conf. In - Samba 3.0, this option is replaced by two new options, "unix charset" and - "display charset". Please specify the character set you wish to use for - these new options, which control how Samba interprets filenames on the - file system and how smbclient will interpret these names when you connect - to a file server. + Samba 3.0, this option is replaced by a new option, "unix charset". + Please specify the character set you wish to use for theis new option, + which controls how Samba interprets filenames on the file system. . If you leave this option blank, your smb.conf will not be changed. diff --git a/packaging/Debian/debian/samba.config b/packaging/Debian/debian/samba.config index 022d5fe6dc..89792d436e 100644 --- a/packaging/Debian/debian/samba.config +++ b/packaging/Debian/debian/samba.config @@ -1,6 +1,5 @@ #/bin/sh -e # -# $Id: samba.config,v 1.2 2003/06/01 07:12:51 peloy Exp $ # # Source debconf library. diff --git a/packaging/Debian/debian/samba.dirs b/packaging/Debian/debian/samba.dirs index 06a2fb2484..a58e4e9892 100644 --- a/packaging/Debian/debian/samba.dirs +++ b/packaging/Debian/debian/samba.dirs @@ -1,6 +1,7 @@ usr/bin usr/sbin var/log/samba -var/lib/samba +var/lib/samba/printers/W32X86 +var/lib/samba/printers/WIN40 var/run/samba var/cache/samba diff --git a/packaging/Debian/debian/samba.files b/packaging/Debian/debian/samba.files index 7de0a15f2f..f52e6c5e4f 100644 --- a/packaging/Debian/debian/samba.files +++ b/packaging/Debian/debian/samba.files @@ -6,6 +6,7 @@ usr/bin/pdbedit usr/sbin/smbd usr/sbin/nmbd usr/sbin/mksmbpasswd +usr/lib/samba/vfs usr/share/man/man1/smbcontrol.1 usr/share/man/man1/smbstatus.1 usr/share/man/man1/testprns.1 @@ -14,3 +15,5 @@ usr/share/man/man8/nmbd.8 usr/share/man/man8/pdbedit.8 usr/share/man/man8/smbd.8 usr/share/man/man8/mksmbpasswd.8 +usr/share/man/man8/tdbbackup.8 + diff --git a/packaging/Debian/debian/samba.init b/packaging/Debian/debian/samba.init index 3894fe1e64..5d0f4671a0 100644 --- a/packaging/Debian/debian/samba.init +++ b/packaging/Debian/debian/samba.init @@ -2,7 +2,6 @@ # # Start/stops the Samba daemons (nmbd and smbd). # -# $Id: samba.init,v 1.3 2003/06/01 07:12:51 peloy Exp $ # # Defaults diff --git a/packaging/Debian/debian/samba.postinst b/packaging/Debian/debian/samba.postinst index 00f9fde3b2..1a25290ed2 100644 --- a/packaging/Debian/debian/samba.postinst +++ b/packaging/Debian/debian/samba.postinst @@ -2,7 +2,6 @@ # # Post-installation script for the Samba package for Debian GNU/Linux # -# $Id: samba.postinst,v 1.3 2003/06/01 07:12:51 peloy Exp $ # case "$1" in @@ -192,11 +191,6 @@ if dpkg --compare-versions "$2" lt 2.999+3.0.alpha20-4; then update-inetd --remove netbios-ns fi -# We always run /etc/init.d/samba, even if we run Samba from inetd. -# The init.d script takes care of handling the conflict of running -# from inetd or as daemons. -update-rc.d samba defaults 20 19 > /dev/null - # We want to add these entries to inetd.conf commented out. Otherwise # UDP traffic could make inetd to start nmbd or smbd right during # the configuration stage. @@ -210,16 +204,6 @@ else update-inetd --enable netbios-ssn fi -# Start Samba: we don't want to call /etc/init.d/samba if we are -# running from inetd because a nasty help message would be printed out. - -# Run the init script if this is a first-time install, or if it's an -# upgrade and Samba was running before, _and_ we're not running from inetd. -if [ -z "$2" -o ! -f /tmp/samba-was-not-running ]; then - # Check the script is executable before running it. - [ -x /etc/init.d/samba ] && /etc/init.d/samba start -fi - # This check is a safety net: the /etc/samba/smbpasswd file must have # permissions 600. if [ -f /etc/samba/smbpasswd ]; then @@ -239,10 +223,6 @@ rm -f /etc/samba/debian_config mv -f /var/log/nmb* /var/log/samba/ 2> /dev/null || true mv -f /var/log/smb* /var/log/samba/ 2> /dev/null || true -# Do this last, so we don't accidentally start the daemons if something -# else in the script fails above. -rm -f /tmp/samba-was-not-running - #DEBHELPER# exit 0 diff --git a/packaging/Debian/debian/samba.postrm b/packaging/Debian/debian/samba.postrm index b929061f37..b79fe1d009 100644 --- a/packaging/Debian/debian/samba.postrm +++ b/packaging/Debian/debian/samba.postrm @@ -1,6 +1,5 @@ #!/bin/sh -e # -# $Id: samba.postrm,v 1.3 2003/06/01 07:12:51 peloy Exp $ # if [ "$1" = purge ]; then @@ -18,7 +17,6 @@ if [ "$1" = purge ]; then # Remove NetBIOS entries from /etc/inetd.conf update-inetd --remove netbios-ssn - update-rc.d samba remove >/dev/null else # Not purging, do not remove NetBIOS entries from /etc/inetd.conf update-inetd --disable netbios-ssn diff --git a/packaging/Debian/debian/samba.prerm b/packaging/Debian/debian/samba.prerm index 6a4a8a4b4b..ab62c706d8 100644 --- a/packaging/Debian/debian/samba.prerm +++ b/packaging/Debian/debian/samba.prerm @@ -1,24 +1,5 @@ #!/bin/sh -e -# Clean up any such stale file. -rm -f /tmp/samba-was-not-running - -# The smbd pid file is missing, or points to a dead process -if [ ! -f /var/run/samba/smbd.pid ] || \ - ! ps h `cat /var/run/samba/smbd.pid` > /dev/null -then - # The nmbd pid file is missing, or points to a dead process - if [ -f /var/run/samba/nmbd.pid ] || \ - ! ps h `cat /var/run/samba/nmbd.pid` > /dev/null - then - # let the postinst know not to start samba. - [ "$1" = "upgrade" ] && touch /tmp/samba-was-not-running - fi -fi - -# We call the init script to stop Samba, even if it only affects nmbd. -[ -x /etc/init.d/samba ] && /etc/init.d/samba stop - if [ "$1" = upgrade -a -n "$2" ] && dpkg --compare-versions "$2" lt 2.99 \ && [ -e /var/lib/samba/passdb.tdb -a ! -e /etc/samba/smbpasswd ] then diff --git a/packaging/Debian/debian/scripts/patch-source b/packaging/Debian/debian/scripts/patch-source index ac2140f993..aabcbf709c 100755 --- a/packaging/Debian/debian/scripts/patch-source +++ b/packaging/Debian/debian/scripts/patch-source @@ -1,6 +1,5 @@ #!/bin/sh -e # -# $Id: patch-source,v 1.3 2003/06/01 07:12:51 peloy Exp $ # for patch in debian/patches/*.patch; do diff --git a/packaging/Debian/debian/scripts/unpatch-source b/packaging/Debian/debian/scripts/unpatch-source index ae58b2851c..0f577d362f 100755 --- a/packaging/Debian/debian/scripts/unpatch-source +++ b/packaging/Debian/debian/scripts/unpatch-source @@ -1,6 +1,5 @@ #!/bin/sh -e # -# $Id: unpatch-source,v 1.3 2003/06/01 07:12:51 peloy Exp $ # # We want to reverse the patches in the opposite order we applied diff --git a/packaging/Debian/debian/smb.conf b/packaging/Debian/debian/smb.conf index f5d04889d1..8a75979945 100644 --- a/packaging/Debian/debian/smb.conf +++ b/packaging/Debian/debian/smb.conf @@ -1,7 +1,6 @@ # # Sample configuration file for the Samba suite for Debian GNU/Linux. # -# $Id: smb.conf,v 1.3 2003/06/01 07:12:51 peloy Exp $ # # This is the main Samba configuration file. You should read the # smb.conf(5) manual page in order to understand the options listed @@ -22,27 +21,31 @@ [global] -# Change this for the workgroup/NT-domain name your Samba server will part of +## Browsing/Identification ### + +# Change this to the workgroup/NT-domain name your Samba server will part of workgroup = DEBIAN_FANS # server string is the equivalent of the NT Description field server string = %h server (Samba %v) -# If you want to automatically load your printer list rather -# than setting them up individually then you'll need this -; load printers = yes +# Windows Internet Name Serving Support Section: +# WINS Support - Tells the NMBD component of Samba to enable its WINS Server +; wins support = no -# lpr(ng) printing. You may wish to override the location of the -# printcap file -; printing = bsd -; printcap name = /etc/printcap +# 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 -# cups printing. See also the cupsaddsmb(8) manpage -; printing = cups -; printcap name = cups +# This will prevent nmbd to search for NetBIOS names through DNS. + dns proxy = no -; guest account = nobody - invalid users = root +# What naming service and in what order should we use to resolve host names +# to IP addresses +; name resolve order = lmhosts host wins bcast + + +#### Debugging/Accounting #### # This tells Samba to use a separate log file for each machine # that connects @@ -51,118 +54,116 @@ # Put a capping on the size of the log files (in Kb). max log size = 1000 -# If you want Samba to log though syslog only then set the following -# parameter to 'yes'. Please note that logging through syslog in -# Samba is still experimental. +# If you want Samba to only log through syslog then set the following +# parameter to 'yes'. ; syslog only = no # We want Samba to log a minimum amount of information to syslog. Everything -# should go to /var/log/samba/log.{smb,nmb} instead. If you want to log +# should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log # through syslog you should set the following parameter to something higher. syslog = 0 +# Do something sensible when Samba crashes: mail the admin a backtrace + panic action = /usr/share/samba/panic-action %d + + +####### Authentication ####### + # "security = user" is always a good idea. This will require a Unix account # in this server for every user accessing the server. See -# security_level.txt for details. +# /usr/share/doc/samba-doc/htmldocs/ServerType.html in the samba-doc +# package for details. ; security = user -# You may wish to use password encryption. Please read ENCRYPTION.html, -# Win95.txt and WinNT.txt in the Samba documentation. Do not enable this -# option unless you have read those documents +# You may wish to use password encryption. See the section on +# 'encrypt passwords' in the smb.conf(5) manpage before enabling. encrypt passwords = no # If you are using encrypted passwords, Samba will need to know what # password database type you are using. passdb backend = tdbsam guest -# Using the following line enables you to customise your configuration -# on a per machine basis. The %m gets replaced with the netbios name -# of the machine that is connecting -; include = /home/samba/etc/smb.conf.%m + obey pam restrictions = yes -# Most people will find that this option gives better performance. -# See speed.txt and the manual pages for details -# You may want to add the following on a Linux system: -# SO_RCVBUF=8192 SO_SNDBUF=8192 - socket options = TCP_NODELAY +; guest account = nobody + invalid users = root -# --- Browser Control Options --- +# This boolean parameter controls whether Samba attempts to sync the Unix +# password with the SMB password when the encrypted SMB password in the +# passdb is changed. +; unix password sync = no -# Please _read_ BROWSING.txt and set the next four parameters according -# to your network setup. The defaults are specified below (commented -# out.) It's important that you read BROWSING.txt so you don't break -# browsing in your network! +# For Unix password sync to work on a Debian GNU/Linux system, the following +# parameters must be set (thanks to Augustin Luton <aluton@hybrigenics.fr> for +# sending the correct chat script for the passwd program in Debian Potato). + passwd program = /usr/bin/passwd %u + passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n . -# 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 = yes +# This boolean controls whether PAM will be used for password changes +# when requested by an SMB client instead of the program listed in +# 'passwd program'. The default is 'no'. +; pam password change = no -# OS Level determines the precedence of this server in master browser -# elections. The default value should be reasonable -; os level = 20 -# 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 = auto +########## Printing ########## -# 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 = auto +# If you want to automatically load your printer list rather +# than setting them up individually then you'll need this +; load printers = yes -# --- End of Browser Control Options --- +# lpr(ng) printing. You may wish to override the location of the +# printcap file +; printing = bsd +; printcap name = /etc/printcap -# Windows Internet Name Serving Support Section: -# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server -; wins support = no +# CUPS printing. See also the cupsaddsmb(8) manpage in the +# cupsys-client package. +; printing = cups +; printcap name = cups -# 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 +# When using [print$], root is implicitly a 'printer admin', but you can +# also give this right to other users to add drivers and set printer +# properties +; printer admin = @ntadmin -# This will prevent nmbd to search for NetBIOS names through DNS. - dns proxy = no -# What naming service and in what order should we use to resolve host names -# to IP addresses -; name resolve order = lmhosts host wins bcast +######## File sharing ######## # Name mangling options ; preserve case = yes ; short preserve case = yes -# This boolean parameter controlls whether Samba attempts to sync. the Unix -# password with the SMB password when the encrypted SMB password in the -# /etc/samba/smbpasswd file is changed. -; unix password sync = false -# For Unix password sync. to work on a Debian GNU/Linux system, the following -# parameters must be set (thanks to Augustin Luton <aluton@hybrigenics.fr> for -# sending the correct chat script for the passwd program in Debian Potato). - passwd program = /usr/bin/passwd %u - passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n . +############ Misc ############ -# This boolean controls whether PAM will be used for password changes -# when requested by an SMB client instead of the program listed in -# 'passwd program'. The default is 'no'. -; pam password change = no +# Using the following line enables you to customise your configuration +# on a per machine basis. The %m gets replaced with the netbios name +# of the machine that is connecting +; include = /home/samba/etc/smb.conf.%m + +# Most people will find that this option gives better performance. +# See smb.conf(5) and /usr/share/doc/samba-doc/htmldocs/speed.html +# for details +# You may want to add the following on a Linux system: +# SO_RCVBUF=8192 SO_SNDBUF=8192 + socket options = TCP_NODELAY # The following parameter is useful only if you have the linpopup package # installed. The samba maintainer and the linpopup maintainer are # working to ease installation and configuration of linpopup and samba. ; message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' & - obey pam restrictions = yes +# Domain Master specifies Samba to be the Domain Master Browser. If this +# machine will be configured as a BDC (a secondary logon server), you +# must set this to 'no'; otherwise, the default behavior is recommended. +; domain master = auto # Some defaults for winbind (make sure you're not using the ranges # for something else.) -; winbind uid = 10000-20000 -; winbind gid = 10000-20000 +; idmap uid = 10000-20000 +; idmap gid = 10000-20000 ; template shell = /bin/bash -# Do something sensible when Samba crashes: mail the admin a backtrace - panic action = /usr/share/samba/panic-action %d - #======================= Share Definitions ======================= [homes] @@ -199,6 +200,19 @@ writable = no create mode = 0700 +# Windows clients look for this share name as a source of downloadable +# printer drivers +[print$] + comment = Printer Drivers + path = /var/lib/samba/printers + browseable = yes + read only = yes + guest ok = no +# Uncomment to allow remote administration of Windows print drivers. +# Replace 'ntadmin' with the name of the group your admin users are +# members of. +; write list = root, @ntadmin + # A sample share for sharing your CD-ROM with others. ;[cdrom] ; comment = Samba server's CD-ROM diff --git a/packaging/Debian/debian/smbclient.files b/packaging/Debian/debian/smbclient.files index efabb0ddd0..96e8945bf3 100644 --- a/packaging/Debian/debian/smbclient.files +++ b/packaging/Debian/debian/smbclient.files @@ -4,9 +4,12 @@ usr/bin/rpcclient usr/bin/smbspool usr/bin/smbtree usr/bin/smbcacls +usr/bin/smbcquotas usr/share/man/man1/smbclient.1 usr/share/man/man1/smbtar.1 usr/share/man/man1/rpcclient.1 usr/share/man/man8/smbspool.8 usr/share/man/man1/smbcacls.1 +usr/share/man/man1/smbcquotas.1 +usr/share/man/man1/smbtree.1 usr/lib/cups/backend/smb diff --git a/packaging/Debian/debian/swat.config b/packaging/Debian/debian/swat.config index ae539d2ae5..e210fae55e 100644 --- a/packaging/Debian/debian/swat.config +++ b/packaging/Debian/debian/swat.config @@ -1,6 +1,5 @@ #/bin/sh -e # -# $Id: swat.config,v 1.2 2003/06/01 07:12:51 peloy Exp $ # # Source debconf library. diff --git a/packaging/Debian/debian/swat.postinst b/packaging/Debian/debian/swat.postinst index c06f3a72fb..338f8a07c2 100644 --- a/packaging/Debian/debian/swat.postinst +++ b/packaging/Debian/debian/swat.postinst @@ -1,6 +1,5 @@ #!/bin/sh # -# $Id: swat.postinst,v 1.3 2003/06/01 07:12:51 peloy Exp $ # PATH=/sbin:/bin:/usr/sbin:/usr/bin diff --git a/packaging/Debian/debian/swat.postrm b/packaging/Debian/debian/swat.postrm index 30fa0d63c8..6bc5873096 100644 --- a/packaging/Debian/debian/swat.postrm +++ b/packaging/Debian/debian/swat.postrm @@ -1,6 +1,5 @@ #!/bin/sh # -# $Id: swat.postrm,v 1.3 2003/06/01 07:12:51 peloy Exp $ # case "$1" in diff --git a/packaging/Debian/debian/winbind.init b/packaging/Debian/debian/winbind.init index b7c2389dab..2dfdf3b835 100644 --- a/packaging/Debian/debian/winbind.init +++ b/packaging/Debian/debian/winbind.init @@ -2,7 +2,6 @@ # # Start/stops the winbindd daemon. # -# $Id: winbind.init,v 1.2 2003/06/01 07:12:51 peloy Exp $ # PATH=/sbin:/bin:/usr/sbin:/usr/bin |