diff options
Diffstat (limited to 'packaging/Debian/debian')
77 files changed, 1260 insertions, 3585 deletions
diff --git a/packaging/Debian/debian/README.build-upstream b/packaging/Debian/debian/README.build-upstream index 95c75d5fc51..d6250c12095 100644 --- a/packaging/Debian/debian/README.build-upstream +++ b/packaging/Debian/debian/README.build-upstream @@ -1,22 +1,12 @@ 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 3.0.0, and allow you to build Debian packages -for Debian unstable (so you need some development packages available -only in Debian unstable.) If you are using something newer than 3.0.0 -you might want to try to follow the instructions to see if patches -apply cleanly. If some patches don't apply cleanly please e-mail -samba@packages.debian.org since we might have fixed patches that we have -not yet integrated into upstream Samba. - -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. +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.6, 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.6 was released. Instructions ------------ @@ -32,29 +22,19 @@ these instructions: to the normal Debian development packages -- dpkg-dev, libc6-dev, devscripts, etc.): - autoconf debhelper libpam0g-dev libreadline4-dev libcupsys2-dev - libacl1-dev, libacl1 (>= 2.2.11-1) - libkrb5-dev - libldap2-dev - po-debconf - python2.3-dev + autoconf - Notes regarding the packages required to build Samba Debian packages: + Notes about 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. - - * The list above is current as of samba-3.0.0rc2, 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. + 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-3.0.0rc2". +1) cd samba[-<version>]. For example, "cd samba-2.2.6". 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 @@ -63,8 +43,9 @@ 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 3.0.0beta3, the version number should something like - 3.0.0beta3-0.1. + for Samba 2.2.6, the version number should something like 2.2.6-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.) 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. diff --git a/packaging/Debian/debian/README.debian b/packaging/Debian/debian/README.debian index 3802e329e53..49c2710b26d 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. Upgrading from Samba 2.2 -3. Packages Generated from the Samba Sources -4. Support for NT Domains +2. Packages Generated from the Samba Sources +3. Support for NT Domains +4. Samba and LDAP 5. Reporting bugs @@ -36,45 +36,7 @@ Contents of this README file: (/var/log/{nmb,smb} were moved to the new location. -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 +2. Packages Generated from the Samba Sources -------------------------------------------- Currently, the Samba sources produce the following binary packages: @@ -92,8 +54,6 @@ libsmbclient: Shared library that allows applications to talk to SMB servers. libsmbclient-dev: libsmbclient shared libraries. winbind: Service to resolve user and group information from a Windows NT server. -python2.2-samba: Python bindings that allow access to various aspects of - Samba. Please note that the package smbwrapper (a shared library that provides SMB client services that existed between Samba 2.0.0-1 and Samba-2.0.5a-4 @@ -104,7 +64,7 @@ with glibc2.1 get cleared out (the problem is with glibc, not with Samba itself). -4. Support for NT Domains +3. Support for NT Domains ------------------------- Samba 2.2 includes preliminary support for NT domains. A Samba server @@ -124,6 +84,26 @@ Please note that NT domain PDC support is far from complete and is still experimental. +4. Samba and LDAP +----------------- + +Samba 2.2 has experimental LDAP code. However, the official Debian +packages have not been compiled with LDAP support for a good reason: if +LDAP support is compiled in then the other authentication methods (PAM, +smbpasswd, etc.) cannot be used, only LDAP will work. So, while LDAP +cannot coexist peacefully with the other methods we will not provide +LDAP-enabled packages. The workaround is, of course, to build your own +packages. We can help with this if you don't know how to build packages. + +We follow Samba development, so please do not file bug reports asking +for LDAP, we will add support for it when it doesn't break other +things. + +update (2002/10/16): the Debian Samba packages in Debian unstable have +been compiled with --ldapsam support. If you need LDAP support you can +use those packages, or as we said, build your own 2.2.x packages. + + 5. Reporting Bugs ----------------- diff --git a/packaging/Debian/debian/TODO b/packaging/Debian/debian/TODO index 5883f72a92b..f53691f26b1 100644 --- a/packaging/Debian/debian/TODO +++ b/packaging/Debian/debian/TODO @@ -1,4 +1,8 @@ -Nothing in our list right now. +In no particular order: + +- Fix stuff in packaging/Debian/ (add infrastructure for stable + builds) +- Compile with LDAP support. +- Review /etc/init.d/samba (Brian White reports problems, should add + --oknodo to start-stop-daemon) -Debian Samba Maintainers.- -Sun Apr 6 01:34:21 EST 2003 diff --git a/packaging/Debian/debian/changelog b/packaging/Debian/debian/changelog index 0561f063fa6..fed54fe2e0b 100644 --- a/packaging/Debian/debian/changelog +++ b/packaging/Debian/debian/changelog @@ -1,486 +1,47 @@ -samba (3.0.0-1) unstable; urgency=low +samba (2.2.8-0.1) stable; urgency=high - * Local build. - - -- Debian User <somebody@somewhere.com> Tue, 23 Sep 2003 21:50:26 -0400 - -samba (3.0.0beta2+3.0.0rc4-1) unstable; urgency=low - - * New upstream version. - - -- Eloy A. Paris <peloy@debian.org> Sat, 13 Sep 2003 08:47:56 -0400 - -samba (3.0.0beta2+3.0.0rc3-1) unstable; urgency=low - - * New upstream release. Last Release Candidate according to the - Samba Team. Samba 3.0.0 is around the corner, in a week or so. - - Fixes use of non-PIC code in nss shared libraries (closes: #208773) - - 'unix password sync' option now runs the unix password program as - root again (closes: #209739). - * One-line patch to make packages buildable with distcc (closes: #210227) - - -- Eloy A. Paris <peloy@debian.org> Tue, 9 Sep 2003 07:57:16 -0400 - -samba (3.0.0beta2+3.0.0rc2-1) unstable; urgency=low - - * New upstream release. - * Incorporate Dutch debconf translations; thanks to Bart Cornelis - <cobaco@linux.be>. (closes: #207824) - * Link against libgnutls7 instead of libgnutls5. (closes: #208151) - - -- Eloy A. Paris <peloy@debian.org> Tue, 2 Sep 2003 21:37:13 -0400 - -samba (3.0.0beta2+3.0.0rc1-1) unstable; urgency=low - - * New upstream version (skipped samba 3.0.0beta3 due to time - constraints.) This ugly version number will go away when the final - Samba 3.0.0 is released. - * 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 - * Add versioned dependency on libpam-runtime and change - /etc/pam.d/samba to use the new common PAM config blocks. - * New python2.3-samba package (old python2.2-samba is no more.) - (closes: #206171) - - -- Eloy A. Paris <peloy@debian.org> Mon, 25 Aug 2003 17:05:14 -0400 - -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> Sun, 8 Jun 2003 22:26:43 -0400 - -samba (2.999+3.0.alpha24-3) unstable; urgency=low - - * Make sure Samba DSOs are compiled with -fPIC. (closes: #194324) - * Rebuild against pristine Kerberos libs, to squelch warnings about - versioned symbols. (closes: #194431, #194396) - - -- Steve Langasek <vorlon@debian.org> Thu, 22 May 2003 15:32:00 -0500 - -samba (2.999+3.0.alpha24-2) unstable; urgency=low - - * Fixed description of the smbfs package. (closes: #194183) - * Negate the sense of the unixsam check when upgrading. (closes: #194234) - - -- Steve Langasek <vorlon@debian.org> Wed, 21 May 2003 12:21:53 -0400 - -samba (2.999+3.0.alpha24-1) unstable; urgency=low - - * New upstream version. (closes: #189354) - - -- Eloy A. Paris <peloy@debian.org> Tue, 20 May 2003 13:55:57 -0400 - -samba (2.999+3.0.alpha23-5) unstable; urgency=low - - * Move the python package from section "net" to section "python". - * Make sure we use PIC code for python on all platforms. - * French translation of an additional debconf template, courtesy of - Christian Perrier <bubulle@debian.org>. (closes: #188832) - * Updated Brazilian Portuguese translation from André LuÃs Lopes - <andrelop@ig.com.br>. - * s/unixsam/guest/ everywhere, since the unixsam backend is now - deprecated. (closes: #190095) - * Create our temp config file as /etc/samba/smb.conf.dpkg-tmp; not - only does using /tmp violate SELinux policies, it introduces the - possibility of data loss during the final copy if /tmp is a separate - filesystem. (closes: #189823) - * Pull in fix for SWAT, so that logins work again - (closes: #188255, #192077). - * Move passdb.tdb into /var/lib/samba, since it's not user-editable. - * Make sure with don't ship any .cvsignore files. - * Don't ship examples for python2.2-samba and samba-doc in an - "examples" directory inside another "examples" directory. - - -- Eloy A. Paris <peloy@debian.org> Tue, 6 May 2003 12:05:46 -0400 - -samba (2.999+3.0.alpha23-4) unstable; urgency=low - - * Instead of s/LPT1:/LPT:/, we need to do s/LPT:/LPT1:/ -- now all - non-RPC printing clients are working again. - * Change shlibs to 0 instead of 0.1. The library already in the - archive is using this soname, and there are no packages depending - on libsmbclient, so skip changing the package name for now. - (closes: #188661) - - -- Steve Langasek <vorlon@debian.org> Fri, 11 Apr 2003 14:42:00 -0500 - -samba (2.999+3.0.alpha23-3) unstable; urgency=low - - * Put the Samba Python modules in /usr/lib/python2.2/site-packages/, - not in /usr/lib/python2.2/lib-dynload/. - - -- Eloy A. Paris <peloy@debian.org> Wed, 9 Apr 2003 19:49:25 -0400 - -samba (2.999+3.0.alpha23-2) unstable; urgency=low - - * New package python2.2-samba that includes the Python modules - included in the Samba sources. Feedback on these modules and the new - package is welcome, as we (Debian Samba maintainers) don't use them. - (closes: #170731, #173322) - * Move libsmbclient-dev from section "devel" to "libdevel". - * Fix panic action script to give a sensible error message instead of - an empty backtrace when we don't have permission to attach to the - process. (closes: #188164) - * Fix libpam-smbpass so that it really does something. (closes: #178245) - * Apply patch to fix printing-related segfaults. (closes: #188076) - - -- Eloy A. Paris <peloy@debian.org> Sun, 6 Apr 2003 21:40:33 -0400 - -samba (2.999+3.0.alpha23-1) unstable; urgency=high - - * new upstream release, includes security fix for DSA-262 - * tweak the debconf templates to avoid references to specific - front-ends (closes: #183718) - - -- Steve Langasek <vorlon@debian.org> Sun, 9 Mar 2003 14:58:00 -0600 - -samba (2.999+3.0.alpha21-5) unstable; urgency=low - - * touch up the package descriptions a little bit (caps, punctuation) - * remove addtosmbpass, which snuck back in when we weren't looking - * reverse the position of the wins server tag, after looking more - closely at the code (closes: #183061) - * fix a glitch in the Spanish .po that rendered it invalid, plus a typo - * updated Brazilian Portuguese templates (closes: #183295) - * fix a typo in upstream manpage (s/shave/share/) (closes: #180546) - * run sed before we run sed, to deal with crazybad special chars - in the workgroup name (!) (closes: #176717) - - -- Steve Langasek <vorlon@debian.org> Sat, 1 Mar 2003 15:14:00 -0600 + * Samba Team Build + * Security Fix for anonymous root exploit -samba (2.999+3.0.alpha21-4) unstable; urgency=low - - * add scripts to samba-common to grab the netbios-name-servers options - if we're running a DHCP client (closes: #38413) - * major rearrangement of build scripts: install target now operates on - debian/tmp, not debian/samba, so we can see when new files are - added and decide where to put them; several files that should have - been in samba-common but were in samba (for the above reason) -- - smbcacls, -- have been moved, with a replaces: added. - * Fix rc script so that whitespace is consistent between inetd and - daemon modes (closes: #174677). - * smbclient -M must always connect to port 139, because port 445 - doesn't support messaging and we can't do the port 135 stuff yet - (closes: #175292, #167859). - * Import the diff from upstream CVS, which has fixed a few bugs - (closes: #178219, #177583, #181467, #181487, #181603, #175864). - Remove a few patches of ours which are now superseded. - * Add po-debconf support to the tree, for better i18n. - * Install the libsmbclient.so symlink in the libsmbclient-dev package, - per policy (closes: #181466). - - -- Steve Langasek <vorlon@debian.org> Fri, 27 Dec 2002 00:37:00 -0600 - -samba (2.999+3.0.alpha21-3) unstable; urgency=low - - * Drop --with-ldapsam from the configure options, since this no longer - means what we thought it did. Revert patch for changing the 'passdb - backend' defaults. - * Add patch from CVS HEAD to fix pdbedit segfault; postinst script - should work better now. (Closes: #173936) - - -- Steve Langasek <vorlon@debian.org> Sun, 22 Dec 2002 13:29:00 -0600 - -samba (2.999+3.0.alpha21-2) unstable; urgency=low - - * add CONFIGDIR to the set of directories exported in the install - target, so we don't try to write to /etc/ on the autobuilders. - * Reset the default 'passdb backend' value to something sensible, so - that we don't unnecessarily break upgrading systems (closes: #173731). - - -- Steve Langasek <vorlon@debian.org> Fri, 20 Dec 2002 09:13:00 -0600 + -- Simo Sorce <idra@samba.org> Wed, 16 Mar 2003 02:30:00 +0100 -samba (2.999+3.0.alpha21-1) unstable; urgency=low - - * new upstream release, many patches now incorporated upstream - - -- Steve Langasek <vorlon@debian.org> Mon, 16 Dec 2002 23:39:00 -0600 - -samba (2.999+3.0.alpha20-4) unstable; urgency=low - - * Remove obsolete comments about non-existant LDAP support in the - Debian Samba packages. (Closes: #165035) - * Apply patch for segfault in pam_smbpass when using the unixsam - backend. - * Drop support for nmbd in inetd, since it's not supported by - upstream and is reported to cause problems (closes: #23243, #137726, - 165037). - * Clarify example printing configs in smb.conf (closes: #168174). - * Make sure nmbd still responds to SIGTERM if it has no interfaces to - listen on (closes: #168079). - * Fix to get samba working again on 64-bit archs, after a - pointer<->int size mismatch bug. Already fixed in upstream CVS. - * Merge fix from CVS for broken libsmbclient.h references to internal - structures (closes: #162956). - * Add a default 'panic action' for Samba that will give us genuinely - useful debugging information after a crash. - * Fixed correct patch to example configurations in the libpam-smbpass - packages (closes: #169350). - * acl-dev is not in sid anymore; Build-Depend on libacl1-dev instead - (closes: #169682). - * Only ask the user for permission to edit if there's a chance of us - damaging something. - - -- Steve Langasek <vorlon@debian.org> Mon, 18 Nov 2002 19:53:00 -0500 - -samba (2.999+3.0.alpha20-3) unstable; urgency=low - - * Make sure smbstatus behavior is sane when Samba *has* been started, - as well as when it has not (closes: #164179). Thank to Robbert Kouprie - <robbert@radium.jvb.tudelft.nl> for this patch. - * Not using 'killall' in any of the maintainer scripts (the last one - remaining was winbind.logrotate.) We now just use 'kill' to send - a SIGHUP to a specific PID (which is stored in a file in - /var/run/samba.) - * Do not depend on procps because we're not using killall anymore. - - -- Eloy A. Paris <peloy@debian.org> Tue, 15 Oct 2002 22:15:57 -0400 - -samba (2.999+3.0.alpha20-2) unstable; urgency=low - - * fix an off-by-one error in smbd/lanman.c, which should shut off the - flood of log messages (closes: #157432) - * add a --config-cache option to the configure invocation, since - autoconf 2.5 doesn't load config.cache by default (closes: #163504) - - -- Steve Langasek <vorlon@debian.org> Sat, 5 Oct 2002 01:40:00 -0500 - -samba (2.999+3.0.alpha20-1) unstable; urgency=low - - * new upstream release - - non-primary groups appear to work again (closes: #161271) - * the official beginning of the upstream 3.0 branch - * exit without error from smbstatus when no connections have - been seen yet (closes: #161489) - - -- Steve Langasek <vorlon@debian.org> Wed, 2 Oct 2002 19:02:00 -0500 - -samba (2.999+3.0cvs20020906-1) unstable; urgency=low - - * CVS update - - domain authentication works again (closes: #158698) - * Factor out common code in samba-common.config - * Handle character set settings in smb.conf on upgrade - (closes: #153913, #158770) - * Don't use killall in logrotate script; there are better ways - (closes: #160076) - * Ignore value of 'hostname lookups' for hosts allow/hosts deny - (closes: #154376) +samba (2.2.7a-0.1) unstable; urgency=low - -- Steve Langasek <vorlon@debian.org> Sat, 7 Sep 2002 11:46:00 -0500 + * Team Build -samba (2.999+3.0cvs20020829-1) unstable; urgency=low + -- Simo Sorce <idra@samba.org> Wed, 18 Dec 2002 16:56:49 +0100 - * CVS update. - * Move the smb.conf manpage to the samba-common package (closes: #159572) - - -- Steve Langasek <vorlon@debian.org> Thu, 29 Aug 2002 17:53:25 -0500 - -samba (2.999+3.0cvs20020827-1) unstable; urgency=low - - * CVS update. (Closes: #158508) - * Part 1 of 3 of the library separation patch that Vorlon wrote has - gone upstream - removed the patch from our patches/ directory. - * Debconf note to warn users that their smb.conf will be re-written - and changed if they use Swat to maintain it. (Closes: #158479) - * Fixed typo in samba.prerm. - - -- Eloy A. Paris <peloy@debian.org> Tue, 27 Aug 2002 15:23:23 -0400 - -samba (2.999+3.0cvs20020825-2) unstable; urgency=low - - * scale back the tdbsam migration support, because of undesirable - side-effects; now always defaults to 'no'. - * strip out hyperactive library dependencies that are only needed by - smbd (closes: #155156). - * nuke any broken registry.tdb files left by previous CVS snapshots. - * support rolling back the smbpasswd->tdbsam conversion on downgrade, - since many people are likely to need to downgrade for a while. - * remove postrm handling of legacy directories, and add handling of - current ones. +samba (2.2.6-0.1) unstable; urgency=low - -- Steve Langasek <vorlon@debian.org> Sun, 28 Jul 2002 09:44:24 -0500 - -samba (2.999+3.0cvs20020825-1) unstable; urgency=low - - * CVS update. These packages are based on Samba 3.0alpha19 + any - code commited after 3.0alpha19 was released. - - -- Eloy A. Paris <peloy@debian.org> Sun, 25 Aug 2002 14:56:46 -0400 - -samba (2.999+3.0cvs20020723-1) unstable; urgency=medium - - * remove spurious line from samba.config - * migrate from smbpasswd to tdbsam - * re-add the pdbedit util and manpage - * compile in ldapsam support (closes: #146935) - * add PRIVATEDIR to the list of vars we override for the install - target, so Samba doesn't try to create /etc/samba (closes: #153746). - * fix makefile handling of LOGBASEDIR, so that logs always end up in - the right place (closes: 153727). - * Fixed bug in the FHS migration path that causes nmbd to read its - state from one location, but write it out to another. (closes: #154210) - * Make sure nmbd is always looking for wins.tdb in the same place. + * Local build. - -- Steve Langasek <vorlon@debian.org> Fri, 19 Jul 2002 21:38:54 -0500 + -- Debian User <user@somewhere.in.the.planet> Sun, 13 Oct 2002 02:33:32 -0400 -samba (2.99.cvs.20020713-1) unstable; urgency=low +samba (2.2.5-1.woody) stable; urgency=low - * first attempt for 3.0pre. - * only post a debconf note about moving logfiles if we're upgrading - from a version that had the logfiles in the old location - (closes: #152924). + * Upload latest stable Samba release to woody. + - includes improved NT printing support (closes: #157406) + * Fix the filename-matching algorithm used for smbtar's 'exclude' + functionality. (closes: #131571) + * Remove patches/srv_spoolss_nt.patch, now included upstream. - -- Steve Langasek <vorlon@debian.org> Sat, 13 Jul 2002 12:54:25 -0500 + -- Steve Langasek <vorlon@debian.org> Fri, 23 Aug 2002 17:20:08 -0500 -samba (2.2.5-2) unstable; urgency=low +samba (2.2.3a-8) stable; urgency=low - * No longer ship make_printerdef, which is deprecated. (closes: #63059) - * Clean up some empty directories from the samba package. - * Add call to dh_installinit for winbind rc.x symlinks (closes: #151860). - * Clean up per-package documentation lists, to reduce clutter - (closes: #147638). - * Make sure we don't ship pdbedit's man page since we are still using - smbpasswd passwords. (closes: #152208) - * move libnss_wins.so to libnss_wins.so.2, where glibc expects to find - it (closes: #148586). + * maintainer script fixes backported from sid. * reorder postinst, so that installing samba-common from scratch loads the debconf answers properly (closes: #151985). - * add lintian overrides for winbind, to eliminate some noise. - * rename pam_smbpass changelog to comply with policy. - - -- Steve Langasek <vorlon@debian.org> Sun, 23 Jun 2002 22:45:04 -0500 - -samba (2.2.5-1) unstable; urgency=low - - * New upstream release. - - -- Eloy A. Paris <peloy@debian.org> Sun, 9 Jun 2002 15:49:21 -0400 - -samba (2.2.4+2.2.5pre1-1) experimental; urgency=low - - * Getting ready for Samba 2.2.5. - * Remove patches/parse_spoolss.patch, now included upstream. - * Fixed thinko WRT POSIX ACL support, which we "half-enabled" in - 2.2.4-1. We don't use POSIX ACL support ourselves, so we'd - appreciate reports from those using this feature so we can - be sure this works. - * Fix the filename-matching algorithm used for smbtar's 'exclude' - functionality. (closes: #131571) * Look for secrets.tdb in /var/lib/samba, and handle in the postinst. This is not really a config file, because users don't edit it. (closes: #147429) - * Doxygen fix for libsmbclient.h, thanks to Tommi Komulainen - <Tommi.Komulainen@iki.fi> for the patch. (closes: #144847) - - -- Eloy A. Paris <peloy@debian.org> Tue, 28 May 2002 11:33:51 -0400 - -samba (2.2.4-1) unstable; urgency=low - - * New upstream release (closes: #144713) - * Building with POSIX ACL support (closes: #137819) - * Include samples, exclude INSTALL from libpam-smbpass (closes: #145055) - * Compile with --with-automount, for NIS homedir support (closes: #123396) - * Add a proper 'flags' field to the mount entry we write to /etc/mtab; - fixes a display bug with mount (closes: #140397) - * Added logic to /etc/init.d/samba so a help message is printed out - when Samba is running from inetd _and_ we are not booting, i.e. the - user called the init script manually. Thanks to Francesco - Potorti <pot@gnu.org> for the suggestion on how to implement this. - (Closes: #139807, #140204) * samba.postinst: added logic so we don't call /etc/init.d/samba if we are running from inetd (this prevents the stupid help message to be printed during package upgrades if we are running from inetd.) - * samba.prerm: idem. - * /etc/init.d/samba: delete stale PID files after nmbd and smbd are - stopped. This prevents start-stop-daemon from printing an ugly - error message when called from '/etc/init.d/samba stop'. I prefer - this than running start-stop-daemon with --oknodo because - start-stop-daemon might print other important error messages that with - --oknodo it would otherwise not print. (Closes: #102187, #109301) - * Patch from jerry@samba.org to fix parsing of spoolss structures. + * Fixed bug in the FHS migration path that causes nmbd to read its + state from one location, but write it out to another. (closes: #154210) - -- Eloy A. Paris <peloy@debian.org> Thu, 23 May 2002 23:16:52 -0400 + -- Steve Langasek <vorlon@debian.org> Sat, 13 Jul 2002 10:18:56 -0500 samba (2.2.3a-7) unstable; urgency=medium @@ -501,7 +62,7 @@ samba (2.2.3a-7) unstable; urgency=medium running before the upgrade starts. * Tweak the wording of debconf templates. * Incorporate debconf translations for French, Spanish and Portuguese; - thanks to Carlos Valdivia Yagüe <valyag@hotpop.com> (es), + thanks to Carlos Valdivia Yagüe <valyag@hotpop.com> (es), Andre Luis Lopes <andrelop@ig.com.br> (pt_BR), and Philippe Batailler and Denis Barbier <barbier@debian.org> (fr). (closes: #142657, #142659, #141551, #141699, #141682) @@ -529,7 +90,7 @@ samba (2.2.3a-6) unstable; urgency=low * Bring our shipped smb.conf closer in line with the upstream defaults: don't twiddle the send/recv buffer sizes, since the Linux kernel already provides a much better default setting - (closes: #80966, #80934, #137415, #133477) + (closes: #80966, #80934, #137415, #133477) * Added libnss_wins.so to the winbind package (closes: #137201) * Updates to README.debian. diff --git a/packaging/Debian/debian/config.cache b/packaging/Debian/debian/config.cache index 8872a27b761..c0a70a5b19b 100644 --- a/packaging/Debian/debian/config.cache +++ b/packaging/Debian/debian/config.cache @@ -46,6 +46,12 @@ samba_cv_have_setresgid=${samba_cv_have_setresgid=yes} samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes} +# POSIX ACL support not present in Linux 2.2; not allowed in the +# Debian packages, even if present on the build machine. + +ac_cv_header_sys_acl_h=${ac_cv_header_sys_acl_h=no} + + # Various basic libc/compiler stuff that it's blindingly obvious that # Linux supports (now watch me get bitten for saying that) @@ -124,6 +130,8 @@ samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes} # to support transparent userland VFS. We might as well preempt # any checks for shadowed symbols that are only useful for smbwrapper. +ac_cv_func___acl=${ac_cv_func___acl=no} +ac_cv_func__acl=${ac_cv_func__acl=no} ac_cv_func___chdir=${ac_cv_func___chdir=no} ac_cv_func__chdir=${ac_cv_func__chdir=no} ac_cv_func___close=${ac_cv_func___close=no} @@ -134,6 +142,8 @@ ac_cv_func___dup=${ac_cv_func___dup=no} ac_cv_func__dup=${ac_cv_func__dup=no} ac_cv_func___dup2=${ac_cv_func___dup2=no} ac_cv_func__dup2=${ac_cv_func__dup2=no} +ac_cv_func___facl=${ac_cv_func___facl=no} +ac_cv_func__facl=${ac_cv_func__facl=no} ac_cv_func___fchdir=${ac_cv_func___fchdir=no} ac_cv_func__fchdir=${ac_cv_func__fchdir=no} ac_cv_func___fcntl=${ac_cv_func___fcntl=no} diff --git a/packaging/Debian/debian/control b/packaging/Debian/debian/control index 7bfb41b79d9..eb80a6f20db 100644 --- a/packaging/Debian/debian/control +++ b/packaging/Debian/debian/control @@ -1,17 +1,17 @@ Source: samba 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 (>= 2.2.11-1), libacl1 (>= 2.2.11-1), libkrb5-dev, libldap2-dev, po-debconf, python2.3-dev -Standards-Version: 3.5.10 +Maintainer: Simo Sorce <idra@samba.org> +Uploaders: Simo Sorce <idra@samba.org> +Build-Depends: debhelper (>=2.0.103), libpam0g-dev, libreadline4-dev, libcupsys2-dev, autoconf +Standards-Version: 3.1.1 Package: samba Architecture: any -Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules +Depends: debconf, samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends} Replaces: samba-common (<= 2.0.5a-2) Suggests: samba-doc -Description: a LanManager-like file and printer server for Unix +Description: A LanManager like file and printer server for Unix. The Samba software suite is a collection of programs that implements the SMB protocol for unix systems, allowing you to serve files and printers to Windows, NT, OS/2 and DOS clients. This protocol @@ -22,17 +22,16 @@ Description: a LanManager-like file and printer server for Unix . Currently, the Samba Debian packages consist of the following: . - samba - LanManager-like file and printer server for Unix. + samba - A LanManager like file and printer server for Unix. samba-common - Samba common files used by both the server and the client. - smbclient - LanManager-like simple client for Unix. + smbclient - A LanManager like simple client for Unix. swat - Samba Web Administration Tool samba-doc - Samba documentation. - smbfs - Mount and umount commands for the smbfs (kernels 2.2.x and above). + smbfs - Mount and umount commands for the smbfs (kernels 2.0.x and above). libpam-smbpass - pluggable authentication module for SMB password database libsmbclient - Shared library that allows applications to talk to SMB servers libsmbclient-dev - libsmbclient shared libraries winbind: Service to resolve user and group information from Windows NT servers - python2.3-samba: Python bindings that allow access to various aspects of Samba . It is possible to install a subset of these packages depending on your particular needs. For example, to access other SMB servers you @@ -41,8 +40,8 @@ Description: a LanManager-like file and printer server for Unix Package: samba-common Architecture: any Depends: debconf, libpam-modules, ${shlibs:Depends} -Replaces: samba (<< 2.999+3.0.alpha21-4) -Description: Samba common files used by both the server and the client +Replaces: samba (<= 2.0.5a-2) +Description: Samba common files used by both the server and the client. The Samba software suite is a collection of programs that implements the SMB protocol for unix systems, allowing you to serve files and printers to Windows, NT, OS/2 and DOS clients. This protocol @@ -55,10 +54,10 @@ Description: Samba common files used by both the server and the client Package: smbclient Architecture: any Depends: samba-common (= ${Source-Version}), ${shlibs:Depends} -Replaces: samba (<< 2.999+3.0.alpha21-4) +Replaces: samba (<= 2.2.2-5) Provides: samba-client Suggests: smbfs -Description: a LanManager-like simple client for Unix +Description: A LanManager like simple client for Unix. The Samba software suite is a collection of programs that implements the SMB protocol for unix systems, allowing you to serve files and printers to Windows, NT, OS/2 and DOS clients. This protocol @@ -71,7 +70,7 @@ Description: a LanManager-like simple client for Unix Package: swat Architecture: any -Depends: debconf, samba (= ${Source-Version}), ${shlibs:Depends} +Depends: samba (= ${Source-Version}), ${shlibs:Depends} Recommends: samba-doc Description: Samba Web Administration Tool The Samba software suite is a collection of programs that @@ -88,7 +87,7 @@ Description: Samba Web Administration Tool Package: samba-doc Section: doc Architecture: all -Description: Samba documentation +Description: Samba documentation. The Samba software suite is a collection of programs that implements the SMB protocol for unix systems, allowing you to serve files and printers to Windows, NT, OS/2 and DOS clients. This protocol @@ -113,7 +112,7 @@ Description: mount and umount commands for the smbfs (for kernels >= than 2.2.x) site into a file server for DOS or Windows clients. . If you want to use command-line utilities like smbclient, smbtar - and/or smbspool you just need to install the smbclient package. + and/or smbspool just need to install the smbclient package. . Starting with the Debian Samba packages version 2.2.0-1, the old smbfs utilities for 2.0.x have been removed. There are no wrapper scripts @@ -139,7 +138,7 @@ Section: libs Priority: extra Architecture: any Depends: ${shlibs:Depends} -Description: shared library that allows applications to talk to SMB servers +Description: Shared library that allows applications to talk to SMB servers libsmbclient allows to write applications that use the SMB protocol. This gives applications the ability to talk to Microsoft Windows servers and Unix servers running Samba. @@ -147,7 +146,7 @@ Description: shared library that allows applications to talk to SMB servers This package contains the libsmbclient shared library. Package: libsmbclient-dev -Section: libdevel +Section: devel Priority: extra Architecture: any Depends: libsmbclient (= ${Source-Version}) @@ -163,9 +162,9 @@ Package: winbind Section: net Priority: optional Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends} Replaces: samba (<= 2.2.3-2) -Description: service to resolve user and group information from Windows NT servers +Description: Service to resolve user and group information from Windows NT servers This package provides the winbindd daemon, which provides a service for the Name Service Switch capability that is present in most modern C libraries (like the GNU C Library - glibc.) @@ -174,15 +173,3 @@ Description: service to resolve user and group information from Windows NT serve can be used to resolve user and group information from a Windows NT server. The service can also provide authentication services via an associated PAM module. - -Package: python2.3-samba -Section: python -Priority: optional -Architecture: any -Depends: ${shlibs:Depends}, python2.3 -Description: Python bindings that allow access to various aspects of Samba - The Samba Python bindings allow you to access various aspects of Samba. - At the moment their status is "experimental" but they have been reported - to work well. - . - See /usr/share/doc/python2.3-samba/examples for a couple of examples. diff --git a/packaging/Debian/debian/gdbcommands b/packaging/Debian/debian/gdbcommands deleted file mode 100644 index 5774b9ae311..00000000000 --- a/packaging/Debian/debian/gdbcommands +++ /dev/null @@ -1,2 +0,0 @@ -bt -quit diff --git a/packaging/Debian/debian/libsmbclient-dev.examples b/packaging/Debian/debian/libsmbclient-dev.examples deleted file mode 100644 index 2094c40b556..00000000000 --- a/packaging/Debian/debian/libsmbclient-dev.examples +++ /dev/null @@ -1 +0,0 @@ -examples/libsmbclient/ diff --git a/packaging/Debian/debian/libsmbclient-dev.files b/packaging/Debian/debian/libsmbclient-dev.files index a52c17cfc56..3ca6033fe7b 100644 --- a/packaging/Debian/debian/libsmbclient-dev.files +++ b/packaging/Debian/debian/libsmbclient-dev.files @@ -1,3 +1,2 @@ usr/lib/libsmbclient.a -usr/lib/libsmbclient.so usr/include/libsmbclient.h diff --git a/packaging/Debian/debian/libsmbclient.postinst b/packaging/Debian/debian/libsmbclient.postinst new file mode 100755 index 00000000000..bd85266cdf9 --- /dev/null +++ b/packaging/Debian/debian/libsmbclient.postinst @@ -0,0 +1,11 @@ +#!/bin/sh +# +# postinst script for libsmbclient +# +# + +if [ "$1" = "configure" ]; then + ldconfig +fi + +#DEBHELPER# diff --git a/packaging/Debian/debian/libsmbclient.shlibs b/packaging/Debian/debian/libsmbclient.shlibs index 9c6eea200a9..74329f2c08d 100644 --- a/packaging/Debian/debian/libsmbclient.shlibs +++ b/packaging/Debian/debian/libsmbclient.shlibs @@ -1 +1 @@ -libsmbclient 0 libsmbclient (>= 2.2.2-11) +libsmbclient 0.1 libsmbclient (>= 2.2.2-11) diff --git a/packaging/Debian/debian/panic-action b/packaging/Debian/debian/panic-action deleted file mode 100644 index 13f773c1ef8..00000000000 --- a/packaging/Debian/debian/panic-action +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -# Redirect all output to our mail command -( - # We must be given a pid to look at - if [ -z "$1" ]; then - echo "$0 called with no arguments." - exit 1 - fi - - if [ ! -d "/proc/$1" ]; then - echo "$0: No such process: $1" - exit 1 - fi - - # Find out what binary we're debugging - BINARYNAME=`readlink "/proc/$1/exe"` - - # Generic header for our email - echo "The Samba 'panic action' script, $0," - echo "was called for pid $1 ($BINARYNAME)." - echo - - if [ -z "$BINARYNAME" ]; then - echo "This means there was a problem with the program, such as a segfault." - echo "However, the executable could not be found for process $1." - echo "It may have died unexpectedly, or you may not have permission to" - echo "debug the process." - exit 1 - fi - - # No debugger - if [ ! -x /usr/bin/gdb ]; then - echo "This means there was a problem with the program, such as a segfault." - echo "However, gdb was not found on your system, so the error could not be" - echo "debugged. Please install the gdb package so that debugging information is" - echo "available the next time such a problem occurs." - exit 1 - fi - - echo "Below is a backtrace for this process generated with gdb, which shows" - echo "the state of the program at the time the error occured. You are" - echo "encouraged to submit this information as a bug report to Debian. For" - echo "information about the procedure for submitting bug reports , please see" - echo "http://www.debian.org/Bugs/Reporting or the reportbug(1) manpage." - echo - gdb -x /etc/samba/gdbcommands -batch "$BINARYNAME" "$1" -) | mail -s "Segfault in Samba" root diff --git a/packaging/Debian/debian/patches/Makefile.in.patch b/packaging/Debian/debian/patches/Makefile.in.patch new file mode 100755 index 00000000000..1c4d67418f8 --- /dev/null +++ b/packaging/Debian/debian/patches/Makefile.in.patch @@ -0,0 +1,17 @@ +--- samba/source/Makefile.in.orig 2002-10-13 01:43:10.000000000 -0400 ++++ samba/source/Makefile.in 2002-10-13 01:43:10.000000000 -0400 +@@ -727,10 +727,10 @@ + @$(SHELL) $(srcdir)/script/installswat.sh $(SWATDIR) $(srcdir) + + installclientlib: +- -$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@ +- -$(INSTALLCLIENTCMD_A) bin/libsmbclient.a +- -$(INSTALLCMD) -d ${prefix}/include +- -$(INSTALLCMD) include/libsmbclient.h ${prefix}/include ++ -$(INSTALLCMD) bin/libsmbclient.@SHLIBEXT@ $(BASEDIR)/lib ++ -$(INSTALLCMD) bin/libsmbclient.a $(BASEDIR)/lib ++ -$(INSTALLCMD) -d $(INCLUDEDIR) ++ -$(INSTALLCMD) include/libsmbclient.h $(INCLUDEDIR) + + # revert to the previously installed version + revert: diff --git a/packaging/Debian/debian/patches/VERSION.patch b/packaging/Debian/debian/patches/VERSION.patch deleted file mode 100644 index 0f5c129c564..00000000000 --- a/packaging/Debian/debian/patches/VERSION.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- samba-3.0.0rc2/source/VERSION.orig 2003-09-02 21:56:11.000000000 -0400 -+++ samba-3.0.0rc2/source/VERSION 2003-09-02 21:56:30.000000000 -0400 -@@ -120,4 +120,4 @@ - # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() # - # -> "CVS 3.0.0rc2-VendorVersion" # - ######################################################## --SAMBA_VERSION_VENDOR_SUFFIX= -+SAMBA_VERSION_VENDOR_SUFFIX="Debian" diff --git a/packaging/Debian/debian/patches/configure.patch b/packaging/Debian/debian/patches/configure.patch new file mode 100755 index 00000000000..17b488c2923 --- /dev/null +++ b/packaging/Debian/debian/patches/configure.patch @@ -0,0 +1,32 @@ +diff -uNr samba-2.2.5pre1.orig/source/configure.in samba-2.2.5pre1/source/configure.in +--- samba-2.2.5pre1.orig/source/configure.in Sat Jun 8 07:55:55 2002 ++++ samba-2.2.5pre1/source/configure.in Wed Jun 12 15:27:28 2002 +@@ -384,6 +384,28 @@ + #endif + } + ], [LINUX_LFS_SUPPORT=yes], [LINUX_LFS_SUPPORT=no], [LINUX_LFS_SUPPORT=cross]) ++ if test x$LINUX_LFS_SUPPORT = xyes ; then ++ AC_TRY_RUN([ ++#include <unistd.h> ++#include <sys/types.h> ++#include <fcntl.h> ++main() { ++ unsigned int *padding; ++ struct flock foo_lock = {F_WRLCK, SEEK_SET, 0, 1, 0}; ++ int fd = open("/dev/null", O_RDWR); ++ ++ /* Yes, we're depending on the internals of the Linux flock structure ++ here -- but this test is explicitly Linux-specific to begin with. */ ++ padding = (unsigned int *)&foo_lock; ++ padding[1] = 0xffffffff; ++ foo_lock.l_start = 0; ++ if (fcntl(fd, F_SETLK, &foo_lock) < 0) ++ exit(1); ++ ++ exit(0); ++} ++], [LINUX_LFS_SUPPORT=yes], [LINUX_LFS_SUPPORT=no], [LINUX_LFS_SUPPORT=cross]) ++ fi + CPPFLAGS="$old_CPPFLAGS" + if test x$LINUX_LFS_SUPPORT = xyes ; then + CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS" diff --git a/packaging/Debian/debian/patches/documentation.patch b/packaging/Debian/debian/patches/documentation.patch deleted file mode 100644 index c5e66232f9c..00000000000 --- a/packaging/Debian/debian/patches/documentation.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- 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 - 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/swat - - .TP - \(bu --/usr/local/samba/swat/images/* -+/usr/share/samba/swat/images/* - - .TP - \(bu --/usr/local/samba/swat/help/* -+/usr/share/samba/swat/help/* - - .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 --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 - \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: -+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 -+\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 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 --\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 652641216b6..173024ef1a1 100644 --- a/packaging/Debian/debian/patches/fhs.patch +++ b/packaging/Debian/debian/patches/fhs.patch @@ -1,215 +1,87 @@ -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 -@@ -67,6 +67,7 @@ - CONFIGDIR = @configdir@ - VARDIR = @localstatedir@ - MANDIR = @mandir@ -+DATADIR = @datadir@ - - # The permissions to give the executables - INSTALLPERMS = 0755 -@@ -90,6 +91,13 @@ - # the directory where lock files go - LOCKDIR = @lockdir@ - -+# FHS directories; equal to LOCKDIR if not using --with-fhs -+CACHEDIR = @cachedir@ -+STATEDIR = @statedir@ -+ -+# Where to look for (and install) codepage databases. -+CODEPAGEDIR = @codepagedir@ -+ - # the directory where pid files go - PIDDIR = @piddir@ - # man pages language(s) -@@ -114,7 +122,7 @@ - PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\" - PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \ - -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\" --PATH_FLAGS6 = $(PATH_FLAGS5) -DCONFIGDIR=\"$(CONFIGDIR)\" -+PATH_FLAGS6 = $(PATH_FLAGS5) -DCONFIGDIR=\"$(CONFIGDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" -DCACHEDIR=\"$(CACHEDIR)\" -DSTATEDIR=\"$(STATEDIR)\" - PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS) - - # Note that all executable programs now provide for an optional executable suffix. -@@ -1203,7 +1211,7 @@ - @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS) - - installdat: installdirs -- @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(LIBDIR) $(srcdir) -+ @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(CODEPAGEDIR) $(srcdir) - - installswat: installdirs - @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir) -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, +diff -uNr samba-2.2.8-orig/source/Makefile.in samba-2.2.8/source/Makefile.in +--- samba-2.2.8-orig/source/Makefile.in Fri Feb 28 16:56:06 2003 ++++ samba-2.2.8/source/Makefile.in Sun Mar 16 00:53:38 2003 +@@ -86,7 +86,7 @@ + FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\" + FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" + FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" +-FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" -DPIDDIR=\"$(PIDDIR)\" -DLIBDIR=\"$(LIBDIR)\" ++FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" -DPIDDIR=\"$(PIDDIR)\" -DLIBDIR=\"$(LIBDIR)\" -DVARDIR=\"$(VARDIR)\" + FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H + FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS) + FLAGS32 = $(ISA32) $(FLAGS5) $(PASSWD_FLAGS) +diff -uNr samba-2.2.8-orig/source/acconfig.h samba-2.2.8/source/acconfig.h +--- samba-2.2.8-orig/source/acconfig.h Fri Feb 28 16:56:06 2003 ++++ samba-2.2.8/source/acconfig.h Sun Mar 16 00:53:38 2003 +@@ -177,6 +177,7 @@ + #undef HAVE_DEVICE_MAJOR_FN + #undef HAVE_DEVICE_MINOR_FN + #undef HAVE_MAKEDEV_FN ++#undef FHS_COMPATIBLE + #undef HAVE_GETGROUPS_TOO_MANY_EGIDS + #undef HAVE_PASSWD_PW_COMMENT + #undef HAVE_PASSWD_PW_AGE +diff -uNr samba-2.2.8-orig/source/configure.in samba-2.2.8/source/configure.in +--- samba-2.2.8-orig/source/configure.in Fri Feb 28 16:56:18 2003 ++++ samba-2.2.8/source/configure.in Sun Mar 16 00:53:38 2003 +@@ -12,11 +12,12 @@ [ --with-fhs Use FHS-compliant paths (default=no)], + codepagedir="\$(DATADIR)/samba/codepages" configdir="${sysconfdir}/samba" - lockdir="\${VARDIR}/cache/samba" + lockdir="\${VARDIR}/run/samba" - piddir="\${VARDIR}/run/samba" + piddir="\$(VARDIR)/run/samba" logfilebase="\${VARDIR}/log/samba" privatedir="\${CONFIGDIR}/private" - libdir="\${prefix}/lib/samba" - swatdir="\${DATADIR}/samba/swat", + swatdir="\${DATADIR}/samba/swat" -+ codepagedir="\${DATADIR}/samba" -+ statedir="\${VARDIR}/lib/samba" -+ cachedir="\${VARDIR}/cache/samba" -+ AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths]), - configdir="\${LIBDIR}" - logfilebase="\${VARDIR}" - lockdir="\${VARDIR}/locks" - piddir="\${VARDIR}/locks" - privatedir="\${prefix}/private" -- swatdir="\${prefix}/swat") -+ codepagedir="\${LIBDIR}" -+ swatdir="\${prefix}/swat" -+ statedir="\${LOCKDIR}" -+ cachedir="\${LOCKDIR}") - - ################################################# - # set private directory location -@@ -134,6 +141,9 @@ - AC_SUBST(swatdir) - AC_SUBST(bindir) - AC_SUBST(sbindir) -+AC_SUBST(codepagedir) -+AC_SUBST(statedir) -+AC_SUBST(cachedir) - - dnl Unique-to-Samba variables we'll be playing with. - AC_SUBST(SHELL) -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; - - /** -+ * @brief Samba data directory. -+ * -+ * @sa data_path() to get the path to a file inside the CODEPAGEDIR. -+ **/ -+pstring dyn_CODEPAGEDIR = CODEPAGEDIR; ++ AC_DEFINE(FHS_COMPATIBLE), + codepagedir="\$(LIBDIR)/codepages" + configdir="\$(LIBDIR)" + logfilebase="\$(VARDIR)" +diff -uNr samba-2.2.8-orig/source/include/config.h.in samba-2.2.8/source/include/config.h.in +--- samba-2.2.8-orig/source/include/config.h.in Fri Feb 28 16:56:18 2003 ++++ samba-2.2.8/source/include/config.h.in Sun Mar 16 00:53:38 2003 +@@ -243,6 +243,7 @@ + #undef HAVE_DEVICE_MAJOR_FN + #undef HAVE_DEVICE_MINOR_FN + #undef HAVE_MAKEDEV_FN ++#undef FHS_COMPATIBLE + #undef HAVE_GETGROUPS_TOO_MANY_EGIDS + #undef HAVE_PASSWD_PW_COMMENT + #undef HAVE_PASSWD_PW_AGE +diff -uNr samba-2.2.8-orig/source/include/local.h samba-2.2.8/source/include/local.h +--- samba-2.2.8-orig/source/include/local.h Fri Feb 28 16:56:18 2003 ++++ samba-2.2.8/source/include/local.h Sun Mar 16 00:56:25 2003 +@@ -196,4 +196,21 @@ + + /* Max number of simultaneous winbindd socket connections. */ + #define WINBINDD_MAX_SIMULTANEOUS_CLIENTS 200 + -+/** - * @brief Samba library directory. - * - * @sa lib_path() to get the path to a file inside the LIBDIR. -@@ -70,3 +77,27 @@ - - const pstring dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE; - const pstring dyn_PRIVATE_DIR = PRIVATE_DIR; -+ -+ -+/* In non-FHS mode, these should be configurable using 'lock dir ='; -+ but in FHS mode, they are their own directory. Implement as wrapper -+ functions so that everything can still be kept in dynconfig.c. -+ */ -+ -+char *dyn_STATEDIR(void) -+{ ++/* FHS-compatible directory defines */ +#ifdef FHS_COMPATIBLE -+ return STATEDIR; -+#else -+ return lp_lockdir(); ++#ifndef CACHEDIR ++#define CACHEDIR VARDIR "/cache/samba" ++#endif ++#ifndef STATEDIR ++#define STATEDIR VARDIR "/lib/samba" +#endif -+} + -+char *dyn_CACHEDIR(void) -+{ -+#ifdef FHS_COMPATIBLE -+ return CACHEDIR; +#else -+ return lp_lockdir(); ++ ++#define CACHEDIR lp_lockdir() ++#define STATEDIR lp_lockdir() ++ +#endif -+} -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; -- tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); -+ tdb = tdb_open_log(state_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); - if (!tdb) { - DEBUG(0,("Failed to open group mapping database\n")); - return False; -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; - extern pstring dyn_LIBDIR; -+extern pstring dyn_CODEPAGEDIR; - extern const fstring dyn_SHLIBEXT; - extern const pstring dyn_LOCKDIR; - extern const pstring dyn_PIDDIR; - extern const pstring dyn_SMB_PASSWD_FILE; - extern const pstring dyn_PRIVATE_DIR; + -+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; - -- asprintf(&msg_path, "%s.msg", lib_path((const char *)lang)); -+ asprintf(&msg_path, "%s.msg", data_path((const char *)lang)); - if (stat(msg_path, &st) != 0) { - /* the msg file isn't available */ - free(msg_path); -@@ -131,7 +131,7 @@ - } - - -- asprintf(&path, "%s%s.tdb", lock_path("lang_"), lang); -+ asprintf(&path, "%s%s.tdb", state_path("lang_"), lang); - - tdb = tdb_open_log(path, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0644); - if (!tdb) { -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()) - return True; -- tdb = tdb_open_log(lock_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); -+ tdb = tdb_open_log(state_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); - if (!tdb) { - DEBUG(0,("Failed to open account policy database\n")); - return False; -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 -@@ -2190,6 +2190,61 @@ + #endif +diff -uNr samba-2.2.8-orig/source/lib/util.c samba-2.2.8/source/lib/util.c +--- samba-2.2.8-orig/source/lib/util.c Fri Mar 14 22:34:47 2003 ++++ samba-2.2.8/source/lib/util.c Sun Mar 16 00:53:38 2003 +@@ -1872,6 +1872,46 @@ + return fname; } - /** -+ * @brief Returns an absolute path to a file in the Samba data directory. -+ * -+ * @param name File to find, relative to CODEPAGEDIR. -+ * -+ * @retval Pointer to a static #pstring containing the full path. -+ **/ -+ -+char *data_path(const char *name) -+{ -+ static pstring fname; -+ snprintf(fname, sizeof(fname), "%s/%s", dyn_CODEPAGEDIR, name); -+ return fname; -+} -+ +/***************************************************************** +a useful function for returning a path in the Samba state directory + *****************************************************************/ @@ -217,7 +89,7 @@ diff -uNr samba-3.0.0beta2.orig/source/lib/util.c samba-3.0.0beta2/source/lib/ut +{ + static pstring fname; + -+ pstrcpy(fname,dyn_STATEDIR()); ++ pstrcpy(fname,STATEDIR); + trim_string(fname,"","/"); + + if (!directory_exist(fname,NULL)) { @@ -237,11 +109,11 @@ diff -uNr samba-3.0.0beta2.orig/source/lib/util.c samba-3.0.0beta2/source/lib/ut +{ + static pstring fname; + -+ pstrcpy(fname,dyn_CACHEDIR()); ++ pstrcpy(fname,CACHEDIR); + trim_string(fname,"","/"); + + if (!directory_exist(fname,NULL)) { -+ mkdir(fname,0755); ++ mkdir(fname,0755); + } + + pstrcat(fname,"/"); @@ -250,113 +122,69 @@ diff -uNr samba-3.0.0beta2.orig/source/lib/util.c samba-3.0.0beta2/source/lib/ut + return fname; +} + -+/** - * @brief Returns the platform specific shared library extension. - * - * @retval Pointer to a static #fstring containing the extension. -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; - -- upcase_table = map_file(lib_path("upcase.dat"), 0x20000); -- lowcase_table = map_file(lib_path("lowcase.dat"), 0x20000); -+ upcase_table = map_file(data_path("upcase.dat"), 0x20000); -+ lowcase_table = map_file(data_path("lowcase.dat"), 0x20000); - - /* we would like Samba to limp along even if these tables are - not available */ -@@ -161,7 +161,7 @@ - return; - } - -- valid_file = map_file(lib_path("valid.dat"), 0x10000); -+ valid_file = map_file(data_path("valid.dat"), 0x10000); - if (valid_file) { - valid_table = valid_file; - mapped_file = 1; -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 (!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); - } - -@@ -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")); ---- samba_3_0/source/nmbd/nmbd_serverlistdb.c.orig 2003-09-08 10:53:13.000000000 -0400 -+++ samba_3_0/source/nmbd/nmbd_serverlistdb.c 2003-09-08 11:22:03.000000000 -0400 -@@ -327,7 +327,7 @@ - - updatecount++; + /******************************************************************* + Given a filename - get its directory name + NB: Returned in static storage. Caveats: +diff -uNr samba-2.2.8-orig/source/nmbd/nmbd_serverlistdb.c samba-2.2.8/source/nmbd/nmbd_serverlistdb.c +--- samba-2.2.8-orig/source/nmbd/nmbd_serverlistdb.c Fri Feb 1 23:13:43 2002 ++++ samba-2.2.8/source/nmbd/nmbd_serverlistdb.c Sun Mar 16 00:53:38 2003 +@@ -348,7 +348,7 @@ + + updatecount++; -- pstrcpy(fname,lp_lockdir()); -+ pstrcpy(fname,dyn_CACHEDIR()); - trim_char(fname,'\0' ,'/'); - pstrcat(fname,"/"); - pstrcat(fname,SERVER_LIST); ---- samba-3.0.0rc2/source/nmbd/nmbd_winsserver.c.orig 2003-08-28 17:42:44.000000000 -0400 -+++ samba-3.0.0rc2/source/nmbd/nmbd_winsserver.c 2003-08-31 08:09:11.000000000 -0400 -@@ -228,7 +228,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) )); - return True; -@@ -1759,7 +1759,7 @@ - } +- pstrcpy(fname,lp_lockdir()); ++ pstrcpy(fname,CACHEDIR); + trim_string(fname,NULL,"/"); + pstrcat(fname,"/"); + pstrcat(fname,SERVER_LIST); +diff -uNr samba-2.2.8-orig/source/nmbd/nmbd_winsserver.c samba-2.2.8/source/nmbd/nmbd_winsserver.c +--- samba-2.2.8-orig/source/nmbd/nmbd_winsserver.c Fri Mar 14 22:34:48 2003 ++++ samba-2.2.8/source/nmbd/nmbd_winsserver.c Sun Mar 16 00:53:38 2003 +@@ -178,7 +178,7 @@ + + add_samba_names_to_subnet(wins_server_subnet); + +- if((fp = sys_fopen(lock_path(WINS_LIST),"r")) == NULL) ++ if((fp = sys_fopen(state_path(WINS_LIST),"r")) == NULL) + { + DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n", + WINS_LIST, strerror(errno) )); +diff -uNr samba-2.2.8-orig/source/nsswitch/winbindd_cache.c samba-2.2.8/source/nsswitch/winbindd_cache.c +--- samba-2.2.8-orig/source/nsswitch/winbindd_cache.c Tue Dec 10 15:58:15 2002 ++++ samba-2.2.8/source/nsswitch/winbindd_cache.c Sun Mar 16 00:53:38 2003 +@@ -50,7 +50,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; + 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); + TDB_DEFAULT, O_RDWR | O_CREAT | O_TRUNC, 0600); if (!wcache->tdb) { -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 -@@ -813,7 +813,7 @@ - SMB_STRUCT_STAT stbuf; - TDB_CONTEXT *idmap_tdb; +diff -uNr samba-2.2.8-orig/source/nsswitch/winbindd_idmap.c samba-2.2.8/source/nsswitch/winbindd_idmap.c +--- samba-2.2.8-orig/source/nsswitch/winbindd_idmap.c Tue Apr 30 15:27:26 2002 ++++ samba-2.2.8/source/nsswitch/winbindd_idmap.c Sun Mar 16 00:53:38 2003 +@@ -427,14 +427,14 @@ + { + /* Open tdb cache */ -- pstrcpy(idmap_name, lock_path("winbindd_idmap.tdb")); -+ pstrcpy(idmap_name, state_path("winbindd_idmap.tdb")); +- if (!(idmap_tdb = tdb_open_log(lock_path("winbindd_idmap.tdb"), 0, ++ if (!(idmap_tdb = tdb_open_log(state_path("winbindd_idmap.tdb"), 0, + TDB_DEFAULT, O_RDWR | O_CREAT, 0600))) { + DEBUG(0, ("winbindd_idmap_init: Unable to open idmap database\n")); + return False; + } - 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 @@ + /* possibly convert from an earlier version */ +- if (!idmap_convert(lock_path("winbindd_idmap.tdb"))) { ++ if (!idmap_convert(state_path("winbindd_idmap.tdb"))) { + DEBUG(0, ("winbindd_idmap_init: Unable to open idmap database\n")); + return False; + } +diff -uNr samba-2.2.8-orig/source/param/loadparm.c samba-2.2.8/source/param/loadparm.c +--- samba-2.2.8-orig/source/param/loadparm.c Fri Mar 14 22:34:48 2003 ++++ samba-2.2.8/source/param/loadparm.c Sun Mar 16 00:53:38 2003 +@@ -107,6 +107,9 @@ char *szAddPrinterCommand; char *szDeletePrinterCommand; char *szOs2DriverMap; @@ -366,67 +194,41 @@ diff -uNr samba-3.0.0beta2.orig/source/param/loadparm.c samba-3.0.0beta2/source/ char *szLockDir; char *szPidDir; char *szRootdir; -@@ -1083,8 +1083,13 @@ - {"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE}, - {"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, - {"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, +@@ -1046,8 +1049,13 @@ + {"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE}, + {"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING}, + {"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING}, +#ifdef FHS_COMPATIBLE -+ {"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0}, -+ {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0}, ++ {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0}, ++ {"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0}, +#else - {"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED}, - {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE}, + {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0}, + {"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0}, +#endif - {"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED}, + {"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0}, #ifdef WITH_UTMP - {"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED}, -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 -@@ -501,10 +501,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 @@ + {"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0}, +diff -uNr samba-2.2.8-orig/source/passdb/secrets.c samba-2.2.8/source/passdb/secrets.c +--- samba-2.2.8-orig/source/passdb/secrets.c Fri Mar 14 22:34:48 2003 ++++ samba-2.2.8/source/passdb/secrets.c Sun Mar 16 00:57:57 2003 +@@ -34,9 +34,7 @@ if (tdb) return True; -- pstrcpy(fname, lp_private_dir()); +- get_private_directory(fname); +- - pstrcat(fname,"/secrets.tdb"); + pstrcpy(fname, state_path("secrets.tdb")); tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); -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 -@@ -293,28 +293,28 @@ +diff -uNr samba-2.2.8-orig/source/printing/nt_printing.c samba-2.2.8/source/printing/nt_printing.c +--- samba-2.2.8-orig/source/printing/nt_printing.c Fri Mar 14 22:34:48 2003 ++++ samba-2.2.8/source/printing/nt_printing.c Sun Mar 16 00:53:38 2003 +@@ -262,24 +262,24 @@ + if (tdb_drivers && tdb_printers && tdb_forms && local_pid == sys_getpid()) + return True; - if (tdb_drivers) - tdb_close(tdb_drivers); - tdb_drivers = tdb_open_log(lock_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + tdb_drivers = tdb_open_log(state_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); if (!tdb_drivers) { @@ -436,8 +238,6 @@ diff -uNr samba-3.0.0beta2.orig/source/printing/nt_printing.c samba-3.0.0beta2/s return False; } - if (tdb_printers) - tdb_close(tdb_printers); - tdb_printers = tdb_open_log(lock_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + tdb_printers = tdb_open_log(state_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); if (!tdb_printers) { @@ -447,8 +247,6 @@ diff -uNr samba-3.0.0beta2.orig/source/printing/nt_printing.c samba-3.0.0beta2/s return False; } - if (tdb_forms) - tdb_close(tdb_forms); - tdb_forms = tdb_open_log(lock_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + tdb_forms = tdb_open_log(state_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); if (!tdb_forms) { @@ -458,56 +256,26 @@ diff -uNr samba-3.0.0beta2.orig/source/printing/nt_printing.c samba-3.0.0beta2/s return False; } -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; - -- unlink(lock_path("printing.tdb")); -- pstrcpy(printing_path,lock_path("printing")); -+ unlink(cache_path("printing.tdb")); -+ pstrcpy(printing_path,cache_path("printing")); - mkdir(printing_path,0755); +diff -uNr samba-2.2.8-orig/source/printing/printing.c samba-2.2.8/source/printing/printing.c +--- samba-2.2.8-orig/source/printing/printing.c Fri Mar 14 22:34:48 2003 ++++ samba-2.2.8/source/printing/printing.c Sun Mar 16 00:53:38 2003 +@@ -55,10 +55,10 @@ - local_pid = sys_getpid(); -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); + if (tdb && local_pid == sys_getpid()) + return True; +- tdb = tdb_open_log(lock_path("printing.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); ++ tdb = tdb_open_log(cache_path("printing.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + if (!tdb) { + DEBUG(0,("print_backend_init: Failed to open printing backend database %s.\n", +- lock_path("printing.tdb") )); ++ cache_path("printing.tdb") )); + return False; } - -- pstrcpy(printdb_path, lock_path("printing/")); -+ pstrcpy(printdb_path, cache_path("printing/")); - pstrcat(printdb_path, printername); - pstrcat(printdb_path, ".tdb"); - -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 - */ - -- tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600); -+ tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600); - if ( !tdb_reg ) - { -- tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); -+ tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); - if ( !tdb_reg ) { - DEBUG(0,("init_registry: Failed to open registry %s (%s)\n", -- lock_path("registry.tdb"), strerror(errno) )); -+ state_path("registry.tdb"), strerror(errno) )); - return False; - } - -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 @@ + local_pid = sys_getpid(); +diff -uNr samba-2.2.8-orig/source/rpc_server/srv_srvsvc_nt.c samba-2.2.8/source/rpc_server/srv_srvsvc_nt.c +--- samba-2.2.8-orig/source/rpc_server/srv_srvsvc_nt.c Fri Mar 14 22:34:49 2003 ++++ samba-2.2.8/source/rpc_server/srv_srvsvc_nt.c Sun Mar 16 00:53:38 2003 +@@ -127,10 +127,10 @@ if (share_tdb && local_pid == sys_getpid()) return True; @@ -520,51 +288,18 @@ diff -uNr samba-3.0.0beta2.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0.0bet return False; } -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 -@@ -487,7 +487,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 @@ +diff -uNr samba-2.2.8-orig/source/smbd/lanman.c samba-2.2.8/source/smbd/lanman.c +--- samba-2.2.8-orig/source/smbd/lanman.c Fri Mar 14 22:34:49 2003 ++++ samba-2.2.8/source/smbd/lanman.c Sun Mar 16 00:53:38 2003 +@@ -1109,9 +1109,9 @@ BOOL local_list_only; int i; -- lines = file_lines_load(lock_path(SERVER_LIST), NULL); -+ lines = file_lines_load(cache_path(SERVER_LIST), NULL); +- lines = file_lines_load(lock_path(SERVER_LIST), NULL, False); ++ lines = file_lines_load(cache_path(SERVER_LIST), NULL, False); if (!lines) { - DEBUG(4,("Can't open %s - %s\n",lock_path(SERVER_LIST),strerror(errno))); + DEBUG(4,("Can't open %s - %s\n",cache_path(SERVER_LIST),strerror(errno))); return(0); } -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; - -- tdb = tdb_open_log(lock_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600); -+ tdb = tdb_open_log(state_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600); - if (!tdb) { - DEBUG(2,("get_our_last_id: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) )); - return; -@@ -489,7 +489,7 @@ - } - - -- tdb = tdb_open_log(lock_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600); -+ tdb = tdb_open_log(state_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600); - if (!tdb) { - DEBUG(2,("send_entry_request: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) )); - return; diff --git a/packaging/Debian/debian/patches/installswat.sh.patch b/packaging/Debian/debian/patches/installswat.sh.patch deleted file mode 100644 index b425e3bef76..00000000000 --- a/packaging/Debian/debian/patches/installswat.sh.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- samba_3_0/source/script/installswat.sh.orig 2003-08-28 18:03:10.000000000 -0400 -+++ samba_3_0/source/script/installswat.sh 2003-08-28 18:11:14.000000000 -0400 -@@ -9,7 +9,7 @@ - echo Installing the Samba Web Administration Tool - - LANGS=". `cd $SRCDIR../swat/; /bin/echo lang/??`" --echo Installing langs are `cd $SRCDIR../swat/lang/; /bin/echo ??` -+echo Installing the following additional langs: `cd $SRCDIR../swat/lang/; /bin/echo ??` - - for ln in $LANGS; do - SWATLANGDIR=$SWATDIR/$ln -@@ -23,21 +23,17 @@ - fi - fi - done --done -- --# Install images --for ln in $LANGS; do - --for f in $SRCDIR../swat/$ln/images/*.gif; do -+ # Install images -+ for f in $SRCDIR../swat/$ln/images/*.gif; do - FNAME=$SWATDIR/$ln/images/`basename $f` - echo $FNAME - cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges? - chmod 0644 $FNAME --done -- --# Install html help -+ done - --for f in $SRCDIR../swat/$ln/help/*.html; do -+ # Install html help -+ for f in $SRCDIR../swat/$ln/help/*.html; do - FNAME=$SWATDIR/$ln/help/`basename $f` - echo $FNAME - if [ "x$BOOKDIR" = "x" ]; then -@@ -49,26 +45,24 @@ - cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges? - rm -f $f - chmod 0644 $FNAME --done -- --# Install html documentation -- --for f in $SRCDIR../docs/htmldocs/*.html; do -- FNAME=$SWATDIR/help/`basename $f` -- echo $FNAME -- cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges? -- chmod 0644 $FNAME --done -- --# Install "server-side" includes -+ done - --for f in $SRCDIR../swat/$ln/include/*.html; do -+ # Install "server-side" includes -+ for f in $SRCDIR../swat/$ln/include/*.html; do - FNAME=$SWATDIR/$ln/include/`basename $f` - echo $FNAME - cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges? - chmod 0644 $FNAME -+ done -+ - done - -+# Install html documentation -+for f in $SRCDIR../docs/htmldocs/*.html; do -+ FNAME=$SWATDIR/help/`basename $f` -+ echo $FNAME -+ ln -s ../../../doc/samba-doc/htmldocs/`basename $f` $FNAME || echo Cannot install $FNAME. Does $USER have privileges? -+ chmod 0644 $FNAME - done - - # Install Using Samba book (but only if it is there) diff --git a/packaging/Debian/debian/patches/loadparm.patch b/packaging/Debian/debian/patches/loadparm.patch new file mode 100755 index 00000000000..3741f8c1e06 --- /dev/null +++ b/packaging/Debian/debian/patches/loadparm.patch @@ -0,0 +1,78 @@ +--- samba-2.2.5/source/param/loadparm.c.orig Tue Jun 18 23:15:07 2002 ++++ samba-2.2.5/source/param/loadparm.c Tue Jun 18 23:15:07 2002 +@@ -1146,26 +1146,26 @@ + case PRINT_AIX: + case PRINT_LPRNT: + case PRINT_LPROS2: +- string_set(&sDefault.szLpqcommand, "lpq -P%p"); +- string_set(&sDefault.szLprmcommand, "lprm -P%p %j"); ++ string_set(&sDefault.szLpqcommand, "lpq -P'%p'"); ++ string_set(&sDefault.szLprmcommand, "lprm -P'%p' %j"); + string_set(&sDefault.szPrintcommand, +- "lpr -r -P%p %s"); ++ "lpr -r -P'%p' %s"); + break; + + case PRINT_LPRNG: + case PRINT_PLP: +- string_set(&sDefault.szLpqcommand, "lpq -P%p"); +- string_set(&sDefault.szLprmcommand, "lprm -P%p %j"); ++ string_set(&sDefault.szLpqcommand, "lpq -P'%p'"); ++ string_set(&sDefault.szLprmcommand, "lprm -P'%p' %j"); + string_set(&sDefault.szPrintcommand, +- "lpr -r -P%p %s"); ++ "lpr -r -P'%p' %s"); + string_set(&sDefault.szQueuepausecommand, +- "lpc stop %p"); ++ "lpc stop '%p'"); + string_set(&sDefault.szQueueresumecommand, +- "lpc start %p"); ++ "lpc start '%p'"); + string_set(&sDefault.szLppausecommand, +- "lpc hold %p %j"); ++ "lpc hold '%p' %j"); + string_set(&sDefault.szLpresumecommand, +- "lpc release %p %j"); ++ "lpc release '%p' %j"); + break; + + case PRINT_CUPS: +@@ -1181,19 +1181,19 @@ + string_set(&Globals.szPrintcapname, "cups"); + #else + string_set(&sDefault.szLpqcommand, +- "/usr/bin/lpstat -o %p"); ++ "/usr/bin/lpstat -o '%p'"); + string_set(&sDefault.szLprmcommand, +- "/usr/bin/cancel %p-%j"); ++ "/usr/bin/cancel '%p-%j'"); + string_set(&sDefault.szPrintcommand, +- "/usr/bin/lp -d %p %s; rm %s"); ++ "/usr/bin/lp -d '%p' %s; rm %s"); + string_set(&sDefault.szLppausecommand, +- "lp -i %p-%j -H hold"); ++ "lp -i '%p-%j' -H hold"); + string_set(&sDefault.szLpresumecommand, +- "lp -i %p-%j -H resume"); ++ "lp -i '%p-%j' -H resume"); + string_set(&sDefault.szQueuepausecommand, +- "/usr/bin/disable %p"); ++ "/usr/bin/disable '%p'"); + string_set(&sDefault.szQueueresumecommand, +- "/usr/bin/enable %p"); ++ "/usr/bin/enable '%p'"); + string_set(&Globals.szPrintcapname, "lpstat"); + #endif /* HAVE_CUPS */ + break; +@@ -1513,7 +1513,10 @@ + else + StrnCpy(ret, s, len); + +- trim_string(ret, "\"", "\""); ++ if (trim_string(ret, "\"", "\"")) { ++ if (strchr(ret,'"') != NULL) ++ StrnCpy(ret, s, len); ++ } + + standard_sub_basic(ret, len + 100); + return (ret); diff --git a/packaging/Debian/debian/patches/lpq_parse.c.patch b/packaging/Debian/debian/patches/lpq_parse.c.patch new file mode 100755 index 00000000000..5e8d0cc1f0e --- /dev/null +++ b/packaging/Debian/debian/patches/lpq_parse.c.patch @@ -0,0 +1,12 @@ +--- samba/source/printing/lpq_parse.c.orig 2002-07-24 09:22:49.000000000 -0400 ++++ samba/source/printing/lpq_parse.c 2002-10-13 01:43:10.000000000 -0400 +@@ -265,6 +265,9 @@ + buf->status = LPQ_PAUSED; + } + ++ if(strequal(tokarr[LPRNG_RANKTOK],"done")) ++ buf->status = LPQ_PRINTED; ++ + buf->priority = *tokarr[LPRNG_PRIOTOK] -'A'; + + buf->time = LPRng_time(tokarr[LPRNG_TIMETOK]); diff --git a/packaging/Debian/debian/patches/nmbd-signalling.patch b/packaging/Debian/debian/patches/nmbd-signalling.patch deleted file mode 100644 index ca04cce3bfa..00000000000 --- a/packaging/Debian/debian/patches/nmbd-signalling.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -uNr samba-2.999+3.0.alpha21.orig/source/nmbd/nmbd_subnetdb.c samba-2.999+3.0.alpha21/source/nmbd/nmbd_subnetdb.c ---- samba-2.999+3.0.alpha21.orig/source/nmbd/nmbd_subnetdb.c 2002-11-26 20:54:19.000000000 -0600 -+++ samba-2.999+3.0.alpha21/source/nmbd/nmbd_subnetdb.c 2002-12-16 23:34:13.000000000 -0600 -@@ -214,12 +214,16 @@ - extern struct in_addr loopback_ip; - - if(num_interfaces == 0) { -+ void (*old_handler)(int); -+ - DEBUG(0,("create_subnets: No local interfaces !\n")); - DEBUG(0,("create_subnets: Waiting for an interface to appear ...\n")); -+ old_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL ); - while (iface_count() == 0) { - sleep(5); - load_interfaces(); - } -+ CatchSignal( SIGTERM, SIGNAL_CAST old_handler ); - } - - num_interfaces = iface_count(); diff --git a/packaging/Debian/debian/patches/samba.patch b/packaging/Debian/debian/patches/samba.patch index 8707ec517ba..e7dd4d8813e 100644 --- a/packaging/Debian/debian/patches/samba.patch +++ b/packaging/Debian/debian/patches/samba.patch @@ -1,16 +1,15 @@ -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 @@ +--- samba-2.2.4/source/client/smbmount.c.orig Wed May 1 23:13:57 2002 ++++ samba-2.2.4/source/client/smbmount.c Thu May 2 00:20:44 2002 +@@ -716,7 +716,7 @@ *lp = 0; pstrcpy(password,lp+1); got_pass = True; -- memset(strchr_m(opteq+1,'%')+1,'X',strlen(password)); -+ memset(strchr_m(opteq+1,'%')+1,'\0',strlen(password)); +- memset(strchr(opteq+1,'%')+1,'X',strlen(password)); ++ memset(strchr(opteq+1,'%')+1,'\0',strlen(password)); } - if ((lp=strchr_m(username,'/'))) { + if ((lp=strchr(username,'/'))) { *lp = 0; -@@ -775,7 +775,7 @@ +@@ -726,7 +726,7 @@ !strcmp(opts, "password")) { pstrcpy(password,opteq+1); got_pass = True; @@ -19,19 +18,41 @@ diff -uNr samba-3.0.0beta1.orig/source/client/smbmount.c samba-3.0.0beta1/source } else if(!strcmp(opts, "credentials")) { pstrcpy(credentials,opteq+1); } else if(!strcmp(opts, "netbiosname")) { -@@ -889,7 +901,7 @@ +@@ -819,7 +819,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)); +- memset(strchr(getenv("USER"),'%')+1,'X',strlen(password)); ++ memset(strchr(getenv("USER"),'%')+1,'\0',strlen(password)); } - strupper_m(username); + strupper(username); } -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 @@ +--- samba-2.2.4/source/pam_smbpass/pam_smb_passwd.c.orig Wed May 1 23:14:47 2002 ++++ samba-2.2.4/source/pam_smbpass/pam_smb_passwd.c Thu May 2 00:20:44 2002 +@@ -190,6 +190,11 @@ + + } else if (flags & PAM_UPDATE_AUTHTOK) { + ++/* ++ The following has been commented out per Steve Langasek ++ <vorlon@debian.org> instructions. It's about Debian bug ++ #113763. ++*/ + #if 0 + /* We used to return when this flag was set, but that breaks + password synchronization when /other/ tokens are expired. For +--- samba-2.2.2.cvs20020120.orig/source/script/installbin.sh ++++ samba-2.2.2.cvs20020120/source/script/installbin.sh +@@ -11,7 +11,7 @@ + shift + shift + +-for d in $BASEDIR $BINDIR $LIBDIR $VARDIR $BASEDIR/private; do ++for d in $BASEDIR $BINDIR $LIBDIR $VARDIR; do + if [ ! -d $d ]; then + mkdir $d + if [ ! -d $d ]; then +@@ -33,9 +33,11 @@ chmod $INSTALLPERMS $BINDIR/$p2 # this is a special case, mount needs this in a specific location @@ -46,44 +67,45 @@ diff -uNr samba-3.0.0beta1.orig/source/script/installbin.sh samba-3.0.0beta1/sou done -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 -@@ -887,6 +887,9 @@ - file_close_conn(conn); - dptr_closecnum(conn); +--- samba-2.2.2.cvs20020120.orig/source/script/installswat.sh ++++ samba-2.2.2.cvs20020120/source/script/installswat.sh +@@ -48,8 +48,8 @@ + for f in $SRCDIR../docs/htmldocs/*.html; do + FNAME=$SWATDIR/help/`basename $f` + echo $FNAME +- cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges? +- chmod 0644 $FNAME ++ ln -s ../../../doc/samba-doc/htmldocs/`basename $f` $FNAME || echo Cannot install $FNAME. Does $USER have privileges? ++# chmod 0644 $FNAME + done -+ /* make sure we leave the directory available for unmount */ -+ vfs_ChDir(conn, "/"); -+ - /* execute any "postexec = " line */ - if (*lp_postexec(SNUM(conn)) && - change_to_user(conn, vuid)) { -@@ -906,8 +909,5 @@ - smbrun(cmd,NULL); - } + # Install "server-side" includes +@@ -63,7 +63,10 @@ + + # Install Using Samba book + +-if [ "x$BOOKDIR" != "x" ]; then ++# For Debian we do not install anything here, we just create a symlink ++# pointing to /usr/share/doc/samba-doc/htmldocs/using_samba/ in ++# debian/rules (peloy@debian.org) ++if /bin/false; then -- /* 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 @@ + # Create directories + +--- samba-2.2.2.cvs20020120.orig/source/smbwrapper/smbsh.c ++++ samba-2.2.2.cvs20020120/source/smbwrapper/smbsh.c +@@ -39,7 +39,7 @@ int main(int argc, char *argv[]) { char *p, *u; -- const char *libd = dyn_BINDIR; -+ const char *libd = dyn_LIBDIR; +- char *libd = BINDIR; ++ char *libd = "/usr/share/samba"; pstring line, wd; int opt; extern char *optarg; -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 @@ +--- samba-2.2.2.cvs20020120.orig/source/web/diagnose.c ++++ samba-2.2.2.cvs20020120/source/web/diagnose.c +@@ -54,6 +54,7 @@ static struct cli_state cli; extern struct in_addr loopback_ip; @@ -91,3 +113,40 @@ diff -uNr samba-3.0.0beta1.orig/source/web/diagnose.c samba-3.0.0beta1/source/we if (!cli_initialise(&cli)) return False; +--- samba-2.2.2.cvs20020120.orig/source/web/startstop.c ++++ samba-2.2.2.cvs20020120/source/web/startstop.c +@@ -37,7 +37,7 @@ + return; + } + +- slprintf(binfile, sizeof(pstring) - 1, "%s/smbd", SBINDIR); ++ slprintf(binfile, sizeof(pstring) - 1, "%s/smbd", "/usr/sbin"); + + become_daemon(); + +@@ -58,7 +58,7 @@ + return; + } + +- slprintf(binfile, sizeof(pstring) - 1, "%s/nmbd", SBINDIR); ++ slprintf(binfile, sizeof(pstring) - 1, "%s/nmbd", "/usr/sbin"); + + become_daemon(); + +--- samba/source/smbd/service.c.orig 2002-10-12 11:54:24.000000000 -0400 ++++ samba/source/smbd/service.c 2002-10-13 01:43:10.000000000 -0400 +@@ -698,6 +698,14 @@ + smbrun(cmd,NULL); + } + ++ /* 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,"/"); ++ /* ++ + change_to_root_user(); + /* execute any "root postexec = " line */ + if (*lp_rootpostexec(SNUM(conn))) { diff --git a/packaging/Debian/debian/patches/smbadduser.patch b/packaging/Debian/debian/patches/smbadduser.patch new file mode 100755 index 00000000000..9bfb4573012 --- /dev/null +++ b/packaging/Debian/debian/patches/smbadduser.patch @@ -0,0 +1,22 @@ +--- samba-2.2.2.cvs20020120.orig/source/script/smbadduser ++++ samba-2.2.2.cvs20020120/source/script/smbadduser +@@ -2,13 +2,14 @@ + # + # smbadduser - Written by Mike Zakharoff + # ++# Customized for Debian by Eloy A. Paris <peloy@debian.org> ++# + unalias * +-set path = ($path /usr/local/samba/bin) ++# No need to set a path in Debian ++#set path = ($path /usr/local/samba/bin) + +-set smbpasswd = /usr/local/samba/private/smbpasswd +-#set smbpasswd = /etc/samba.d/smbpasswd +-set user_map = /usr/local/samba/lib/users.map +-#set user_map = /etc/samba.d/smbusers ++set smbpasswd = /etc/samba/smbpasswd ++set user_map = /etc/samba/users.map + # + # Set to site specific passwd command + # diff --git a/packaging/Debian/debian/patches/smbclient-pager.patch b/packaging/Debian/debian/patches/smbclient-pager.patch index 3ee85d4118c..d600c1bd9c2 100644 --- a/packaging/Debian/debian/patches/smbclient-pager.patch +++ b/packaging/Debian/debian/patches/smbclient-pager.patch @@ -1,7 +1,6 @@ -diff -uNr samba-2.999+3.0cvs20020906.orig/source/include/local.h samba-2.999+3.0cvs20020906/source/include/local.h ---- samba-2.999+3.0cvs20020906.orig/source/include/local.h 2002-09-04 14:13:06.000000000 -0500 -+++ samba-2.999+3.0cvs20020906/source/include/local.h 2002-09-08 14:19:24.000000000 -0500 -@@ -109,7 +109,7 @@ +--- samba-2.2.2.cvs20020120.orig/source/include/local.h ++++ samba-2.2.2.cvs20020120/source/include/local.h +@@ -105,7 +105,7 @@ /* the default pager to use for the client "more" command. Users can override this with the PAGER environment variable */ #ifndef PAGER diff --git a/packaging/Debian/debian/patches/smbclient-tar.patch.unused b/packaging/Debian/debian/patches/smbclient-tar.patch.unused deleted file mode 100644 index e2a4c3ce2c0..00000000000 --- a/packaging/Debian/debian/patches/smbclient-tar.patch.unused +++ /dev/null @@ -1,43 +0,0 @@ -diff -uNr samba-3.0.0beta2.orig/source/client/client.c samba-3.0.0beta2/source/client/client.c ---- samba-3.0.0beta2.orig/source/client/client.c 2003-07-01 22:36:24.000000000 -0500 -+++ samba-3.0.0beta2/source/client/client.c 2003-07-06 15:17:36.000000000 -0500 -@@ -2773,6 +2773,7 @@ - int opt; - pstring query_host; - BOOL message = False; -+ char* tar_args = NULL; - extern char tar_type; - pstring term_code; - static const char *new_name_resolve_order = NULL; -@@ -2816,7 +2817,7 @@ - max_protocol = interpret_protocol(poptGetOptArg(pc), max_protocol); - break; - case 'T': -- if (!tar_parseargs(argc, argv, poptGetOptArg(pc), optind)) { -+ if (!(tar_args = poptGetOptArg(pc))) { - poptPrintUsage(pc, stderr, 0); - exit(1); - } -@@ -2917,6 +2917,22 @@ - pstrcpy(cmdline_auth_info.password,poptGetArg(pc)); - } - -+ /* The tar command may take a number of string options; pass -+ everything we have left to tar_parseargs(). */ -+ if (tar_args) { -+ const char **argv2 = poptGetArgs(pc); -+ int argc2 = 0; -+ -+ if (argv2) { -+ while (argv2[argc2]) argc2++; -+ } -+ -+ if (!tar_parseargs(argc2, argv2, tar_args, 0)) { -+ poptPrintUsage(pc, stderr, 0); -+ exit(1); -+ } -+ } -+ - init_names(); - - if(new_name_resolve_order) diff --git a/packaging/Debian/debian/patches/smbclient-xfer-speed.patch b/packaging/Debian/debian/patches/smbclient-xfer-speed.patch new file mode 100755 index 00000000000..bbadda33870 --- /dev/null +++ b/packaging/Debian/debian/patches/smbclient-xfer-speed.patch @@ -0,0 +1,17 @@ +--- samba-2.2.2.cvs20020120/source/client/client.c.orig Wed Jan 23 23:32:44 2002 ++++ samba-2.2.2.cvs20020120/source/client/client.c Wed Jan 23 23:33:50 2002 +@@ -91,10 +91,10 @@ + extern file_info def_finfo; + + /* timing globals */ +-int get_total_size = 0; +-int get_total_time_ms = 0; +-int put_total_size = 0; +-int put_total_time_ms = 0; ++SMB_BIG_UINT get_total_size = 0; ++unsigned int get_total_time_ms = 0; ++SMB_BIG_UINT put_total_size = 0; ++unsigned int put_total_time_ms = 0; + + /* totals globals */ + static double dir_total; diff --git a/packaging/Debian/debian/patches/smbmount-nomtab.patch b/packaging/Debian/debian/patches/smbmount-nomtab.patch index 88071481705..e85ceaed32a 100644 --- a/packaging/Debian/debian/patches/smbmount-nomtab.patch +++ b/packaging/Debian/debian/patches/smbmount-nomtab.patch @@ -1,6 +1,5 @@ -diff -uNr samba-3.0alpha22.orig/source/client/smbmnt.c samba-3.0alpha22/source/client/smbmnt.c ---- samba-3.0alpha22.orig/source/client/smbmnt.c 2003-03-15 12:11:39.000000000 -0600 -+++ samba-3.0alpha22/source/client/smbmnt.c 2003-03-15 12:11:49.000000000 -0600 +--- samba-2.2.3a/source/client/smbmnt.c.orig Tue Apr 2 09:58:18 2002 ++++ samba-2.2.3a/source/client/smbmnt.c Tue Apr 2 09:58:24 2002 @@ -28,6 +28,7 @@ static uid_t mount_uid; static gid_t mount_gid; @@ -102,18 +101,17 @@ diff -uNr samba-3.0alpha22.orig/source/client/smbmnt.c samba-3.0alpha22/source/c return 0; } -diff -uNr samba-3.0alpha22.orig/source/client/smbmount.c samba-3.0alpha22/source/client/smbmount.c ---- samba-3.0alpha22.orig/source/client/smbmount.c 2003-03-15 12:04:29.000000000 -0600 -+++ samba-3.0alpha22/source/client/smbmount.c 2003-03-15 12:15:10.000000000 -0600 -@@ -48,6 +48,7 @@ +--- samba/source/client/smbmount.c.orig 2002-10-13 01:34:58.000000000 -0400 ++++ samba/source/client/smbmount.c 2002-10-13 01:34:59.000000000 -0400 +@@ -50,6 +50,7 @@ static int mount_ro; static unsigned mount_fmask; static unsigned mount_dmask; +static BOOL no_mtab = False; - static BOOL use_kerberos; - /* TODO: Add code to detect smbfs version in kernel */ - static BOOL status32_smbfs = False; -@@ -273,6 +274,9 @@ + + static void usage(void); + +@@ -250,6 +251,9 @@ return; } @@ -121,9 +119,9 @@ diff -uNr samba-3.0alpha22.orig/source/client/smbmount.c samba-3.0alpha22/source + return; + if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1) { - DEBUG(0,("%d: Can't get "MOUNTED"~ lock file", sys_getpid())); + DEBUG(0,("%d: Can't get "MOUNTED"~ lock file", getpid())); return; -@@ -466,6 +470,9 @@ +@@ -444,6 +448,9 @@ args[i++] = "-s"; args[i++] = svc2; @@ -133,7 +131,7 @@ diff -uNr samba-3.0alpha22.orig/source/client/smbmount.c samba-3.0alpha22/source if (mount_ro) { args[i++] = "-r"; } -@@ -661,7 +668,7 @@ +@@ -626,7 +633,7 @@ ****************************************************************************/ static void usage(void) { @@ -142,7 +140,7 @@ diff -uNr samba-3.0alpha22.orig/source/client/smbmount.c samba-3.0alpha22/source printf("Version %s\n\n",VERSION); -@@ -739,8 +746,13 @@ +@@ -691,8 +698,13 @@ argc -= 2; argv += 2; diff --git a/packaging/Debian/debian/patches/smbstatus-locking.patch b/packaging/Debian/debian/patches/smbstatus-locking.patch deleted file mode 100644 index d37896a3699..00000000000 --- a/packaging/Debian/debian/patches/smbstatus-locking.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -uNr samba-2.999+3.0.alpha21.orig/source/utils/status.c samba-2.999+3.0.alpha21/source/utils/status.c ---- samba-2.999+3.0.alpha21.orig/source/utils/status.c 2002-11-26 20:54:22.000000000 -0600 -+++ samba-2.999+3.0.alpha21/source/utils/status.c 2002-12-16 23:37:14.000000000 -0600 -@@ -630,6 +630,16 @@ - if (!shares_only) { - int ret; - -+ tdb = tdb_open_log(lock_path("locking.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0); -+ -+ if (!tdb) { -+ d_printf("%s not initialised\n", lock_path("locking.tdb")); -+ d_printf("This is normal if an SMB client has never connected to your server.\n"); -+ exit(0); -+ } else { -+ tdb_close(tdb); -+ } -+ - if (!locking_init(1)) { - d_printf("Can't initialise locking module - exiting\n"); - exit(1); diff --git a/packaging/Debian/debian/patches/smbtar-exclude.patch b/packaging/Debian/debian/patches/smbtar-exclude.patch new file mode 100755 index 00000000000..a5cacc82824 --- /dev/null +++ b/packaging/Debian/debian/patches/smbtar-exclude.patch @@ -0,0 +1,12 @@ +diff -uNr samba-2.2.4.orig/source/client/clitar.c samba-2.2.4/source/client/clitar.c +--- samba-2.2.4.orig/source/client/clitar.c Thu May 2 20:02:58 2002 ++++ samba-2.2.4/source/client/clitar.c Sat Jun 1 00:25:28 2002 +@@ -515,7 +515,7 @@ + if (!*s2 && (*s1 == '/' || *s1 == '\\') && !*(s1+1)) return 0; + + /* check for s1 is an "initial" string of s2 */ +- if (*s2 == '/' || *s2 == '\\') return 0; ++ if ((*s2 == '/' || *s2 == '\\') && !*s1) return 0; + + return *s1-*s2; + } diff --git a/packaging/Debian/debian/po/POTFILES.in b/packaging/Debian/debian/po/POTFILES.in deleted file mode 100644 index 95a7ea81506..00000000000 --- a/packaging/Debian/debian/po/POTFILES.in +++ /dev/null @@ -1,3 +0,0 @@ -[type: gettext/rfc822deb] samba-common.templates -[type: gettext/rfc822deb] samba.templates -[type: gettext/rfc822deb] swat.templates diff --git a/packaging/Debian/debian/po/es.po b/packaging/Debian/debian/po/es.po deleted file mode 100644 index 0d1d1a770de..00000000000 --- a/packaging/Debian/debian/po/es.po +++ /dev/null @@ -1,298 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: Samba for Debian 3.0.0beta2-1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-08-30 19:08-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" - -#. Description -#: ../samba-common.templates:3 -msgid "Character Set for Unix filesystem" -msgstr "Juego de caracteres para el sistema de ficheros Unix" - -# -#. Description -#: ../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 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 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 -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:13 -msgid "Character Set for DOS clients" -msgstr "Juego de caracteres para los clientes DOS" - -#. Description -#: ../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 " -"the character set you wish to use for this new option. In most cases, the " -"default chosen for you will be sufficient. Note that this option is not " -"needed to support Windows clients, it is only for DOS clients. If you leave " -"this option blank, your smb.conf will not be changed." -msgstr "" -"Actualmente hay una opción de \"client code page\" en smb.conf. En Samba " -"3.0 esta opción ha sido reemplazado por la opción \"dos charset\". Por " -"favor, indique el juego de caracteres que desea usar para esta opción " -"nueva. Esta opción no se necesita en absoluto para clientes Windows; es " -"exclusivamente para los clientes DOS. Si deja en blanco este campo, no se " -"cambiará smb.conf." - -#. Description -#: ../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: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 " -"(\"NetBIOS name servers\") present on the network. This requires a change " -"to your smb.conf file so that DHCP-provided WINS settings will automatically " -"be read from /etc/samba/dhcp.conf." -msgstr "" -"Si su sistema recibe la dirección IP desde un servidor DHCP en la red, el " -"servidor DHCP también puede proveerle informaciones sobre los servidores de " -"WINS que haya en la red. Esto requiere un cambio en el fichero smb.conf " -"para que la configuración de WINS proveniente de DHCP se lea automaticamente " -"de /etc/samba/dhcp.conf." - -#. Description -#: ../samba-common.templates:24 -msgid "" -"You must have the dhcp3-client package installed to take advantage of this " -"feature." -msgstr "" -"Hay que instalar el paquete dhcp3-client para aprovechar esta funcionalidad." - -#. Description -#: ../samba-common.templates:37 -msgid "Configure smb.conf through debconf?" -msgstr "¿Configurar smb.conf mediante debconf?" - -#. Description -#: ../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 " -"Samba programs (nmbd and smbd.) Your current smb.conf contains an 'include' " -"line or an option that spans multiple lines, which could confuse debconf and " -"require you to edit your smb.conf by hand to get it working again." -msgstr "" -"El resto de la configuración de Samba trata sobre cuestiones que afectan al " -"contenido de /etc/samba/smb.conf, que es el fichero utilizado para " -"configurar los programas de Samba (nmbd y smbd). Su smb.conf actual contiene " -"una lÃnea 'include' o una opción que atraviesa más de una lÃnea, asà que " -"debconf puede dejarlo con un smb.conf descompuesto, requiriendo que lo " -"arregle a mano." - -#. Description -#: ../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 " -"periodic configuration enhancements. Therefore, use of debconf is " -"recommended if possible." -msgstr "" -"Si no usa debconf para configurar smb.conf, tendrá que cuidar a mano " -"cualquier cambio a la configuración de Samba y no disfrutará de aumentos " -"periódicos de configuración. Por eso se recomienda el uso de debconf cuando " -"sea posible." - -#. Description -#: ../samba-common.templates:52 -msgid "Workgroup/Domain Name?" -msgstr "Nombre del dominio o del grupo de trabajo" - -#. Description -#: ../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 " -"the security=domain setting." -msgstr "" -"Es el grupo de trabajo en el que aparecerá su servidor cuando se lo " -"pregunten los clientes de la red. Este parámetro también controla el nombre " -"de dominio que se usa con la configuración security=domain." - -#. Description -#: ../samba-common.templates:60 -msgid "Use password encryption?" -msgstr "¿Utilizar contraseñas cifradas?" - -#. Description -#: ../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 " -"parameter in your Windows registry. It is recommended that you use encrypted " -"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file " -"and that you set passwords in there for each user using the smbpasswd " -"command." -msgstr "" -"Los clientes Windows más modernos se comunican con los servidores SMB " -"utilizando contraseñas cifradas. Si quiere usar contraseñas en texto plano, " -"tendrá que cambiar un parámetro en el registro de Windows. Es muy " -"recomendable usar cifrado en las contraseñas. Si elige hacerlo, compruebe " -"que tiene un fichero /etc/samba/smbpasswd válido y que ha puesto las " -"contraseñas con el programa smbpasswd." - -#. Description -#: ../samba.templates:4 -msgid "Create samba password database, /var/lib/samba/passdb.tdb?" -msgstr "¿Crear el base de dados de contraseñas /var/lib/samba/passdb.tdb?" - -#. Description -#: ../samba.templates:4 -msgid "" -"To be compatible with the defaults in most versions of Windows, Samba must " -"be configured to use encrypted passwords. This requires user passwords to " -"be stored in a file separate from /etc/passwd. This file can be created " -"automatically, but the passwords must be added manually (by you or the user) " -"by running smbpasswd, and you must arrange to keep it up-to-date in the " -"future. If you do not create it, you will have to reconfigure samba (and " -"probably your client machines) to use plaintext passwords. See /usr/share/" -"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more " -"details." -msgstr "" -"Para manterner la compatibilidad con el comportamiento por defecto de la " -"mayoria de los sistemas Windows, hay que configurar Samba para que use " -"contraseñas cifradas, lo cual requiere la creación de un fichero, distinto " -"del /etc/passwd, donde se guarden las contraseñas de los usuarios. El " -"fichero se puede crear automaticamente, aunque es necesario añadir las " -"contraseñas manualmente (por usted o por el usuario) mediante el programa " -"'smbpasswd', y debe encargarse de mantener las contraseñas al dÃa. Si no " -"crea este fichero, es imprescindible configurar Samba (y posiblemente los " -"sistemas Windows) para que use contraseñas no cifradas. Véa /usr/share/doc/" -"samba-doc/htmldocs/ENCRYPTION.html del paquete samba-doc para más " -"información." - -#. Description -#: ../samba.templates:17 -msgid "Samba's log files have moved." -msgstr "Se han cambiado de lugar los ficheros de registro de Samba." - -#. Description -#: ../samba.templates:17 -msgid "" -"Starting with the first packages of Samba 2.2 for Debian the log files for " -"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The " -"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively." -msgstr "" -"A partir de los primeros paquetes Debian de Samba 2.2, los ficheros de " -"registro de los dos demonios del Samba (nmbd y smbd) se encuentran en /var/" -"log/samba/. Los nombres de estos ficheros son log.nmbd y log.smbd, para " -"nmbd y smbd respectivamente." - -#. Description -#: ../samba.templates:17 -msgid "" -"The old log files that were in /var/log/ will be moved to the new location " -"for you." -msgstr "" -"Los ficheros de registro antiguos que habÃa en /var/log se moverán " -"automáticamente a su nueva ubicación." - -#. Description -#: ../samba.templates:28 -msgid "Running nmbd from inetd is no longer supported" -msgstr "Ya no se puede ejecutar nmbd desde el inetd" - -#. Description -#: ../samba.templates:28 -msgid "" -"Your system was previously configured to start nmbd and smbd from inetd. As " -"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd. " -"If you have modified your /etc/init.d/samba startup script, you may need to " -"adjust it by hand now so that nmbd will start." -msgstr "" -"Su sistema estaba configurado anteriormente para ejectuar nmbd y smbd desde " -"inetd. A partir de la version 2.999+3.0.alpha20-4, nmbd ya no se ejecuta " -"desde inetd. Si ha modificado el script de arranque /etc/init.d/samba, " -"puede que tenga que editarlo ahora para que nmbd se ejecute." - -#. Choices -#: ../samba.templates:36 -msgid "daemons, inetd" -msgstr "demonios, inetd" - -#. Description -#: ../samba.templates:38 -msgid "How do you want to run Samba?" -msgstr "¿Cómo quiere que se ejecute Samba?" - -#. Description -#: ../samba.templates:38 -msgid "" -"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a " -"daemon is the recommended approach." -msgstr "" -"El servicio Samba smbd puede ejecutarse como demonio normal o desde el " -"inetd. Se recomienda que se ejecute como demonio independiente." - -#. Description -#: ../samba.templates:45 -msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?" -msgstr "" -"¿Convertir el fichero /etc/samba/smbpasswd en /var/lib/samba/passdb.tdb?" - -#. Description -#: ../samba.templates:45 -#, fuzzy -msgid "" -"Samba 3.0 introduces a newer, more complete SAM database interface which " -"supersedes the /etc/samba/smbpasswd file. Would you like your existing " -"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you? If you " -"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' " -"here." -msgstr "" -"La versión 3.0 de Samba introduce un nuevo base de dados \"SAM\" más " -"completo que suplanta al fichero /etc/samba/smbpasswd. ¿Quiere que el " -"fichero corriente smbpasswd sea convertido en /var/lib/samba/passdb.tdb? Si " -"pretende usar otro " - -#. Description -#: ../swat.templates:3 -msgid "Your smb.conf will be re-written!" -msgstr "¡Se sobrescribirá su configuración smb.conf!" - -#. Description -#: ../swat.templates:3 -msgid "" -"SWAT will rewrite your smb.conf file. It will rearrange the entries and " -"delete all comments, include= and copy= options. If you have a carefully " -"crafted smb.conf then back it up or don't use SWAT!" -msgstr "" diff --git a/packaging/Debian/debian/po/fr.po b/packaging/Debian/debian/po/fr.po deleted file mode 100644 index 6be14c19b43..00000000000 --- a/packaging/Debian/debian/po/fr.po +++ /dev/null @@ -1,301 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: Samba for Debian 3.0.0beta2-1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-08-30 19:08-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" - -#. Description -#: ../samba-common.templates:3 -msgid "Character Set for Unix filesystem" -msgstr "Jeu de caractères pour les systèmes de fichiers Unix" - -#. Description -#: ../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 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 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 -msgid "If you leave this option blank, your smb.conf will not be changed." -msgstr "" -"Le fichier smb.conf ne sera pas modifié si vous laissez cette option sans " -"réponse." - -#. Description -#: ../samba-common.templates:13 -msgid "Character Set for DOS clients" -msgstr "Jeu de caractères pour les clients DOS" - -#. Description -#: ../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 " -"the character set you wish to use for this new option. In most cases, the " -"default chosen for you will be sufficient. Note that this option is not " -"needed to support Windows clients, it is only for DOS clients. If you leave " -"this option blank, your smb.conf will not be changed." -msgstr "" -"Votre fichier smb.conf contient une option « client code page » (page de " -"codes du client). Avec Samba 3.0, cette option a été remplacée par l'option " -"« dos charset » (jeu de caractères DOS). Veuillez indiquer le jeu de " -"caractères que vous voulez utiliser avec la nouvelle option. En général le " -"jeu de caractères choisi par défaut est suffisant. Veuillez noter que cette " -"option ne sert pas pour les clients Windows mais seulement pour les clients " -"DOS. Le fichier smb.conf ne sera pas modifié si vous laissez cette option " -"sans réponse. " - -#. Description -#: ../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: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 " -"(\"NetBIOS name servers\") present on the network. This requires a change " -"to your smb.conf file so that DHCP-provided WINS settings will automatically " -"be read from /etc/samba/dhcp.conf." -msgstr "" -"Si votre ordinateur obtient ses paramètres IP à partir d'un serveur DHCP du " -"réseau, ce serveur peut aussi fournir des informations sur les serveurs WINS " -"(serveurs de noms NetBIOS) présents sur le réseau. Une modification du " -"fichier smb.conf est nécessaire afin que les réglages WINS fournis par le " -"serveur DHCP soient lus dans /etc/samba/dhcp.conf." - -#. Description -#: ../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:37 -msgid "Configure smb.conf through debconf?" -msgstr "Voulez-vous configurer smb.conf avec debconf ?" - -#. Description -#: ../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 " -"Samba programs (nmbd and smbd.) Your current smb.conf contains an 'include' " -"line or an option that spans multiple lines, which could confuse debconf and " -"require you to edit your smb.conf by hand to get it working again." -msgstr "" -"La suite de la configuration de Samba pose des questions sur des paramètres " -"de /etc/samba/smb.conf, le fichier utilisé pour configurer les programmes de " -"Samba (nmbd et smbd). Votre fichier actuel contient une ligne « include » ou " -"une option qui s'étale sur plusieurs lignes : cela peut perturber debconf et " -"il vaut mieux gérer manuellement le contenu de ce fichier." - -#. Description -#: ../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 " -"periodic configuration enhancements. Therefore, use of debconf is " -"recommended if possible." -msgstr "" -"Si vous n'utilisez pas debconf pour configurer smb.conf, vous devrez vous-" -"même gérer les modifications de configuration et vous ne pourrez pas " -"bénéficier des améliorations faites dans la configuration. Si possible, il " -"est conseillé d'utiliser debconf." - -#. Description -#: ../samba-common.templates:52 -msgid "Workgroup/Domain Name?" -msgstr "Groupe de travail et nom de domaine ?" - -#. Description -#: ../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 " -"the security=domain setting." -msgstr "" -"Ce paramètre indique le groupe de travail où les clients trouveront le " -"serveur. Il indique aussi le nom de domaine utilisé par le paramètre " -"« security=domain »." - -#. Description -#: ../samba-common.templates:60 -msgid "Use password encryption?" -msgstr "Voulez-vous chiffrer les mots de passe ?" - -#. Description -#: ../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 " -"parameter in your Windows registry. It is recommended that you use encrypted " -"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file " -"and that you set passwords in there for each user using the smbpasswd " -"command." -msgstr "" -"Des clients Windows récents communiquent avec les serveurs SMB en utilisant " -"des mots de passe chiffrés. Si vous voulez utiliser des mots de passe sans " -"chiffrement, vous devez modifier un paramètre dans le registre de Windows. " -"Il est recommandé d'utiliser des mots de passe chiffrés. Si vous le faites, " -"n'oubliez pas de créer un fichier /etc/samba/smbpasswd et d'y mettre les " -"mots de passe de tous les utilisateurs qui se servent de la commande " -"smbpasswd." - -#. Description -#: ../samba.templates:4 -msgid "Create samba password database, /var/lib/samba/passdb.tdb?" -msgstr "Faut-il créer une base de données /var/lib/samba/passdb.tdb ?" - -#. Description -#: ../samba.templates:4 -msgid "" -"To be compatible with the defaults in most versions of Windows, Samba must " -"be configured to use encrypted passwords. This requires user passwords to " -"be stored in a file separate from /etc/passwd. This file can be created " -"automatically, but the passwords must be added manually (by you or the user) " -"by running smbpasswd, and you must arrange to keep it up-to-date in the " -"future. If you do not create it, you will have to reconfigure samba (and " -"probably your client machines) to use plaintext passwords. See /usr/share/" -"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more " -"details." -msgstr "" -"Pour préserver la compatibilité avec le comportement par défaut de la " -"plupart des systèmes Windows, Samba doit utiliser les mots de passe " -"chiffrés. Cela exige la création d'un fichier, distinct du fichier /etc/" -"passwd, pour mettre les mots de passe des utilisateurs. Ce fichier peut être " -"créé automatiquement, mais quelqu'un (vous ou l'utilisateur) devra ajouter " -"les mots de passe manuellement en utilisant la commande smbpasswd ; et vous " -"devrez maintenir à jour ce fichier. Si vous ne voulez pas créer le fichier " -"maintenant, Samba (et peut-être les ordinateurs Windows) devra utiliser des " -"mots de passe non chiffrés. Voyez /usr/share/doc/samba-doc/htmldocs/" -"ENCRYPTION.html dans le paquet samba-doc pour plus de détails." - -#. Description -#: ../samba.templates:17 -msgid "Samba's log files have moved." -msgstr "Les fichiers-journaux de Samba ont changé de place." - -#. Description -#: ../samba.templates:17 -msgid "" -"Starting with the first packages of Samba 2.2 for Debian the log files for " -"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The " -"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively." -msgstr "" -"À partir des premiers paquets de Samba 2.2 pour Debian, les fichiers-" -"journaux des démons nmbd et smbd se trouvent dans /var/log/samba/. Les noms " -"de ces fichiers sont log.nmbd et log.smbd pour, respectivement, nmbd et smbd." - -#. Description -#: ../samba.templates:17 -msgid "" -"The old log files that were in /var/log/ will be moved to the new location " -"for you." -msgstr "" -"Les anciens fichiers-journaux dans /var/log/ seront mis au bon endroit." - -#. Description -#: ../samba.templates:28 -msgid "Running nmbd from inetd is no longer supported" -msgstr "L'utilisation de nmbd à partir d'inetd n'est plus supportée" - -#. Description -#: ../samba.templates:28 -msgid "" -"Your system was previously configured to start nmbd and smbd from inetd. As " -"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd. " -"If you have modified your /etc/init.d/samba startup script, you may need to " -"adjust it by hand now so that nmbd will start." -msgstr "" -"Votre système lançait nmbd et smbd à partir d'inetd. Depuis la version 2.999" -"+3.0.alpha20-4, on ne peut plus exécuter nmbd à partir d'inetd. Si vous avez " -"modifié le script de lancement /etc/init.d/samba, vous avez peut-être besoin " -"de le corriger manuellement pour permettre le lancement de nmbd. " - -#. Choices -#: ../samba.templates:36 -msgid "daemons, inetd" -msgstr "démons, inetd" - -#. Description -#: ../samba.templates:38 -msgid "How do you want to run Samba?" -msgstr "Comment voulez-vous lancer Samba ?" - -#. Description -#: ../samba.templates:38 -msgid "" -"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a " -"daemon is the recommended approach." -msgstr "" -"Le service de Samba smbd peut s'exécuter en tant que démon classique ou bien " -"être lancé par inetd. L'approche recommandée est qu'il s'exécute en tant que " -"démon." - -#. Description -#: ../samba.templates:45 -msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?" -msgstr "Faut-il convertir /etc/samba/smbpasswd en /var/lib/samba/passdb.tdb ?" - -#. Description -#: ../samba.templates:45 -msgid "" -"Samba 3.0 introduces a newer, more complete SAM database interface which " -"supersedes the /etc/samba/smbpasswd file. Would you like your existing " -"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you? If you " -"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' " -"here." -msgstr "" -"Avec Samba 3.0, une nouvelle interface pour les bases de données SAM, plus " -"complète, vient remplacer le fichier /etc/samba/smbpasswd. Voulez-vous que " -"votre fichier existant soit remplacé par /var/lib/samba/passdb.tdb ? Si vous " -"envisagez d'utiliser une autre interface d'authentification (p.ex. LDAP), " -"refusez la proposition maintenant." - -#. Description -#: ../swat.templates:3 -msgid "Your smb.conf will be re-written!" -msgstr "Ré-écriture de votre fichier smb.conf !" - -#. Description -#: ../swat.templates:3 -msgid "" -"SWAT will rewrite your smb.conf file. It will rearrange the entries and " -"delete all comments, include= and copy= options. If you have a carefully " -"crafted smb.conf then back it up or don't use SWAT!" -msgstr "" -"SWAT va modifier votre fichier smb.conf. Les entrées seront réorganisées et " -"les commentaires détruits ainsi que les entrées « include = » et « copy = ». " -"Si votre smb.conf était soigneusement construit, sauvegardez-le ou " -"n'utilisez pas SWAT !" diff --git a/packaging/Debian/debian/po/nl.po b/packaging/Debian/debian/po/nl.po deleted file mode 100644 index 61e8742dbb5..00000000000 --- a/packaging/Debian/debian/po/nl.po +++ /dev/null @@ -1,302 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: samba\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-08-30 19:08-0500\n" -"PO-Revision-Date: 2003-08-30 02:03+0100\n" -"Last-Translator: Bart Cornelis <cobaco@linux.be>\n" -"Language-Team: dutch <debian-l10n-dutch@lists.debian.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Description -#: ../samba-common.templates:3 -msgid "Character Set for Unix filesystem" -msgstr "Karakterset voor Unix bestandsysteem" - -#. Description -#: ../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 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 "" -"U heeft momenteel een \"karakterset\" ingesteld in uw smb.conf. In Samba 3.0 " -"werd deze optie vervangen door een nieuwe \"unix karakterset\" optie. " -"Gelieve de karakterset die u voor deze nieuwe optie wil gebruiken aan te " -"geven, deze bepaald hoe Samba de bestandsnamen in het bestandsysteem " -"interpreteerd." - -#. Description -#: ../samba-common.templates:3 -msgid "If you leave this option blank, your smb.conf will not be changed." -msgstr "" -"Uw smb.conf bestand wordt niet aangepast indien u deze optie leeg laat." - -#. Description -#: ../samba-common.templates:13 -msgid "Character Set for DOS clients" -msgstr "Karakterset voor DOS-clients" - -#. Description -#: ../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 " -"the character set you wish to use for this new option. In most cases, the " -"default chosen for you will be sufficient. Note that this option is not " -"needed to support Windows clients, it is only for DOS clients. If you leave " -"this option blank, your smb.conf will not be changed." -msgstr "" -"U heeft momenteel een \"client code pagina\" ingesteld in uw smb.conf. In " -"Samba 3.0 werd deze optie vervangen door de optie \"dos karakterset\". " -"Gelieve de karakterset die u voor deze nieuwe optie wilt gebruiken aan te " -"geven. In de meeste gevallen zal het standaard ingevulde antwoord voldoen. " -"Merk op dat deze optie niet nodig is voor ondersteuning van Windows-clients, " -"enkel voor DOS-clients. Uw smb.conf wordt niet veranderd wanneer u deze " -"optie blank laat." - -#. Description -#: ../samba-common.templates:24 -msgid "Modify smb.conf to use WINS settings from DHCP?" -msgstr "smb.conf aanpassen om de WINS instellingen van DHCP te gebruiken?" - -#. Description -#: ../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 " -"(\"NetBIOS name servers\") present on the network. This requires a change " -"to your smb.conf file so that DHCP-provided WINS settings will automatically " -"be read from /etc/samba/dhcp.conf." -msgstr "" -"Indien uw computer zijn ip-addres informatie van een DHCP-server op het " -"netwerk haalt, voorziet deze mogelijks ook informatie betreffende de op het " -"netwerk aanwezige WINS-servers (\"NetBIOS naam servers\").\" Dit vereist een " -"verandering aan uw smb.conf bestand, opdat de door DHCP doorgegeven WINS " -"instellingen automatisch gelezen worden van /etc/samba/dhcp.conf." - -#. Description -#: ../samba-common.templates:24 -msgid "" -"You must have the dhcp3-client package installed to take advantage of this " -"feature." -msgstr "" -"U dient het dhcp3-client-pakket geïnstalleert te hebben om van deze optie " -"gebruik te maken." - -#. Description -#: ../samba-common.templates:37 -msgid "Configure smb.conf through debconf?" -msgstr "Configuratie in smb.conf met debconf beheren?" - -#. Description -#: ../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 " -"Samba programs (nmbd and smbd.) Your current smb.conf contains an 'include' " -"line or an option that spans multiple lines, which could confuse debconf and " -"require you to edit your smb.conf by hand to get it working again." -msgstr "" -"De resterende Samba configuratie beslaat parameters in /etc/samba/smb.conf, " -"het configuratiebestand dat gebruikt wordt voor de Samba programmas (nmbd en " -"smbd). Uw huidige smb.conf bevat een 'include' regel of een optie die " -"meerdere regels beslaat, dit kan debconf mogelijks in verwarring brenngen. " -"Indien debconf in verwarring raakt dient u uw smb.conf handmatig aan te " -"passen om samba terug werkend te krijgen." - -#. Description -#: ../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 " -"periodic configuration enhancements. Therefore, use of debconf is " -"recommended if possible." -msgstr "" -"Indien u geen gebruik maakt van debconf voor het beheer van smb.conf dient u " -"alle configuratie instellingen zelf te doen, en zult u geen voordeel halen " -"uit de periodieke configuratie verbeteringen. Het gebruik van debconf wordt " -"dan ook aangeraden. " - -#. Description -#: ../samba-common.templates:52 -msgid "Workgroup/Domain Name?" -msgstr "Werkgroep/Domeinnaam?" - -#. Description -#: ../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 " -"the security=domain setting." -msgstr "" -"Dit bepaald van welke werkgroep uw server deel zal lijken uit te maken bij " -"het beantwoorden van vragen door clients. Merk op dat deze parameter ook de " -"domeinnaam die gebruikt wordt voor de security=domein instelling bepaald." - -#. Description -#: ../samba-common.templates:60 -msgid "Use password encryption?" -msgstr "Wachtwoord versleuteling gebruiken?" - -#. Description -#: ../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 " -"parameter in your Windows registry. It is recommended that you use encrypted " -"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file " -"and that you set passwords in there for each user using the smbpasswd " -"command." -msgstr "" -"Recente Windows clients maken gebruik van versleutelde wachtwoorden voor de " -"communicatie met SMB-servers. Indien u onversleutelde tekst wachtwoorden " -"wilt gebruiken dient u een parameter te veranderen in de Windows registry. " -"Het gebruik van versleutelde wachtwoorden wordt aangeraden. Indien u dit " -"doet zorg er dan voor dat u een geldig /etc/samba/smbpasswd bestand heeft en " -"dat u de wachtwoorden daar voor elke gebruiker met behulp van smbpasswd " -"insteld. " - -#. Description -#: ../samba.templates:4 -msgid "Create samba password database, /var/lib/samba/passdb.tdb?" -msgstr "Samba wachtwoord database, /var/lib/samba/passdb.tdb, aanmaken?" - -#. Description -#: ../samba.templates:4 -msgid "" -"To be compatible with the defaults in most versions of Windows, Samba must " -"be configured to use encrypted passwords. This requires user passwords to " -"be stored in a file separate from /etc/passwd. This file can be created " -"automatically, but the passwords must be added manually (by you or the user) " -"by running smbpasswd, and you must arrange to keep it up-to-date in the " -"future. If you do not create it, you will have to reconfigure samba (and " -"probably your client machines) to use plaintext passwords. See /usr/share/" -"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more " -"details." -msgstr "" -"Om compatibel te zijn met de standaard instellingen van de meeste " -"Windowsversies dient Samba gebruik te maken van versleutelde wachtwoorden. " -"Dit vereist dat de gebruikerswachtwoorden opgeslagen worden in een bestand " -"dat verschilt van /etc/passwd. Dit bestand kan automatisch aangemaakt " -"worden, maar de wachtwoorden dienen handmatig (door de gebuiker) toegevoegt " -"te worden met het smbpasswd commando. U dient dit bestand in de toekomst ook " -"aktueel te houden. Indien u dit bestand niet aanmaakt zult u samba (en naar " -"alle waarschijnlijkheid de client machines) moeten herconfigureren zodat " -"deze onversleutelde wachtwoorden gebruiken. Zie /usr/share/doc/samba-doc/" -"htmldocs/ENCRYPTION.html uit het samba-doc pakket voor meer details." - -#. Description -#: ../samba.templates:17 -msgid "Samba's log files have moved." -msgstr "Samba's log bestanden zijn verhuisd." - -#. Description -#: ../samba.templates:17 -msgid "" -"Starting with the first packages of Samba 2.2 for Debian the log files for " -"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The " -"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively." -msgstr "" -"Vanaf de eerste Debian pakketten vaan Samba versie 2.2 zijn de log bestanden " -"van beide Samba daemons (nmbd en smbd) opgeslagen in /var/log/samba/. De log " -"bestanden voor nmbd en smbd zijn, respectievelijk, log.nmbd en log.smbd." - -#. Description -#: ../samba.templates:17 -msgid "" -"The old log files that were in /var/log/ will be moved to the new location " -"for you." -msgstr "" -"De oude logbestanden in /var/log worden voor u naar de nieuwe locatie " -"verplaatst." - -#. Description -#: ../samba.templates:28 -msgid "Running nmbd from inetd is no longer supported" -msgstr "nmbd vanuit inetd draaien wordt niet langer ondersteund" - -#. Description -#: ../samba.templates:28 -msgid "" -"Your system was previously configured to start nmbd and smbd from inetd. As " -"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd. " -"If you have modified your /etc/init.d/samba startup script, you may need to " -"adjust it by hand now so that nmbd will start." -msgstr "" -"Uw systeem was geconfigureerd om nmbd en smbd vanuit inetd te starten. Vanaf " -"versie 2.999+3.0.alpha20-4 kan nmbd niet langer door inetd gestart worden. " -"Indien u uw /etc/init.d/samba startup-script aangepast had, dient u dit " -"mogelijks aan te passen opdat nmbd zou starten." - -#. Choices -#: ../samba.templates:36 -msgid "daemons, inetd" -msgstr "daemons, inetd" - -#. Description -#: ../samba.templates:38 -msgid "How do you want to run Samba?" -msgstr "Hoe wilt u Samba draaien?" - -#. Description -#: ../samba.templates:38 -msgid "" -"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a " -"daemon is the recommended approach." -msgstr "" -"De Samba daemon smbd kan als een normale daemon of via inetd draaien. Als " -"een daemon is de aangeraden aanpak." - -#. Description -#: ../samba.templates:45 -msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?" -msgstr "/etc/samba/smbpasswd verplaatsen naar /var/lib/samba/passdb.tdb?" - -#. Description -#: ../samba.templates:45 -msgid "" -"Samba 3.0 introduces a newer, more complete SAM database interface which " -"supersedes the /etc/samba/smbpasswd file. Would you like your existing " -"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you? If you " -"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' " -"here." -msgstr "" -"Samba 3.0 introduceert een nieuwe, meer complete SAM databaseinterface die " -"het /etc/samba/smbpasswd bestand overstijgt. \"Wilt u dat ik uw bestaand " -"smbpasswd bestand voor u naar /var/lib/samba/passdb.tdb migreer? Indien u " -"van plan bent om, in plaats hiervan, een ander pdb-backend (e.g. LDAP) te " -"gebruiken dient u hier 'nee' te antwoorden." - -#. Description -#: ../swat.templates:3 -msgid "Your smb.conf will be re-written!" -msgstr "Uw smb.conf wordt herschreven!" - -#. Description -#: ../swat.templates:3 -msgid "" -"SWAT will rewrite your smb.conf file. It will rearrange the entries and " -"delete all comments, include= and copy= options. If you have a carefully " -"crafted smb.conf then back it up or don't use SWAT!" -msgstr "" -"SWAT zal uw smb.conf bestand herschrijven. Het zal de ingangen anders " -"schikken en alle comments, include= en copy= opties verwijderen. Als u een, " -"met veel zorg, handmatig opgebouwd smb.conf bestand heeft, maak dan een " -"reservekopie of zie van het gebruik van SWAT af! " diff --git a/packaging/Debian/debian/po/pt_BR.po b/packaging/Debian/debian/po/pt_BR.po deleted file mode 100644 index 2af42a562b9..00000000000 --- a/packaging/Debian/debian/po/pt_BR.po +++ /dev/null @@ -1,308 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: samba_3.0.0beta2-1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-08-30 19:08-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" - -#. Description -#: ../samba-common.templates:3 -msgid "Character Set for Unix filesystem" -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 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 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 -msgid "If you leave this option blank, your smb.conf will not be changed." -msgstr "" -"Caso você deixe esta opção em branco, seu arquivo smb.conf não será " -"modificado." - -#. Description -#: ../samba-common.templates:13 -msgid "Character Set for DOS clients" -msgstr "Conjunto de caracteres para clientes DOS" - -#. Description -#: ../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 " -"the character set you wish to use for this new option. In most cases, the " -"default chosen for you will be sufficient. Note that this option is not " -"needed to support Windows clients, it is only for DOS clients. If you leave " -"this option blank, your smb.conf will not be changed." -msgstr "" -"Atualmente existe um \"código de página do cliente\" (\"client code page\") " -"definido em seu arquivo smb.conf. No Samba 3.0, essa opção foi substituída " -"pela opção \"dos charset\". Por favor, especifique o conjunto de caracteres " -"que você deseja usar para essa nova opção. Note que essa opção não é " -"necessária para suportar clientes Windows mas sim válida somente para " -"clientes DOS. Caso você deixe essa opção em branco, seu arquivo smb.conf não " -"será modificado." - -#. Description -#: ../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: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 " -"(\"NetBIOS name servers\") present on the network. This requires a change " -"to your smb.conf file so that DHCP-provided WINS settings will automatically " -"be read from /etc/samba/dhcp.conf." -msgstr "" -"Caso seu computador obtenha as informações de endereçamento IP de um " -"servidor DHCP na rede, o servidor DHCP pode também fornecer informações " -"sobre servidor WINS (\"Servidor de Nomes NetBIOS\") presentes na rede. Para " -"o Samba ler as configurações WINS fornecidas pelo servidor DHCP " -"automaticamente do arquivo /etc/samba/dhcp.conf, é preciso modificar seu " -"arquivo smb.conf." - -#. Description -#: ../samba-common.templates:24 -msgid "" -"You must have the dhcp3-client package installed to take advantage of this " -"feature." -msgstr "" -"Você deve possuir o pacote dhcp3-client instalado para poder usar este " -"recurso." - -#. Description -#: ../samba-common.templates:37 -msgid "Configure smb.conf through debconf?" -msgstr "Configurar smb.conf através do debconf ?" - -#. Description -#: ../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 " -"Samba programs (nmbd and smbd.) Your current smb.conf contains an 'include' " -"line or an option that spans multiple lines, which could confuse debconf and " -"require you to edit your smb.conf by hand to get it working again." -msgstr "" -"O restante da configuração do Samba lida com questões que afetam parâmetros " -"no arquivo /etc/samba/smb.conf, que é o arquivo usado para configurar os " -"programas Samba (nmbd e smbd). Seu arquivo smb.conf atual contém uma linha " -"'include' ou uma opção que ocupa diversas linhas, o que pode confundir o " -"debconf e requerer que você edite seu arquivo smb.conf manualmente para tê-" -"lo funcional novamente." - -#. Description -#: ../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 " -"periodic configuration enhancements. Therefore, use of debconf is " -"recommended if possible." -msgstr "" -"Caso você opte por não usar o debconf para configurar o smb.conf, será " -"necessário que você lide com quaisquer mudanças de configurações manualmente " -"e você não poderá aproveitar os melhoramentos periódicos de configuração. " -"Por esse motivo, é recomendado usar o debconf, caso seja possível." - -#. Description -#: ../samba-common.templates:52 -msgid "Workgroup/Domain Name?" -msgstr "Nome de Domínio/Grupo de Trabalho ?" - -#. Description -#: ../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 " -"the security=domain setting." -msgstr "" -"Este parâmetro controla em qual grupo de trabalho (workgroup) seu servidor " -"parecerá estar quando o mesmo for pesquisado por clientes. Note que este " -"parâmetro também controla o nome de Domínio usado com a configuração " -"security=domain." - -#. Description -#: ../samba-common.templates:60 -msgid "Use password encryption?" -msgstr "Usar encriptação de senhas ?" - -#. Description -#: ../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 " -"parameter in your Windows registry. It is recommended that you use encrypted " -"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file " -"and that you set passwords in there for each user using the smbpasswd " -"command." -msgstr "" -"Clientes Windows atuais comunicam-se com servidores SMB usando senhas " -"encriptadas. Caso você queira usar senhas em texto puro você precisará " -"modificar um parâmetro no registro de seu Windows. É recomendado que você " -"use senhas encriptadas. Se for usá-las, certifique-se de possuir um arquivo /" -"etc/samba/smbpasswd válido e que você tenha definido senhas no mesmo para " -"cada usuário, utilizando o comando smbpasswd." - -#. Description -#: ../samba.templates:4 -msgid "Create samba password database, /var/lib/samba/passdb.tdb?" -msgstr "Gerar a base de dados para senhas /var/lib/samba/passdb.tdb ?" - -#. Description -#: ../samba.templates:4 -msgid "" -"To be compatible with the defaults in most versions of Windows, Samba must " -"be configured to use encrypted passwords. This requires user passwords to " -"be stored in a file separate from /etc/passwd. This file can be created " -"automatically, but the passwords must be added manually (by you or the user) " -"by running smbpasswd, and you must arrange to keep it up-to-date in the " -"future. If you do not create it, you will have to reconfigure samba (and " -"probably your client machines) to use plaintext passwords. See /usr/share/" -"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more " -"details." -msgstr "" -"Para compatibilidade com os padrões adotados em todas as versões atuais do " -"Windows o Samba deve ser configurado para usar senhas encriptadas. Isso " -"requer que as senhas dos usuários sejam armazenadas em um arquivo diferente " -"do /etc/passwd. Esse arquivo pode ser criado automaticamente, mas as senhas " -"devem ser definidas manualmente (por você ou pelo usuário) executando o " -"utilitário smbpasswd. Você deve certificar-se de manter esse arquivo " -"atualizado futuramente. Caso você não crie esse arquivo, você terá que " -"reconfigurar o Samba (e provavelmente suas máquinas clientes) para " -"utilização de senhas em texto puro. Consulte a documentação do pacote samba-" -"doc em /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html para maiores " -"detalhes." - -#. Description -#: ../samba.templates:17 -msgid "Samba's log files have moved." -msgstr "Arquivos de log do Samba foram movidos." - -#. Description -#: ../samba.templates:17 -msgid "" -"Starting with the first packages of Samba 2.2 for Debian the log files for " -"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The " -"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively." -msgstr "" -"Desde os primeiros pacotes Debian do Samba 2.2 os arquivos de log para ambos " -"os daemons Samba (nmbd e smbd) são armazenados no diretório /var/log/samba/. " -"Os nomes desses arquivos são log.nmbd e log.smbd, para o nmbd e para o smbd, " -"respectivamente." - -#. Description -#: ../samba.templates:17 -msgid "" -"The old log files that were in /var/log/ will be moved to the new location " -"for you." -msgstr "" -"Os antigos arquivos de log que estavam em /var/log/ serão movidos para a " -"nova localização automaticamente para você." - -#. Description -#: ../samba.templates:28 -msgid "Running nmbd from inetd is no longer supported" -msgstr "A execução do nmbd a partir do inetd não é mais suportada" - -#. Description -#: ../samba.templates:28 -msgid "" -"Your system was previously configured to start nmbd and smbd from inetd. As " -"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd. " -"If you have modified your /etc/init.d/samba startup script, you may need to " -"adjust it by hand now so that nmbd will start." -msgstr "" -"Seu sistema foi previamente configurado para iniciar os daemons nmbd e smbd " -"a partir do inetd. Desde a versão 2.999+3.0.alpha20-4, o nmbd não mais será " -"iniciado a partir do inetd. Caso você tenha modificado seu script de " -"inicialização /etc/init.d/samba, você pode precisar ajustá-lo manualmente " -"agora para que o nmbd seja iniciado." - -#. Choices -#: ../samba.templates:36 -msgid "daemons, inetd" -msgstr "daemons, inetd" - -#. Description -#: ../samba.templates:38 -msgid "How do you want to run Samba?" -msgstr "Como você deseja que o Samba seja executado ?" - -#. Description -#: ../samba.templates:38 -msgid "" -"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a " -"daemon is the recommended approach." -msgstr "" -"O serviço Samba smbd pode ser executado como daemon normal ou a partir do " -"inetd. Executá-lo como daemon é o método recomendado." - -#. Description -#: ../samba.templates:45 -msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?" -msgstr "Mover /etc/samba/smbpasswd para /var/lib/samba/passdb.tdb ?" - -#. Description -#: ../samba.templates:45 -msgid "" -"Samba 3.0 introduces a newer, more complete SAM database interface which " -"supersedes the /etc/samba/smbpasswd file. Would you like your existing " -"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you? If you " -"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' " -"here." -msgstr "" -"O Samba 3.0 introduz uma nova e mais complete interface de base de dados SAM " -"que substitui o arquivo /etc/samba/smbpasswd. Você gostaria que o arquivo " -"smbpasswd existente fosse migrado para /var/lib/samba/passdb.tdb para você ? " -"Caso você planeje usar um outro backend (como LDAP, por exemplo) você deverá " -"escolher 'não' aqui." - -#. Description -#: ../swat.templates:3 -msgid "Your smb.conf will be re-written!" -msgstr "Seu arquivo smb.conf será reescrito !" - -#. Description -#: ../swat.templates:3 -msgid "" -"SWAT will rewrite your smb.conf file. It will rearrange the entries and " -"delete all comments, include= and copy= options. If you have a carefully " -"crafted smb.conf then back it up or don't use SWAT!" -msgstr "" -"O SWAT irá reescrever seu arquivo smb.conf. Ele irá rearrumar as entradas e " -"apagar todos os comentários, opções include= e copy=. Caso você possua um " -"arquivo smb.conf cuidadosamente criado e comentado, faça uma cópia de " -"segurança (backup) do mesmo ou não use o SWAT !" diff --git a/packaging/Debian/debian/po/templates.pot b/packaging/Debian/debian/po/templates.pot deleted file mode 100644 index 465f4719b0d..00000000000 --- a/packaging/Debian/debian/po/templates.pot +++ /dev/null @@ -1,233 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-08-30 19:08-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" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Description -#: ../samba-common.templates:3 -msgid "Character Set for Unix filesystem" -msgstr "" - -#. Description -#: ../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 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 -#: ../samba-common.templates:3 -msgid "If you leave this option blank, your smb.conf will not be changed." -msgstr "" - -#. Description -#: ../samba-common.templates:13 -msgid "Character Set for DOS clients" -msgstr "" - -#. Description -#: ../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 " -"the character set you wish to use for this new option. In most cases, the " -"default chosen for you will be sufficient. Note that this option is not " -"needed to support Windows clients, it is only for DOS clients. If you leave " -"this option blank, your smb.conf will not be changed." -msgstr "" - -#. Description -#: ../samba-common.templates:24 -msgid "Modify smb.conf to use WINS settings from DHCP?" -msgstr "" - -#. Description -#: ../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 " -"(\"NetBIOS name servers\") present on the network. This requires a change " -"to your smb.conf file so that DHCP-provided WINS settings will automatically " -"be read from /etc/samba/dhcp.conf." -msgstr "" - -#. Description -#: ../samba-common.templates:24 -msgid "" -"You must have the dhcp3-client package installed to take advantage of this " -"feature." -msgstr "" - -#. Description -#: ../samba-common.templates:37 -msgid "Configure smb.conf through debconf?" -msgstr "" - -#. Description -#: ../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 " -"Samba programs (nmbd and smbd.) Your current smb.conf contains an 'include' " -"line or an option that spans multiple lines, which could confuse debconf and " -"require you to edit your smb.conf by hand to get it working again." -msgstr "" - -#. Description -#: ../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 " -"periodic configuration enhancements. Therefore, use of debconf is " -"recommended if possible." -msgstr "" - -#. Description -#: ../samba-common.templates:52 -msgid "Workgroup/Domain Name?" -msgstr "" - -#. Description -#: ../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 " -"the security=domain setting." -msgstr "" - -#. Description -#: ../samba-common.templates:60 -msgid "Use password encryption?" -msgstr "" - -#. Description -#: ../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 " -"parameter in your Windows registry. It is recommended that you use encrypted " -"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file " -"and that you set passwords in there for each user using the smbpasswd " -"command." -msgstr "" - -#. Description -#: ../samba.templates:4 -msgid "Create samba password database, /var/lib/samba/passdb.tdb?" -msgstr "" - -#. Description -#: ../samba.templates:4 -msgid "" -"To be compatible with the defaults in most versions of Windows, Samba must " -"be configured to use encrypted passwords. This requires user passwords to " -"be stored in a file separate from /etc/passwd. This file can be created " -"automatically, but the passwords must be added manually (by you or the user) " -"by running smbpasswd, and you must arrange to keep it up-to-date in the " -"future. If you do not create it, you will have to reconfigure samba (and " -"probably your client machines) to use plaintext passwords. See /usr/share/" -"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more " -"details." -msgstr "" - -#. Description -#: ../samba.templates:17 -msgid "Samba's log files have moved." -msgstr "" - -#. Description -#: ../samba.templates:17 -msgid "" -"Starting with the first packages of Samba 2.2 for Debian the log files for " -"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The " -"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively." -msgstr "" - -#. Description -#: ../samba.templates:17 -msgid "" -"The old log files that were in /var/log/ will be moved to the new location " -"for you." -msgstr "" - -#. Description -#: ../samba.templates:28 -msgid "Running nmbd from inetd is no longer supported" -msgstr "" - -#. Description -#: ../samba.templates:28 -msgid "" -"Your system was previously configured to start nmbd and smbd from inetd. As " -"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd. " -"If you have modified your /etc/init.d/samba startup script, you may need to " -"adjust it by hand now so that nmbd will start." -msgstr "" - -#. Choices -#: ../samba.templates:36 -msgid "daemons, inetd" -msgstr "" - -#. Description -#: ../samba.templates:38 -msgid "How do you want to run Samba?" -msgstr "" - -#. Description -#: ../samba.templates:38 -msgid "" -"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a " -"daemon is the recommended approach." -msgstr "" - -#. Description -#: ../samba.templates:45 -msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?" -msgstr "" - -#. Description -#: ../samba.templates:45 -msgid "" -"Samba 3.0 introduces a newer, more complete SAM database interface which " -"supersedes the /etc/samba/smbpasswd file. Would you like your existing " -"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you? If you " -"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' " -"here." -msgstr "" - -#. Description -#: ../swat.templates:3 -msgid "Your smb.conf will be re-written!" -msgstr "" - -#. Description -#: ../swat.templates:3 -msgid "" -"SWAT will rewrite your smb.conf file. It will rearrange the entries and " -"delete all comments, include= and copy= options. If you have a carefully " -"crafted smb.conf then back it up or don't use SWAT!" -msgstr "" diff --git a/packaging/Debian/debian/python2.3-samba.files b/packaging/Debian/debian/python2.3-samba.files deleted file mode 100644 index 82759d81b89..00000000000 --- a/packaging/Debian/debian/python2.3-samba.files +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2.3/site-packages/ diff --git a/packaging/Debian/debian/rules b/packaging/Debian/debian/rules index 73e5d16bc19..c5f4a22b198 100755 --- a/packaging/Debian/debian/rules +++ b/packaging/Debian/debian/rules @@ -10,7 +10,7 @@ #export DH_VERBOSE=1 # This is the debhelper compatability version to use. -export DH_COMPAT=4 +export DH_COMPAT=2 # This has to be exported to make some magic below work. export DH_OPTIONS @@ -23,37 +23,20 @@ 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 +DESTDIR=`pwd`/debian/samba SWATDIR=`pwd`/debian/swat +SAMBABOOK=`pwd`/debian/swat IVARS = BASEDIR=$(DESTDIR)/usr \ - prefix=$(DESTDIR)/usr \ BINDIR=$(DESTDIR)/usr/bin \ SBINDIR=$(DESTDIR)/usr/sbin \ MANDIR=$(DESTDIR)/usr/share/man \ - LIBDIR=$(DESTDIR)/usr/lib/samba \ + LIBDIR=$(DESTDIR)/etc/samba \ VARDIR=$(DESTDIR)/var \ INCLUDEDIR=$(DESTDIR)/usr/include \ SWATDIR=$(SWATDIR)/usr/share/samba/swat \ - CODEPAGEDIR=$(DESTDIR)/usr/share/samba/ \ - PRIVATEDIR=$(DESTDIR)/etc/samba \ - CONFIGDIR=$(DESTDIR)/etc/samba + SAMBABOOK=$(SAMBABOOK)/usr/share/samba/swat/using_samba \ + CODEPAGEDIR=$(DESTDIR)/usr/share/samba/codepages patch: patch-stamp patch-stamp: @@ -74,33 +57,25 @@ configure-stamp: cp -f debian/config.cache source/config.cache; \ fi - [ -f source/Makefile ] || (cd source && CFLAGS="$(CFLAGS)" ./configure \ + [ -f source/Makefile ] || (cd source && ./configure \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ - --cache-file=./config.cache \ --with-fhs \ - --enable-shared \ - --enable-static \ --prefix=/usr \ --sysconfdir=/etc \ - --libdir=/etc/samba \ --with-privatedir=/etc/samba \ --localstatedir=/var \ --with-netatalk \ --with-smbmount \ --with-pam \ --with-syslog \ + --with-sambabook \ --with-utmp \ --with-readline \ --with-pam_smbpass \ --with-libsmbclient \ --with-winbind \ - --with-msdfs \ - --with-automount \ - --with-acl-support \ - --with-tdbsam \ - --with-ldap \ - --with-python=python2.3) + --with-msdfs) touch configure-stamp @@ -108,8 +83,7 @@ build: patch-stamp configure-stamp build-stamp build-stamp: dh_testdir - $(MAKE) -C source headers - $(MAKE) -C source all nsswitch/libnss_wins.so python_ext + $(MAKE) -C source all nsswitch/libnss_wins.so touch build-stamp @@ -121,11 +95,11 @@ clean: unpatch # Clean first the Samba package # -$(MAKE) -C source realclean # -$(MAKE) -C source clean - -$(MAKE) -C source python_clean distclean + -$(MAKE) -C source distclean # Delete stuff left after a build that is not deleted by 'make clean' rm -f source/bin/wbinfo source/bin/winbindd source/bin/debug2html \ - source/bin/libsmbclient.a source/include/stamp-h + source/include/stamp-h dh_clean @@ -136,12 +110,6 @@ install: build dh_clean -k dh_installdirs - mkdir -p $(DESTDIR)/usr/share/man $(DESTDIR)/usr/lib \ - $(DESTDIR)/lib/security $(DESTDIR)/sbin \ - $(DESTDIR)/usr/lib/cups/backend $(DESTDIR)/usr/share/samba \ - $(DESTDIR)/etc/pam.d $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d \ - $(DESTDIR)/usr/lib/python2.3/site-packages - # Add here commands to install the package into debian/tmp. $(MAKE) -C source install $(IVARS) @@ -149,8 +117,6 @@ install: build # 'make install' - do it manually. $(MAKE) -C source installclientlib $(IVARS) mv $(DESTDIR)/usr/lib/libsmbclient.so $(DESTDIR)/usr/lib/libsmbclient.so.0.1 - ln -s libsmbclient.so.0.1 $(DESTDIR)/usr/lib/libsmbclient.so.0 - ln -s libsmbclient.so.0.1 $(DESTDIR)/usr/lib/libsmbclient.so # Install other stuff not installed by "make install" install -m 0755 debian/mksmbpasswd.awk $(DESTDIR)/usr/sbin/mksmbpasswd @@ -163,13 +129,13 @@ install: build # Install libnss_wins.so, which is not installed by 'make install' either. install -m 0644 source/nsswitch/libnss_wins.so \ - $(DESTDIR)/lib/libnss_wins.so.2 + $(DESTDIR)/lib/libnss_wins.so - # pam_smbpass.so isn't being installed by 'make install'. + # pam_smbpass.so is installed by 'make install' in $(DESTDIR)/usr/bin/. # We'll move it here to $(DESTDIR)/lib/security/ and then # libpam-smbpass.files will make dh_movefiles move it to the # right location in the libpam-smbpass package. - install -m 0644 source/bin/pam_smbpass.so $(DESTDIR)/lib/security/ + mv $(DESTDIR)/usr/bin/pam_smbpass.so $(DESTDIR)/lib/security/ # Create the symlink that will allow us to do "mount -t smbfs ...". # Create also a symlink that will allow "mount -t smb ..." to @@ -185,6 +151,14 @@ install: build # Erich Schubert <debian@vitavonni.de> in #109509): ln -s ../../../bin/smbspool $(DESTDIR)/usr/lib/cups/backend/smb + # To avoid duplication of a large number of files, the swat package + # does not contain the "Using Samba" book nor the HTML docs. + # Instead, these are provided by the samba-doc package and + # are accessed through symlinks provided in the swat package. + # Here we create the symlink for the book, and the symlinks + # for the HTML files are created by the script installswat.sh. + ln -s ../../doc/samba-doc/htmldocs/using_samba $(SAMBABOOK)/usr/share/samba/swat/using_samba + # Install man pages for files without man pages in the upstream sources install -m 0644 debian/mksmbpasswd.8 $(DESTDIR)/usr/share/man/man8/mksmbpasswd.8 @@ -196,25 +170,21 @@ install: build # We're not providing findsmb (should we?) so let's remove the man # pages. - find debian/ -name 'findsmb*' -exec rm -f {} \; + find debian/ -name 'findsmb*' -exec rm {} \; # Install samba-common's conffiles - they'll get moved later to their # correct place by dh_movefiles. cp debian/smb.conf $(DESTDIR)/usr/share/samba/ - install -m755 debian/panic-action $(DESTDIR)/usr/share/samba/ - cp debian/gdbcommands $(DESTDIR)/etc/samba/ cp debian/samba.pamd $(DESTDIR)/etc/pam.d/samba - install -m755 debian/samba-common.dhcp $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d/samba - # Install the Python modules - # - # Hmmm... need to figure this out. We have lib.linux-i686-2.2 - # and lib.linux-i686-2.3 directories. Using only the stuff from - # the 2.3 directory for now. peloy.- - #cp source/build/lib.*/samba/*.so $(DESTDIR)/usr/lib/python2.3/site-packages/ - cp source/build/lib.linux-*-2.3/samba/*.so $(DESTDIR)/usr/lib/python2.3/site-packages/ + # This is to comply with policy (the symlink that ldconfig would + # produce must exist in the package). + /sbin/ldconfig -n $(DESTDIR)/usr/lib/ + + dh_movefiles --sourcedir=debian/samba/ - dh_movefiles + # Remove empty directories that will never be used. + rmdir $(DESTDIR)/sbin # Build architecture-independent files here. # Pass -i to all debhelper commands in this target to reduce clutter. @@ -223,9 +193,9 @@ binary-indep: build install dh_testdir dh_testroot dh_installdebconf - dh_installdocs -A debian/README.build + dh_installdocs -A docs/textdocs/DIAGNOSIS.txt debian/README.build docs/README* docs/Samba-HOWTO-Collection.pdf # dh_installexamples is not available in Debian Potato... - [ -x /usr/bin/dh_installexamples ] && DH_OPTIONS= dh_installexamples -v -psamba-doc examples/* + [ -x /usr/bin/dh_installexamples ] && dh_installexamples # dh_installmenu # dh_installemacsen # dh_installpam @@ -234,14 +204,10 @@ binary-indep: build install # dh_installmanpages # dh_installinfo # dh_undocumented - dh_installchangelogs + dh_installchangelogs dh_link dh_compress dh_fixperms - - # Get rid of those pesky .cvsignore files to make lintian happy - find debian/ -name .cvsignore -exec rm -f {} \; - dh_installdeb # dh_perl dh_gencontrol @@ -255,9 +221,9 @@ binary-arch: build install dh_testdir dh_testroot dh_installdebconf - dh_installdocs -A debian/README.build + dh_installdocs -A docs/textdocs/DIAGNOSIS.txt debian/README.build docs/README* docs/Samba-HOWTO-Collection.pdf # dh_installexamples is not available in Debian Potato... - [ -x /usr/bin/dh_installexamples ] && DH_OPTIONS= dh_installexamples -v -ppython2.3-samba source/python/examples/* + [ -x /usr/bin/dh_installexamples ] && dh_installexamples # dh_installmenu # dh_installlogrotate is not available in Debian Potato... if [ -x /usr/bin/dh_installlogrotate ]; then \ @@ -270,15 +236,12 @@ binary-arch: build install fi # dh_installemacsen # dh_installpam - DH_OPTIONS= dh_installinit -psamba -- "defaults 20 19" - DH_OPTIONS= dh_installinit -pwinbind - dh_installcron + dh_installinit -n + dh_installcron # dh_installmanpages # dh_installinfo - cp debian/winbind.lintian debian/winbind/usr/share/lintian/overrides/winbind -# dh_undocumented - dh_installchangelogs -Nlibpam-smbpass - DH_OPTIONS= dh_installchangelogs -plibpam-smbpass source/pam_smbpass/CHANGELOG + dh_undocumented + dh_installchangelogs dh_strip dh_link dh_compress @@ -296,13 +259,8 @@ binary-arch: build install chmod u+s debian/smbfs/usr/bin/smbumount # Set some reasonable default perms for the samba logdir. - chmod 0750 debian/samba/var/log/samba/ - chown root.adm debian/samba/var/log/samba/ - - # Get rid of those pesky .cvsignore files to make lintian happy - # (maybe we only need the "find ... -exec rm -f {} ;" we have - # in the binary-indep target?) peloy.- - find debian/ -name .cvsignore -exec rm -f {} \; + chmod 0750 $(DESTDIR)/var/log/samba/ + chown root.adm $(DESTDIR)/var/log/samba/ dh_installdeb # dh_makeshlibs diff --git a/packaging/Debian/debian/samba-common.conffiles b/packaging/Debian/debian/samba-common.conffiles new file mode 100755 index 00000000000..d14c1b51c1b --- /dev/null +++ b/packaging/Debian/debian/samba-common.conffiles @@ -0,0 +1 @@ +/etc/pam.d/samba diff --git a/packaging/Debian/debian/samba-common.config b/packaging/Debian/debian/samba-common.config index ed76b95cb84..c82dd887b06 100644 --- a/packaging/Debian/debian/samba-common.config +++ b/packaging/Debian/debian/samba-common.config @@ -3,42 +3,12 @@ # Source debconf library. . /usr/share/debconf/confmodule -# Function for grabbing a parameter from an smb.conf file -smbconf_retr() { - if [ -z "$1" ]; then - return - fi - - if [ -n "$2" ]; then - local FILE="$2" - fi - - if [ -z "$FILE" ]; then - return - fi - - sed -n -e" - s/^[[:space:]]*\[global\]/\[global\]/i - /^\[global\]/,/^[[:space:]]*\[/ { - s/^[[:space:]]*$1[[:space:]]*=[[:space:]]*//pi - }" $FILE \ - | tail -1 -} - FILE=/etc/samba/smb.conf db_title "Samba Server" -# We ask the question IFF the config contains complex options that could -# cause us to break the config. -if [ -f "$FILE" ] && grep -v dhcp.conf $FILE \ - | grep -qEi '\\$|^[[:space:]]*include[[:space:]]*=' -then - db_input high samba-common/do_debconf || true - db_go -else - db_set samba-common/do_debconf true -fi +db_input medium samba-common/do_debconf || true +db_go # If user doesn't want to use debconf to configure Samba the leave... db_get samba-common/do_debconf || true @@ -59,12 +29,16 @@ fi # Preload any values from the existing smb.conf file if [ -f $FILE ]; then - WORKGROUP=`smbconf_retr workgroup` + WORKGROUP=`grep -i '^[[:space:]]*workgroup[[:space:]]*=' $FILE \ + | sed -e's/^[[:space:]]*workgroup[[:space:]]*=[[:space:]]*//i' \ + | tail -1` if [ "$WORKGROUP" ]; then db_set samba-common/workgroup "$WORKGROUP" fi - ENCRYPT=`smbconf_retr "encrypt passwords"` + ENCRYPT=`grep -i '^[[:space:]]*encrypt passwords[[:space:]]*=' $FILE \ + | sed -e's/^[[:space:]]*encrypt passwords[[:space:]]*=[[:space:]]*//i' \ + | tail -1` if [ "$ENCRYPT" ]; then ENCRYPT=`echo $ENCRYPT | tr '[A-Z]' '[a-z]'` if [ "$ENCRYPT" = "yes" ]; then @@ -75,29 +49,6 @@ if [ -f $FILE ]; then db_set samba-common/encrypt_passwords "$ENCRYPT" fi - - CHARSET=`smbconf_retr "character set"` - CODEPAGE=`smbconf_retr "client code page"` - UNIXCHARSET=`smbconf_retr "unix charset"` - DOSCHARSET=`smbconf_retr "dos charset"` - - # If we're upgrading from an old version and there's no - # 'passdb backend' setting, add one. - if [ "$1" = "configure" -a -n "$2" ] \ - && dpkg --compare-versions "$2" lt 2.99.cvs.20020713-2 \ - && ! grep -q -i '^[[:space:]]*passdb backend[[:space:]]*=' $FILE - then - TMPFILE=/etc/samba/smb.conf.dpkg-tmp - sed -e' - s/^\([[:space:]]*\)\[global\]/\1\[global\]/i - s/^\([[:space:]]*\)encrypt passwords/\1encrypt passwords/i - /^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ { - /^[[:space:]]*encrypt passwords[[:space:]]*=/a \ - passdb backend = smbpasswd guest - }' < $FILE > ${TMPFILE} - chmod a+r ${TMPFILE} - mv -f ${TMPFILE} /etc/samba/smb.conf - fi fi # Get workgroup name @@ -108,47 +59,3 @@ db_go db_input medium samba-common/encrypt_passwords || true db_go -# Handle migrating character sets -if [ -n "$CHARSET" -a -z "$UNIXCHARSET" ] -then - 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 -fi - -if [ -n "$CODEPAGE" -a -z "$DOSCHARSET" ] -then - DOSCHARSET=CP`echo $CODEPAGE | sed -e's/[[:alpha:]]*//g'` - db_set samba-common/codepage "$DOSCHARSET" - # FIXME: should eventually be low. - db_input medium samba-common/codepage || true - db_go -fi - -DHCPPRIORITY=medium -#if [ "$DEBCONF_RECONFIGURE" = 1 ] && [ -f /sbin/dhclient3 ] -if [ -f /sbin/dhclient3 ] -then - DHCPPRIORITY=high -# TODO: see if we can detect that dhcp3-client is *going* to be installed, -# even if it isn't yet. -#elif dpkg-query -W --showformat='${Status}\n' dhcp3-client | grep ??? -# unknown ok not-installed ? -# DHCPPRIORITY=high -fi - -if [ ! -f $FILE ] || grep -q -i 'wins server' $FILE -then - # check the values before and after; unset the 'applied' flag - # if they don't match. - db_get samba-common/dhcp || true - OLDDHCP="$RET" - db_input $DHCPPRIORITY samba-common/dhcp || true - db_go - db_get samba-common/dhcp || true - if [ "$OLDDHCP" != "$RET" ]; then - db_fset samba-common/dhcp applied false - fi -fi diff --git a/packaging/Debian/debian/samba-common.dhcp b/packaging/Debian/debian/samba-common.dhcp deleted file mode 100644 index 3b2fa4ba191..00000000000 --- a/packaging/Debian/debian/samba-common.dhcp +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -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 - return - fi - - 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 - 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.dirs b/packaging/Debian/debian/samba-common.dirs index c089ad73573..7c8094b988a 100644 --- a/packaging/Debian/debian/samba-common.dirs +++ b/packaging/Debian/debian/samba-common.dirs @@ -1,2 +1 @@ etc/samba -etc/dhcp3/dhclient-enter-hooks.d diff --git a/packaging/Debian/debian/samba-common.files b/packaging/Debian/debian/samba-common.files index 9fb3a3a1623..0929836f6a6 100644 --- a/packaging/Debian/debian/samba-common.files +++ b/packaging/Debian/debian/samba-common.files @@ -1,15 +1,8 @@ -etc/samba/ -etc/dhcp3/ -etc/pam.d/ -usr/bin/net +etc/samba usr/bin/nmblookup usr/bin/smbpasswd -usr/bin/testparm +etc/pam.d/ usr/share/man/man1/nmblookup.1 -usr/share/man/man1/testparm.1 -usr/share/man/man5/lmhosts.5 -usr/share/man/man5/smb.conf.5 -usr/share/man/man7/samba.7 -usr/share/man/man8/net.8 usr/share/man/man8/smbpasswd.8 -usr/share/samba/ +usr/share/samba/codepages/ +usr/share/samba/smb.conf diff --git a/packaging/Debian/debian/samba-common.postinst b/packaging/Debian/debian/samba-common.postinst index 6c6eb9bf537..8d256f4146f 100644 --- a/packaging/Debian/debian/samba-common.postinst +++ b/packaging/Debian/debian/samba-common.postinst @@ -13,9 +13,6 @@ if [ ! -e /etc/samba/smb.conf ]; then cp -a /usr/share/samba/smb.conf /etc/samba/ fi -# Static tempfile location, dpkg-style -TMPFILE=/etc/samba/smb.conf.dpkg-tmp - # ------------------------- Debconf questions start --------------------- # Is the user configuring with debconf, or he/she prefers swat/manual @@ -26,17 +23,8 @@ if [ "${RET}" = "true" ]; then db_get samba-common/workgroup || true WORKGROUP="${RET}" - # Oh my GOD, this is ugly. Why would anyone put these - # characters in a workgroup name? Why, Lord, why??? - WORKGROUP=`echo $WORKGROUP | \ - sed -e's/\\\\/\\\\\\\\/g - s#/#\\\\/#g - s/&/\\\&/g - s/\\\$/\\\\\\\$/g'` - - sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i - /^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ \ - s/^\([[:space:]]*\)workgroup[[:space:]]*=.*/\1workgroup = ${WORKGROUP}/i" \ + TMPFILE=`mktemp -q /tmp/smb.conf.XXXXXX` + sed -e "s/^\([[:space:]]*\)workgroup[[:space:]]*=.*/\1workgroup = ${WORKGROUP}/" \ < /etc/samba/smb.conf >${TMPFILE} mv -f ${TMPFILE} /etc/samba/smb.conf @@ -44,90 +32,10 @@ if [ "${RET}" = "true" ]; then db_get samba-common/encrypt_passwords || true ENCRYPT_PASSWORDS="${RET}" - sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i - /^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ \ - s/^\([[:space:]]*\)encrypt passwords[[:space:]]*=.*/\1encrypt passwords = ${ENCRYPT_PASSWORDS}/i" \ + TMPFILE=`mktemp -q /tmp/smb.conf.XXXXXX` + sed -e "s/^\([[:space:]]*\)encrypt passwords[[:space:]]*=.*/\1encrypt passwords = ${ENCRYPT_PASSWORDS}/" \ < /etc/samba/smb.conf >${TMPFILE} mv -f ${TMPFILE} /etc/samba/smb.conf - - # Install DHCP support - db_get samba-common/dhcp && DHCPVAL="$RET" - db_fget samba-common/dhcp applied || true - if [ "$DHCPVAL" = true ] && [ "$RET" != true ] && \ - ! grep -q dhcp.conf /etc/samba/smb.conf - then - sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i - /^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ { - /wins server[[:space:]]*=/a \\ -\\ -# If we receive WINS server info from DHCP, override the options above. \\ - include = /etc/samba/dhcp.conf -}" < /etc/samba/smb.conf > ${TMPFILE} - mv -f ${TMPFILE} /etc/samba/smb.conf - elif [ "$RET" != true ] && grep -q dhcp.conf /etc/samba/smb.conf - then - : - # FIXME: here we /delete/ the lines? - fi - # Once we get here, the config has been applied, whatever - # it is. - if [ "$RET" != true ]; then - db_fset samba-common/dhcp applied true - fi - - # Update charset settings? - if ! grep -q "^[[:space:]]*unix charset[[:space:]]*=" /etc/samba/smb.conf - then - db_get samba-common/character_set || true - 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 \\ - unix charset = $UNIXCHARSET - }" < /etc/samba/smb.conf > ${TMPFILE} - mv -f ${TMPFILE} /etc/samba/smb.conf - fi - fi - - if grep -qi "^[[:space:]]*passdb backend[[:space:]]*=.*unixsam" /etc/samba/smb.conf - then - sed -e 's/^\([[:space:]]*\)passdb backend/\1passdb backend/i - /^[[:space:]]*passdb backend/ { - s/unixsam/guest/i - }' < /etc/samba/smb.conf > ${TMPFILE} - mv -f ${TMPFILE} /etc/samba/smb.conf - fi - - if ! grep -q "^[[:space:]]*dos charset[[:space:]]*=" /etc/samba/smb.conf - then - db_get samba-common/codepage || true - DOSCHARSET="${RET}" - if [ -n "$DOSCHARSET" ] - then - sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i - s/^\([[:space:]]*\)client code page/\1client code page/i - /^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ { - /^[[:space:]]*client code page[[:space:]]*=/c \\ - dos charset = $DOSCHARSET -}" < /etc/samba/smb.conf > ${TMPFILE} - mv -f ${TMPFILE} /etc/samba/smb.conf - fi - fi - - if dpkg --compare-versions "$2" lt 2.999+3.0.alpha20-4 \ - && ! grep -q "^[[:space:]]*panic action[[:space:]]*=" /etc/samba/smb.conf - then - sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i - /^[[:space:]]*\[global\]/a \\ -\\ -# Do something sensible when Samba crashes: mail the admin a backtrace\\ - panic action = /usr/share/samba/panic-action %d" < /etc/samba/smb.conf > ${TMPFILE} - mv -f ${TMPFILE} /etc/samba/smb.conf - fi - fi chmod a+r /etc/samba/smb.conf diff --git a/packaging/Debian/debian/samba-common.templates b/packaging/Debian/debian/samba-common.templates index e5f7b1ae0cc..c729b0b3243 100644 --- a/packaging/Debian/debian/samba-common.templates +++ b/packaging/Debian/debian/samba-common.templates @@ -1,66 +1,28 @@ -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 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. - -Template: samba-common/codepage -Type: string -_Description: Character Set for DOS clients - 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 - the character set you wish to use for this new option. In most cases, the - default chosen for you will be sufficient. Note that this option is not - needed to support Windows clients, it is only for DOS clients. If you - leave this option blank, your smb.conf will not be changed. - -Template: samba-common/dhcp -Type: boolean -Default: false -_Description: Modify smb.conf to use WINS settings from DHCP? - If your computer gets IP address information from a DHCP server on the - network, the DHCP server may also provide information about WINS servers - ("NetBIOS name servers") present on the network. This requires a - change to your smb.conf file so that DHCP-provided WINS settings will - automatically be read from /etc/samba/dhcp.conf. - . - You must have the dhcp3-client package installed to take advantage of this - feature. - Template: samba-common/do_debconf Type: boolean Default: true -_Description: Configure smb.conf through debconf? - 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 - Samba programs (nmbd and smbd.) Your current smb.conf contains an - 'include' line or an option that spans multiple lines, which could confuse - debconf and require you to edit your smb.conf by hand to get it working - again. - . - 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 periodic configuration enhancements. Therefore, use of - debconf is recommended if possible. +Description: Configure smb.conf through debconf? + 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 Samba programs (nmbd and smbd.) If you want to be + asked just a few questions then select "Yes" and continue with the + configuration. If you want to have full control, select "No" and + configure your smb.conf manually or through SWAT. Template: samba-common/workgroup Type: string -_Description: Workgroup/Domain Name? - 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 the security=domain setting. +Description: Workgroup/Domain Name? + 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 the security=domain setting. Template: samba-common/encrypt_passwords Type: boolean Default: true -_Description: Use password encryption? +Description: Use password encryption? Recent Windows clients communicate with SMB servers using encrypted - passwords. If you want to use clear text passwords you will need to change - a parameter in your Windows registry. It is recommended that you use - encrypted passwords. If you do, make sure you have a valid - /etc/samba/smbpasswd file and that you set passwords in there for each - user using the smbpasswd command. + passwords. If you want to use clear text passwords you will need to + change a parameter in your Windows registry. It is recommended that + you use encrypted passwords. If you do, make sure you have a valid + /etc/samba/smbpasswd file and that you set passwords in there for + each user using the smbpasswd command. diff --git a/packaging/Debian/debian/samba-common.templates.es b/packaging/Debian/debian/samba-common.templates.es new file mode 100755 index 00000000000..2db32ba9ad6 --- /dev/null +++ b/packaging/Debian/debian/samba-common.templates.es @@ -0,0 +1,46 @@ +Template: samba-common/do_debconf +Type: boolean +Default: true +Description: Configure smb.conf through debconf? + 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 + Samba programs (nmbd and smbd.) If you want to be asked just a few + questions then select "Yes" and continue with the configuration. If you + want to have full control, select "No" and configure your smb.conf + manually or through SWAT. +Description-es: ¿Configurar smb.conf mediante debconf? + El resto de la configuración de Samba trata sobre cuestiones que afectan + al contenido de /etc/samba/smb.conf, que es el fichero utilizado para + configurar los programas de Samba (nmbd y smbd). Si desea responder a las + preguntas, elija "Sí" y continuará con la configuración. Si quiere + tener control total, escoja "No" y configure smb.conf manualmente o con + SWAT. + +Template: samba-common/workgroup +Type: string +Description: Workgroup/Domain Name? + 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 the security=domain setting. +Description-es: Nombre del dominio o del grupo de trabajo. + Es el grupo de trabajo en el que aparecerá su servidor cuando se lo + pregunten los clientes de la red. Este parámetro también controla el + nombre de dominio que se usa con la configuración security=domain. + +Template: samba-common/encrypt_passwords +Type: boolean +Default: true +Description: Use password encryption? + Recent Windows clients communicate with SMB servers using encrypted + passwords. If you want to use clear text passwords you will need to change + a parameter in your Windows registry. It is recommended that you use + encrypted passwords. If you do, make sure you have a valid + /etc/samba/smbpasswd file and that you set passwords in there for each + user using the smbpasswd command. +Description-es: ¿Utilizar contraseñas cifradas? + Los clientes Windows más modernos se comunican con los servidores SMB + utilizando contraseñas cifradas. Si quiere usar contraseñas en texto + plano, tendrá que cambiar un parámetro en el registro de Windows. Es muy + recomendable usar cifrado en las contraseñas. Si elige hacerlo, compruebe + que tiene un fichero /etc/samba/smbpasswd válido y que ha puesto las + contraseñas con el programa smbpasswd. diff --git a/packaging/Debian/debian/samba-common.templates.fr b/packaging/Debian/debian/samba-common.templates.fr new file mode 100755 index 00000000000..e26fedaf5b7 --- /dev/null +++ b/packaging/Debian/debian/samba-common.templates.fr @@ -0,0 +1,47 @@ +Template: samba-common/do_debconf +Type: boolean +Default: true +Description: Configure smb.conf through debconf? + 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 + Samba programs (nmbd and smbd.) If you want to be asked just a few + questions then select "Yes" and continue with the configuration. If you + want to have full control, select "No" and configure your smb.conf + manually or through SWAT. +Description-fr: Voulez-vous configurer smb.conf avec debconf ? + La suite de la configuration de Samba pose des questions sur des paramètres + de /etc/samba/smb.conf, le fichier utilisé pour configurer les programmes + de Samba (nmbd et smbd). Si vous voulez bien répondre à quelques questions, + choisissez « Yes » et poursuivez la configuration. Si vous voulez un + contrôle total, choisissez « No » et configurez le fichier smb.conf + manuellement ou avec SWAT. + +Template: samba-common/workgroup +Type: string +Description: Workgroup/Domain Name? + 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 the security=domain setting. +Description-fr: Groupe de travail et nom de domaine ? + Ce paramètre indique le groupe de travail où les clients trouveront le + serveur. Il indique aussi le nom de domaine utilisé par le paramètre + « security=domain ». + +Template: samba-common/encrypt_passwords +Type: boolean +Default: true +Description: Use password encryption? + Recent Windows clients communicate with SMB servers using encrypted + passwords. If you want to use clear text passwords you will need to change + a parameter in your Windows registry. It is recommended that you use + encrypted passwords. If you do, make sure you have a valid + /etc/samba/smbpasswd file and that you set passwords in there for each + user using the smbpasswd command. +Description-fr: Voulez-vous chiffrer les mots de passe ? + Des clients Windows récents communiquent avec les serveurs SMB en utilisant + des mots de passe chiffrés. Si vous voulez utiliser des mots de passe sans + chiffrement, vous devez modifier un paramètre dans le registre de Windows. + Il est recommandé d'utiliser des mots de passe chiffrés. Si vous le faites, + n'oubliez pas de créer un fichier /etc/samba/smbpasswd et d'y mettre les + mots de passe de tous les utilisateurs qui se servent de la commande + smbpasswd. diff --git a/packaging/Debian/debian/samba-common.templates.pt_BR b/packaging/Debian/debian/samba-common.templates.pt_BR new file mode 100755 index 00000000000..69d5ed8d46f --- /dev/null +++ b/packaging/Debian/debian/samba-common.templates.pt_BR @@ -0,0 +1,47 @@ +Template: samba-common/do_debconf +Type: boolean +Default: true +Description: Configure smb.conf through debconf? + 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 + Samba programs (nmbd and smbd.) If you want to be asked just a few + questions then select "Yes" and continue with the configuration. If you + want to have full control, select "No" and configure your smb.conf + manually or through SWAT. +Description-pt_BR: Configurar smb.conf através do debconf ? + O restante da configuração do Samba lida com questões que afetam + parâmetros no arquivo /etc/samba/smb.conf, que é o arquivo usado para + configurar os programas Samba (nmbd e smbd). Caso você prefira somente + algumas perguntas selecione "Sim" e continue com a configuração. Se você + quer ter controle total, selecione "Não" e configure seu arquivo smb.conf + manualmente ou através da ferramenta SWAT. + +Template: samba-common/workgroup +Type: string +Description: Workgroup/Domain Name? + 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 the security=domain setting. +Description-pt_BR: Nome de Domínio/Grupo de Trabalho ? + Este parâmetro controla qual grupo de trabalho (workgroup) seu servidor + parecerá estar quando o mesmo for pesquisado por clientes. Note que este + parâmetro também controla o nome de Domínio usado com a configuração + security=domain. + +Template: samba-common/encrypt_passwords +Type: boolean +Default: true +Description: Use password encryption? + Recent Windows clients communicate with SMB servers using encrypted + passwords. If you want to use clear text passwords you will need to change + a parameter in your Windows registry. It is recommended that you use + encrypted passwords. If you do, make sure you have a valid + /etc/samba/smbpasswd file and that you set passwords in there for each + user using the smbpasswd command. +Description-pt_BR: Usar encriptação de senhas ? + Clientes Windows atuais comunicam-se com servidores SMB usando senhas + encriptadas. Caso você queira usar senhas em texto puro você precisará + modificar um parâmetro no registro de seu Windows. É recomendado que você + use senhas encriptadas. Se você usar, certifique-se de possuir um arquivo + /etc/samba/smbpasswd válido e que você definiu senhas no mesmo para cada + usuário utilizando o comando smbpasswd. diff --git a/packaging/Debian/debian/samba-doc.docs b/packaging/Debian/debian/samba-doc.docs index 4d2cec2ee22..68753e54f08 100644 --- a/packaging/Debian/debian/samba-doc.docs +++ b/packaging/Debian/debian/samba-doc.docs @@ -1,7 +1,9 @@ README docs/Samba-HOWTO-Collection.pdf docs/THANKS +docs/announce docs/history +docs/textdocs/ docs/faq/ docs/htmldocs/ docs/Registry/ diff --git a/packaging/Debian/debian/samba-doc.examples b/packaging/Debian/debian/samba-doc.examples index e71180364cf..e692dd810f0 100644 --- a/packaging/Debian/debian/samba-doc.examples +++ b/packaging/Debian/debian/samba-doc.examples @@ -1,2 +1,3 @@ +examples/ debian/wins2dns.awk -source/smbadduser +source/script/smbadduser diff --git a/packaging/Debian/debian/samba.conffiles b/packaging/Debian/debian/samba.conffiles new file mode 100755 index 00000000000..908a791a629 --- /dev/null +++ b/packaging/Debian/debian/samba.conffiles @@ -0,0 +1,3 @@ +/etc/cron.daily/samba +/etc/init.d/samba +/etc/logrotate.d/samba diff --git a/packaging/Debian/debian/samba.config b/packaging/Debian/debian/samba.config index 89792d436e4..d82e56ccf63 100644 --- a/packaging/Debian/debian/samba.config +++ b/packaging/Debian/debian/samba.config @@ -5,75 +5,27 @@ # Source debconf library. . /usr/share/debconf/confmodule -# Function for grabbing a parameter from an smb.conf file -smbconf_retr() { - if [ -z "$1" ]; then - return - fi - - if [ -n "$2" ]; then - local FILE="$2" - fi - - if [ -z "$FILE" ]; then - return - fi - - sed -n -e" - s/^[[:space:]]*\[global\]/\[global\]/i - /^\[global\]/,/^[[:space:]]*\[/ { - s/^[[:space:]]*$1[[:space:]]*=[[:space:]]*//pi - }" $FILE \ - | tail -1 -} - -FILE=/etc/samba/smb.conf - db_title "Samba Server" # Babysit users who don't read README.Debian -if [ -n "$2" ] && dpkg --compare-versions "$2" lt "2.2" -then - db_input medium samba/log_files_moved || true - db_go -fi +db_input medium samba/log_files_moved || true +db_go db_input medium samba/run_mode || true db_go - -# Offer to move the password database for existing users -if [ "$1" = "configure" -a -n "$2" -a -e /etc/samba/smbpasswd \ - -a ! -e /var/lib/samba/passdb.tdb ] \ - && dpkg --compare-versions "$2" lt 2.99.cvs.20020713-2 -then - FILE=/etc/samba/smb.conf - PASSDB="" - if [ -f "$FILE" ]; then - PASSDB=`smbconf_retr "passdb backend"` - fi - TDBPRIORITY=medium - if echo "$PASSDB" | grep -q ldapsam; then - TDBPRIORITY=low - fi - db_get samba-common/do_debconf || true - if [ "${RET}" = "false" ]; then - TDBPRIORITY=low - fi - - db_input "$TDBPRIORITY" samba/tdbsam || true -fi - # We vary the priority of the next question depending on whether -# the password database already exists... -if [ -e /etc/samba/smbpasswd -o -e /var/lib/samba/passdb.tdb ]; then +# /etc/samba/smbpasswd already exists... +if [ -f /etc/samba/smbpasswd ]; then PRIORITY="low" else # If 'encrypt passwords' is true in smb.conf, and smbpasswd # does not exist, default to yes here. FILE=/etc/samba/smb.conf if [ -f "$FILE" ]; then - ENCRYPT=`smbconf_retr "encrypt passwords"` + ENCRYPT=`grep -i '^[[:space:]]*encrypt passwords[[:space:]]*=' $FILE \ + | sed -e's/^[[:space:]]*encrypt passwords[[:space:]]*=[[:space:]]*//i' \ + | tail -1` if [ "$ENCRYPT" ]; then ENCRYPT=`echo $ENCRYPT | tr '[A-Z]' '[a-z]'` if [ "$ENCRYPT" = "yes" ]; then diff --git a/packaging/Debian/debian/samba.dirs b/packaging/Debian/debian/samba.dirs index a58e4e98929..0b57a891a76 100644 --- a/packaging/Debian/debian/samba.dirs +++ b/packaging/Debian/debian/samba.dirs @@ -1,7 +1,12 @@ +sbin usr/bin usr/sbin var/log/samba -var/lib/samba/printers/W32X86 -var/lib/samba/printers/WIN40 +var/lib/samba var/run/samba var/cache/samba +etc/pam.d +usr/share +usr/share/samba +lib/security +usr/lib/cups/backend diff --git a/packaging/Debian/debian/samba.docs b/packaging/Debian/debian/samba.docs index b8cc5419fb1..187fdd34058 100644 --- a/packaging/Debian/debian/samba.docs +++ b/packaging/Debian/debian/samba.docs @@ -1,5 +1,3 @@ README Roadmap WHATSNEW.txt -docs/htmldocs/diagnosis.html -docs/README.ldap diff --git a/packaging/Debian/debian/samba.files b/packaging/Debian/debian/samba.files deleted file mode 100644 index f52e6c5e4f7..00000000000 --- a/packaging/Debian/debian/samba.files +++ /dev/null @@ -1,19 +0,0 @@ -usr/bin/testprns -usr/bin/smbstatus -usr/bin/smbcontrol -usr/bin/tdbbackup -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 -usr/share/man/man5/smbpasswd.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 5d0f4671a00..0ad8bc07e13 100644 --- a/packaging/Debian/debian/samba.init +++ b/packaging/Debian/debian/samba.init @@ -16,6 +16,19 @@ SMBDPID=/var/run/samba/smbd.pid # clear conflicting settings from the environment unset TMPDIR +# If Samba is running from inetd then there is nothing to do +if [ "$RUN_MODE" = "inetd" ]; then + # Commented out to close bug #26884 (startup message is rather long). I + # have yet to think how to let the user know that if he/she is running + # Samba from inetd, he can't just "/etc/init.d/samba stop" to stop + # the Samba daemons. +# echo "Warning: Samba is not running as daemons. Daemons not restarted/stopped." +# echo "Daemons will start automatically by inetd (if you wanted to start Samba)." +# echo "If you want to stop Samba, get the PID's of all nmbd and smbd processes" +# echo "and send them a SIGTERM signal but keep in mind that inetd could restart them." + exit 0 +fi + # See if the daemons are there test -x /usr/sbin/nmbd -a -x /usr/sbin/smbd || exit 0 @@ -26,42 +39,21 @@ case "$1" in echo -n " nmbd" start-stop-daemon --start --quiet --exec /usr/sbin/nmbd -- -D - if [ "$RUN_MODE" != "inetd" ]; then - echo -n " smbd" - start-stop-daemon --start --quiet --exec /usr/sbin/smbd -- -D - fi + echo -n " smbd" + start-stop-daemon --start --quiet --exec /usr/sbin/smbd -- -D echo "." ;; stop) - echo -n "Stopping Samba daemons: " + echo -n "Stopping Samba daemons:" + echo -n " nmbd" start-stop-daemon --stop --quiet --pidfile $NMBDPID - # Wait a little and remove stale PID file - sleep 1 - if [ -f $NMBDPID ] && ! ps h `cat $NMBDPID` > /dev/null - then - # Stale PID file (nmbd was succesfully stopped), - # remove it (should be removed by nmbd itself IMHO.) - rm -f $NMBDPID - fi - echo -n "nmbd" - - if [ "$RUN_MODE" != "inetd" ]; then - start-stop-daemon --stop --quiet --pidfile $SMBDPID - # Wait a little and remove stale PID file - sleep 1 - if [ -f $SMBDPID ] && ! ps h `cat $SMBDPID` > /dev/null - then - # Stale PID file (nmbd was succesfully stopped), - # remove it (should be removed by smbd itself IMHO.) - rm -f $SMBDPID - fi - echo -n " smbd" - fi - echo "." + echo -n " smbd" + start-stop-daemon --stop --quiet --pidfile $SMBDPID + echo "." ;; reload) echo -n "Reloading /etc/samba/smb.conf (smbd only)" @@ -70,9 +62,19 @@ case "$1" in echo "." ;; restart|force-reload) - $0 stop - sleep 1 - $0 start + echo -n "Restarting Samba daemons:" + + echo -n " nmbd" + start-stop-daemon --stop --quiet --pidfile $NMBDPID + sleep 2 + start-stop-daemon --start --quiet --exec /usr/sbin/nmbd -- -D + + echo -n " smbd" + start-stop-daemon --stop --quiet --pidfile $SMBDPID + sleep 2 + start-stop-daemon --start --quiet --exec /usr/sbin/smbd -- -D + + echo "." ;; *) echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload}" diff --git a/packaging/Debian/debian/samba.logrotate b/packaging/Debian/debian/samba.logrotate index f90437bf2ad..d264ce3d71b 100644 --- a/packaging/Debian/debian/samba.logrotate +++ b/packaging/Debian/debian/samba.logrotate @@ -3,7 +3,7 @@ missingok rotate 7 postrotate - invoke-rc.d --quiet samba reload > /dev/null + killall -q -HUP smbd || true endscript compress notifempty @@ -14,7 +14,7 @@ missingok rotate 7 postrotate - [ -f /var/run/samba/nmbd.pid ] && kill -HUP `cat /var/run/samba/nmbd.pid` + killall -q -HUP nmbd || true endscript compress notifempty diff --git a/packaging/Debian/debian/samba.pamd b/packaging/Debian/debian/samba.pamd index e2c7a99356d..1a5a14c7089 100644 --- a/packaging/Debian/debian/samba.pamd +++ b/packaging/Debian/debian/samba.pamd @@ -1,3 +1,5 @@ -@include common-auth -@include common-account -@include common-session +auth required pam_unix.so nullok +account required pam_unix.so +session required pam_unix.so +password required pam_unix.so + diff --git a/packaging/Debian/debian/samba.postinst b/packaging/Debian/debian/samba.postinst index 1a25290ed27..772513f4c78 100644 --- a/packaging/Debian/debian/samba.postinst +++ b/packaging/Debian/debian/samba.postinst @@ -28,7 +28,6 @@ INITCONFFILE=/etc/default/samba # them to be readable only by root. umask 022 - # Generate configuration file if it does not exist, using default values. [ -r "${INITCONFFILE}" ] || { echo Generating ${INITCONFFILE}... >&2 @@ -42,7 +41,7 @@ umask 022 # This is a POSIX shell fragment # -# How should Samba (smbd) run? Possible values are "daemons" +# How should Samba (nmbd and smbd) run? Possible values are "daemons" # or "inetd". RUN_MODE="" EOFMAGICNUMBER1234 @@ -97,113 +96,65 @@ then mv /etc/samba/secrets.tdb /var/lib/samba/ fi -# If upgrading from a previous 2.999 snapshot, move the passdb.tdb -# database into /var/lib. - -if [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.999+3.0.alpha23-5 \ - && [ -e /etc/samba/passdb.tdb -a ! -e /var/lib/samba/passdb.tdb ] -then - mv /etc/samba/passdb.tdb /var/lib/samba/ -fi - # --- End of FHS migration code --- -# If upgrading from a previous 2.999 snapshot, clear the broken -# registry.tdb file. -if [ -n "$2" ] && dpkg --compare-versions "$2" gt 2.99.cvs.20020713-1 \ - && dpkg --compare-versions "$2" lt 2.999+3.0cvs20020805-1 -then - rm -f /var/lib/samba/registry.tdb -fi - # ------------------------- Debconf questions start --------------------- # Run Samba as daemons or from inetd? db_get samba/run_mode || true RUN_MODE="${RET}" -TMPFILE=/etc/default/samba.dpkg-tmp +TMPFILE=`mktemp -q /tmp/samba.config.XXXXXX` sed -e "s/^[[:space:]]*RUN_MODE[[:space:]]*=.*/RUN_MODE=\"${RUN_MODE}\"/" \ < ${INITCONFFILE} >${TMPFILE} -chmod a+r ${TMPFILE} mv -f ${TMPFILE} ${INITCONFFILE} # Generate a smbpasswd file? db_get samba/generate_smbpasswd || true GENERATE_SMBPASSWD="${RET}" -db_get samba/tdbsam || true -PDB_MIGRATE="${RET}" - # Done with debconf now. db_stop -umask 066 - -# FIXME: disable if ldapsam support is enabled? -# FIXME: we don't want to pass these through the smbpasswd backend, -# some of the faking can cause us problems! -if [ "${GENERATE_SMBPASSWD}" = "true" -a ! -e /var/lib/samba/passdb.tdb -a ! -e /etc/samba/smbpasswd ]; then +if [ "${GENERATE_SMBPASSWD}" = "true" -a ! -e /etc/samba/smbpasswd ]; then getent passwd | /usr/sbin/mksmbpasswd > /etc/samba/smbpasswd - pdbedit -i smbpasswd -e tdbsam - rm /etc/samba/smbpasswd -fi - -umask 022 - -if [ -n "$2" -a -e /etc/samba/smbpasswd \ - -a ! -e /var/lib/samba/passdb.tdb -a "$PDB_MIGRATE" = "true" ] \ - && dpkg --compare-versions "$2" lt 2.99.cvs.20020713-2 -then - umask 066 - pdbedit -i smbpasswd -e tdbsam - rm /etc/samba/smbpasswd - umask 022 - - # The database has been moved, now make sure we can still find it. - PASSDB=`sed -n -e"s/^[[:space:]]*\[global\]/\[global\]/i - /^\[global\]/,/^[[:space:]]*\[/ \ - s/^[[:space:]]*passdb backend[[:space:]]*=[[:space:]]*//pi" \ - < /etc/samba/smb.conf \ - | tail -1` - if echo "$PASSDB" | egrep -q "(^|[[:space:]])smbpasswd"; then - if ! echo "$PASSDB" | egrep -q "(^|[[:space:]])tdbsam"; then - PASSDB=`echo $PASSDB | sed -e's/\(^\|[[:space:]]\)smbpasswd/\1tdbsam/'` - fi - fi - if ! echo "$PASSDB" | egrep -q "(^|[[:space:]])tdbsam"; then - PASSDB="tdbsam $PASSDB" - fi - TMPFILE=/etc/samba/smb.conf.dpkg-tmp - sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i - /^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ \ - s/^\([[:space:]]*\)passdb backend[[:space:]]*=.*/\1passdb backend = ${PASSDB}/i" \ - < /etc/samba/smb.conf >${TMPFILE} - chmod a+r ${TMPFILE} - mv -f ${TMPFILE} /etc/samba/smb.conf + chmod 600 /etc/samba/smbpasswd fi # ------------------------- Debconf questions end --------------------- -# Handle removal of nmbd from inetd.conf, which is no longer a supported -# configuration. -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. -if [ -z "$2" ]; then +if [ "$1" = "configure" -a -z "$2" ]; then + update-inetd --add "#<off># netbios-ns dgram udp wait root /usr/sbin/tcpd /usr/sbin/nmbd -a" update-inetd --add "#<off># netbios-ssn stream tcp nowait root /usr/sbin/tcpd /usr/sbin/smbd" fi if [ "$RUN_MODE" = "daemons" ]; then + update-inetd --disable netbios-ns update-inetd --disable netbios-ssn else + update-inetd --enable netbios-ns 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 \) -a \ + "$RUN_MODE" = "daemons" ]; 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 @@ -223,6 +174,10 @@ 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 b79fe1d0099..17503df6b7d 100644 --- a/packaging/Debian/debian/samba.postrm +++ b/packaging/Debian/debian/samba.postrm @@ -1,11 +1,17 @@ -#!/bin/sh -e +#!/bin/sh # # if [ "$1" = purge ]; then - # Remove Samba's state files, both volatile and non-volatile - rm -Rf /var/run/samba/ /var/cache/samba/ /var/lib/samba + # Remove WINS.DAT, BROWSE.DAT and lock information file + rm -Rf /var/samba/ + + # Remove any files in the old and obsolete /var/lock/samba directory + rm -Rf /var/lock/samba/ + + # Remove files left in /etc/samba/ + rm -Rf /etc/samba/MACHINE.SID # Remove log files rm -Rf /var/log/samba/ @@ -16,11 +22,13 @@ if [ "$1" = purge ]; then # Remove NetBIOS entries from /etc/inetd.conf update-inetd --remove netbios-ssn + update-inetd --remove netbios-ns + update-rc.d samba remove >/dev/null else # Not purging, do not remove NetBIOS entries from /etc/inetd.conf update-inetd --disable netbios-ssn - + update-inetd --disable netbios-ns fi #DEBHELPER# diff --git a/packaging/Debian/debian/samba.preinst b/packaging/Debian/debian/samba.preinst new file mode 100755 index 00000000000..8f6c3e210a7 --- /dev/null +++ b/packaging/Debian/debian/samba.preinst @@ -0,0 +1,50 @@ +#!/bin/sh +# +# The purpose of the preinst script for the samba package is to help +# the migration of the conffiles smb.conf and smbpasswd from their +# old location (/etc/) to their new location (/etc/samba/). +# +# Thanks to Ben Pfaff <pfaffben@pilot.msu.edu> for sharing on debian-devel +# his ideas about how to move conffiles to new locations. +# +# + +# First see if a smb.conf file currently exists. +test -f /etc/smb.conf || exit 0 + +# Now see if a smb.conf file exists in the new location. +test -e /etc/samba/smb.conf && exit 0 + +# +# Move smb.conf conffile from its old location (/etc/) to its new one +# (/etc/samba). +# +# If conffile exists in old location AND conffile does not exist on new +# location then... +# +if [ -f /etc/smb.conf -a ! -e /etc/samba/smb.conf ]; then + # The new location for the conffile should not exist yet, so we create the + # dir. + mkdir -p /etc/samba + + # Finally, move the conffile to its new location. + mv /etc/smb.conf /etc/samba/smb.conf +fi + +# +# Move smbpasswd conffile from its old location (/etc/) to its new one +# (/etc/samba). +# +# If conffile exists in old location AND conffile does not exist on new +# location then... +# +if [ -f /etc/smbpasswd -a ! -e /etc/samba/smbpasswd ]; then + # The new location for the conffile should not exist yet, so we create the + # dir. + mkdir -p /etc/samba + + # Finally, move the conffile to its new location. + mv /etc/smbpasswd /etc/samba/smbpasswd +fi + +#DEBHELPER# diff --git a/packaging/Debian/debian/samba.prerm b/packaging/Debian/debian/samba.prerm index ab62c706d85..ec30ff6687b 100644 --- a/packaging/Debian/debian/samba.prerm +++ b/packaging/Debian/debian/samba.prerm @@ -1,10 +1,26 @@ #!/bin/sh -e -if [ "$1" = upgrade -a -n "$2" ] && dpkg --compare-versions "$2" lt 2.99 \ - && [ -e /var/lib/samba/passdb.tdb -a ! -e /etc/samba/smbpasswd ] +# 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 - pdbedit -i tdbsam -e smbpasswd - rm -f /var/lib/samba/passdb.tdb + # 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 read /etc/default/samba to know if we're running from inetd or as +# daemons so we don't call the init script if we are running from inetd. +[ -r /etc/default/samba ] && . /etc/default/samba + +# We call the init script to stop Samba only if we are running as daemons. +[ -x /etc/init.d/samba -a "$RUN_MODE" != "inetd" ] && /etc/init.d/samba stop + #DEBHELPER# diff --git a/packaging/Debian/debian/samba.templates b/packaging/Debian/debian/samba.templates index ce503aea5c4..9deeaa42b04 100644 --- a/packaging/Debian/debian/samba.templates +++ b/packaging/Debian/debian/samba.templates @@ -1,50 +1,33 @@ +Template: samba/run_mode +Type: select +Default: daemons +Choices: daemons, inetd +Description: How do you want to run Samba? + The Samba services (nmbd and smbd) can run as normal daemons or + from inetd. Running as daemons is the recommended approach. + Template: samba/generate_smbpasswd Type: boolean Default: false -_Description: Create samba password database, /var/lib/samba/passdb.tdb? - To be compatible with the defaults in most versions of Windows, Samba must - be configured to use encrypted passwords. This requires user passwords to - be stored in a file separate from /etc/passwd. This file can be created - automatically, but the passwords must be added manually (by you or the - user) by running smbpasswd, and you must arrange to keep it up-to-date in - the future. If you do not create it, you will have to reconfigure samba - (and probably your client machines) to use plaintext passwords. See - /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc - package for more details. +Description: Create samba password file, /etc/samba/smbpasswd? + To be compatible with the defaults in most versions of Windows, + Samba must be configured to use encrypted passwords. This requires + user passwords to be stored in a file separate from /etc/passwd. + This file can be created automatically, but the passwords must + be added manually (by you or the user) by running smbpasswd, + and you must arrange to keep it up-to-date in the future. If + you do not create it, you will have to reconfigure samba + (and probably your client machines) to use plaintext passwords. + See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the + samba-doc package for more details. Template: samba/log_files_moved Type: note -_Description: Samba's log files have moved. - Starting with the first packages of Samba 2.2 for Debian the log files for - both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The - names of the files are log.nmbd and log.smbd, for nmbd and smbd - respectively. +Description: Samba's log files have moved. + Starting with the first packages of Samba 2.2 for Debian the log + files for both Samba daemons (nmbd and smbd) are now stored in + /var/log/samba/. The names of the files are log.nmbd and log.smbd, + for nmbd and smbd respectively. . - The old log files that were in /var/log/ will be moved to the new location - for you. - -Template: samba/nmbd_from_inetd -Type: note -_Description: Running nmbd from inetd is no longer supported - Your system was previously configured to start nmbd and smbd from inetd. - As of version 2.999+3.0.alpha20-4, nmbd will no longer be started from - inetd. If you have modified your /etc/init.d/samba startup script, you - may need to adjust it by hand now so that nmbd will start. - -Template: samba/run_mode -Type: select -_Choices: daemons, inetd -Default: daemons -_Description: How do you want to run Samba? - The Samba daemon smbd can run as a normal daemon or from inetd. Running as - a daemon is the recommended approach. - -Template: samba/tdbsam -Type: boolean -Default: false -_Description: Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb? - Samba 3.0 introduces a newer, more complete SAM database interface which - supersedes the /etc/samba/smbpasswd file. Would you like your existing - smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you? If you - plan to use another pdb backend (e.g., LDAP) instead, you should answer - 'no' here. + The old log files that were in /var/log/ will be moved to + the new location for you. diff --git a/packaging/Debian/debian/samba.templates.es b/packaging/Debian/debian/samba.templates.es new file mode 100755 index 00000000000..a3ea2c0e8bb --- /dev/null +++ b/packaging/Debian/debian/samba.templates.es @@ -0,0 +1,56 @@ +Template: samba/run_mode +Type: select +Default: daemons +Choices: daemons, inetd +Choices-es: demonios, inetd +Description: How do you want to run Samba? + The Samba services (nmbd and smbd) can run as normal daemons or + from inetd. Running as daemons is the recommended approach. +Description-es: ¿Cómo quiere que Samba se ejecute? + Los servicios Samba (nmbd y smbd) pueden ejecutarse como demonios + normales o desde el inetd. Se recomienda que se ejecuten como demonios + independientes. + +Template: samba/generate_smbpasswd +Type: boolean +Default: false +Description: Create samba password file, /etc/samba/smbpasswd? + To be compatible with the defaults in most versions of Windows, + Samba must be configured to use encrypted passwords. This requires + user passwords to be stored in a file separate from /etc/passwd. + This file can be created automatically, but the passwords must + be added manually (by you or the user) by running smbpasswd, + and you must arrange to keep it up-to-date in the future. If + you do not create it, you will have to reconfigure samba + (and probably your client machines) to use plaintext passwords. + See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the + samba-doc package for more details. +Description-es: ¿Crear el fichero de contraseñas /etc/samba/smbpasswd? + Para manterner compatibilidad con el comportamiento por defecto de la + mayoria de los sistemas Windows, hay que configurar Samba para que use + contraseñas encriptadas, lo cual requiere la creación de un fichero + distinto del /etc/passwd donde se guarden las contraseñas de los usuarios. + El fichero se puede crear automaticamente, aunque es necesario añadir + las contraseñas manualmente (por usted o por el usuario) usando + el programa `smbpasswd', y usted debe hacer arreglos para mantener las + contraseñas al día. Si no se crea este fichero, es imprescindible + configurar Samba (y posiblemente los ordenadores Windows) para usar + contraseñas no cifradas. Véa + /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html del paquete samba-doc + para más información. + +Template: samba/log_files_moved +Type: note +Description: Samba's log files have moved. + Starting with the first packages of Samba 2.2 for Debian the log + files for both Samba daemons (nmbd and smbd) are now stored in + /var/log/samba/. The names of the files are log.nmbd and log.smbd, + for nmbd and smbd respectively. + . + The old log files that were in /var/log/ will be moved to + the new location for you. +Description-es: Se han movido los ficheros de registro de Samba. + A partir de los primeros paquetes de Samba 2.2 para Debian, + los ficheros de registro para los dos demonios del Samba (nmbd y smbd) + se encuentran en /var/log/samba/. Los nombres de estos ficheros + son log.nmbd y log.smbd, para nmbd y smbd respectivamente. diff --git a/packaging/Debian/debian/samba.templates.fr b/packaging/Debian/debian/samba.templates.fr new file mode 100755 index 00000000000..4a207750c24 --- /dev/null +++ b/packaging/Debian/debian/samba.templates.fr @@ -0,0 +1,57 @@ +Template: samba/run_mode +Type: select +Choices: daemons, inetd +Choices-fr: démons, inetd +Default: daemons +Description: How do you want to run Samba? + The Samba services (nmbd and smbd) can run as normal daemons or from + inetd. Running as daemons is the recommended approach. +Description-fr: Comment voulez-vous lancer Samba ? + Les services de Samba (nmbd et smbd) peuvent s'exécuter en tant que démons + classiques ou bien être lancés par inetd. L'approche recommandée est qu'ils + s'exécutent en tant que démons. + +Template: samba/generate_smbpasswd +Type: boolean +Default: false +Description: Create samba password file, /etc/samba/smbpasswd? + To be compatible with the defaults in most versions of Windows, + Samba must be configured to use encrypted passwords. This requires + user passwords to be stored in a file separate from /etc/passwd. + This file can be created automatically, but the passwords must + be added manually (by you or the user) by running smbpasswd, + and you must arrange to keep it up-to-date in the future. If + you do not create it, you will have to reconfigure samba + (and probably your client machines) to use plaintext passwords. + See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the + samba-doc package for more details. +Description-fr: Faut-il créer un fichier /etc/samba/smbpasswd ? + Pour préserver la compatibilité avec le comportement par défaut de la + plupart des systèmes Windows, Samba doit utiliser + les mots de passe chiffrés. Cela exige la création d'un fichier, + distinct du fichier /etc/passwd, pour mettre les mots de passe des + utilisateurs. Ce fichier peut être créé automatiquement, mais + quelqu'un (vous ou l'utilisateur) devra ajouter les mots de + passe manuellement en utilisant la commande smbpasswd ; et vous devrez + maintenir à jour ce fichier. Si vous ne voulez pas créer le fichier + maintenant, Samba (et peut-être les ordinateurs Windows) + devra utiliser des mots de passe non chiffrés. + Voyez /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html dans le + paquet samba-doc pour plus de détails. + +Template: samba/log_files_moved +Type: note +Description: Samba's log files have moved. + Starting with the first packages of Samba 2.2 for Debian the log files for + both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The + names of the files are log.nmbd and log.smbd, for nmbd and smbd + respectively. + . + The old log files that were in /var/log/ will be moved to the new location + for you. +Description-fr: Les fichiers-journaux de Samba ont changé de place. + À partir des premiers paquets de Samba 2.2 pour Debian, les fichiers-journaux + des démons nmbd et smbd se trouvent dans /var/log/samba/. Les noms de ces + fichiers sont log.nmbd et log.smbd pour, respectivement, nmbd et smbd. + . + Les anciens fichiers-journaux dans /var/log/ seront mis au bon endroit. diff --git a/packaging/Debian/debian/samba.templates.pt_BR b/packaging/Debian/debian/samba.templates.pt_BR new file mode 100755 index 00000000000..597c4a55e35 --- /dev/null +++ b/packaging/Debian/debian/samba.templates.pt_BR @@ -0,0 +1,57 @@ +Template: samba/run_mode +Type: select +Choices: daemons, inetd +Choices-pt_BR: +Default: daemons +Description: How do you want to run Samba? + The Samba services (nmbd and smbd) can run as normal daemons or from + inetd. Running as daemons is the recommended approach. +Description-pt_BR: Como você deseja que o Samba seja executado ? + Os serviços Samba (nmbd e smbd) podem ser executados como daemons normais + ou a partir do inetd. Executá-los como daemons é o método recomendado. + +Template: samba/generate_smbpasswd +Type: boolean +Default: false +Description: Create samba password file, /etc/samba/smbpasswd? + To be compatible with the defaults in most versions of Windows, Samba must + be configured to use encrypted passwords. This requires user passwords to + be stored in a file separate from /etc/passwd. This file can be created + automatically, but the passwords must be added manually (by you or the + user) by running smbpasswd, and you must arrange to keep it up-to-date in + the future. If you do not create it, you will have to reconfigure samba + (and probably your client machines) to use plaintext passwords. See + See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the + samba-doc package for more details. +Description-pt_BR: Gerar o arquivo de senhas /etc/samba/smbpasswd ? + Para compatibilidade com os padrões adotados em todas as versões + atuais do Windows o Samba deve ser configurado para usar senhas + encriptadas. Isso requer que as senhas dos usuários sejam armazenadas + em um arquivo diferente de /etc/passwd. Esse arquivo pode ser criado + automaticamente, mas as senhas devem ser definidas manualmente (por + você ou pelo usuário) executando-se o utilitário smbpasswd. Você deve + certificar-se de manter esse arquivo atualizado futuramente. + Caso você não crie esse arquivo, você terá que reconfigurar o + Samba (e provavelmente suas máquinas clientes) para utilização de senhas + em texto puro. Consulte a documentação em + /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html do pacote samba-doc + para maiores detalhes. + +Template: samba/log_files_moved +Type: note +Description: Samba's log files have moved. + Starting with the first packages of Samba 2.2 for Debian the log files for + both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The + names of the files are log.nmbd and log.smbd, for nmbd and smbd + respectively. + . + The old log files that were in /var/log/ will be moved to the new location + for you. +Description-pt_BR: Arquivos de log do Samba foram movidos. + Desde os primeiros pacotes Debian do Samba 2.2 os arquivos de log para + ambos os daemons Samba (nmbd e smbd) são armazenados no diretório + /var/log/samba/. Os nomes desses arquivos são log.nmbd e log.smbd, para + o nmbd e para o smbd, respectivamente. + . + Os antigos arquivos de log que estavam em /var/log/ serão movidos para + a nova localização automaticamente para você. diff --git a/packaging/Debian/debian/scripts/patch-source b/packaging/Debian/debian/scripts/patch-source index a8559b41676..f514417e5e1 100755 --- a/packaging/Debian/debian/scripts/patch-source +++ b/packaging/Debian/debian/scripts/patch-source @@ -3,26 +3,13 @@ # for patch in debian/patches/*.patch; do - echo '->'`basename $patch`: - patch -p1 --ignore-whitespace < $patch + patch -p1 < $patch done -# This code is currently not used because it creates a long version -# number string. For now we're sticking to <upstream version>-Debian, -# as in 3.0.0rc2-Debian. peloy@debian.org.- - -# ---- Begin unused code ---- -# Get Debian version number from 1st line of the Debian changelog -#DEBIAN_VERSION=`sed -n -e '1s/^.*(\(.*\)).*$/\1/p' debian/changelog` - -# Insert Debian version number in source/VERSION, which will then be -# used to create source/include/version.h. -#TMPFILE=source/VERSION.debian -#sed -e "s/^\(SAMBA_VERSION_VENDOR_SUFFIX=\).*$/\1\"Debian-${DEBIAN_VERSION}\"/" source/VERSION > ${TMPFILE} -#mv -f ${TMPFILE} source/VERSION -# ---- End unused code ---- +cat debian/changelog | perl -pi -e '($version) = <STDIN> =~/\((.*)\)/; \ + s/\".*\"/\"$version for Debian\"/' source/include/version.h # Regenerate configure only if it is older than configure.in -[ source/configure -ot source/configure.in ] && (cd source && sh ./autogen.sh) +[ source/configure -ot source/configure.in ] && (cd source && autoconf) exit 0 diff --git a/packaging/Debian/debian/scripts/unpatch-source b/packaging/Debian/debian/scripts/unpatch-source index d3681cfa504..057ae43c3b4 100755 --- a/packaging/Debian/debian/scripts/unpatch-source +++ b/packaging/Debian/debian/scripts/unpatch-source @@ -5,16 +5,12 @@ # We want to reverse the patches in the opposite order we applied # them, hence the 'ls|sort -r'. for patch in `ls debian/patches/*.patch | sort -r`; do - patch -p1 -R --ignore-whitespace < $patch + patch -p1 -R < $patch done -# Unused code. See comment in the patch-source script. - -#TMPFILE=source/VERSION.debian -#sed -e "s/^\(SAMBA_VERSION_VENDOR_SUFFIX=\).*$/\1/" source/VERSION > ${TMPFILE} -#mv -f ${TMPFILE} source/VERSION +perl -pi -e's/-.* for Debian//' source/include/version.h # Regenerate configure only if it is older than configure.in -[ source/configure -ot source/configure.in ] && (cd source && autoheader && autoconf) +[ source/configure -ot source/configure.in ] && (cd source && autoconf) exit 0 diff --git a/packaging/Debian/debian/smb.conf b/packaging/Debian/debian/smb.conf index 8a75979945a..e9fc0607ace 100644 --- a/packaging/Debian/debian/smb.conf +++ b/packaging/Debian/debian/smb.conf @@ -21,31 +21,24 @@ [global] -## Browsing/Identification ### - -# Change this to the workgroup/NT-domain name your Samba server will part of +# Change this for 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) -# Windows Internet Name Serving Support Section: -# WINS Support - Tells the NMBD component of Samba to enable its WINS Server -; wins support = no - -# WINS Server - Tells the NMBD components of Samba to be a WINS Client -# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both -; wins server = w.x.y.z - -# This will prevent nmbd to search for NetBIOS names through DNS. - dns proxy = no +# If you want to automatically load your printer list rather +# than setting them up individually then you'll need this +; load printers = yes -# What naming service and in what order should we use to resolve host names -# to IP addresses -; name resolve order = lmhosts host wins bcast +# You may wish to override the location of the printcap file +; printcap name = /etc/printcap +# 'printing = cups' works nicely +; printing = bsd -#### Debugging/Accounting #### +; guest account = nobody + invalid users = root # This tells Samba to use a separate log file for each machine # that connects @@ -54,114 +47,109 @@ # Put a capping on the size of the log files (in Kb). max log size = 1000 -# If you want Samba to only log through syslog then set the following -# parameter to 'yes'. +# 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. ; syslog only = no # We want Samba to log a minimum amount of information to syslog. Everything -# should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log +# should go to /var/log/samba/log.{smb,nmb} instead. If you want to log # through syslog you should set the following parameter to something higher. syslog = 0 -# Do something sensible when Samba crashes: mail the admin a backtrace - panic action = /usr/share/samba/panic-action %d - - -####### Authentication ####### - # "security = user" is always a good idea. This will require a Unix account # in this server for every user accessing the server. See -# /usr/share/doc/samba-doc/htmldocs/ServerType.html in the samba-doc -# package for details. +# security_level.txt for details. ; security = user -# You may wish to use password encryption. See the section on -# 'encrypt passwords' in the smb.conf(5) manpage before enabling. +# You may wish to use password encryption. Please read ENCRYPTION.txt, +# Win95.txt and WinNT.txt in the Samba documentation. Do not enable this +# option unless you have read those documents 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 . - -# 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 +# 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 +# OS Level determines the precedence of this server in master browser +# elections. The default value should be reasonable +; os level = 20 -########## Printing ########## +# 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 -# If you want to automatically load your printer list rather -# than setting them up individually then you'll need this -; load printers = yes +# Preferred Master causes Samba to force a local browser election on startup +# and gives it a slightly higher chance of winning the election +; preferred master = auto -# lpr(ng) printing. You may wish to override the location of the -# printcap file -; printing = bsd -; printcap name = /etc/printcap +# --- End of Browser Control Options --- -# CUPS printing. See also the cupsaddsmb(8) manpage in the -# cupsys-client package. -; printing = cups -; printcap name = cups +# Windows Internet Name Serving Support Section: +# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server +; wins support = no -# 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 +# WINS Server - Tells the NMBD components of Samba to be a WINS Client +# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both +; wins server = w.x.y.z +# This will prevent nmbd to search for NetBIOS names through DNS. + dns proxy = no -######## File sharing ######## +# What naming service and in what order should we use to resolve host names +# to IP addresses +; name resolve order = lmhosts host wins bcast # 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 -############ Misc ############ - -# Using the following line enables you to customise your configuration -# on a per machine basis. The %m gets replaced with the netbios name -# of the machine that is connecting -; include = /home/samba/etc/smb.conf.%m +# 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 . -# 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 +# 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 # The following parameter is useful only if you have the linpopup package # installed. The samba maintainer and the linpopup maintainer are # working to ease installation and configuration of linpopup and samba. ; message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' & -# Domain Master specifies Samba to be the Domain Master Browser. If this -# machine will be configured as a BDC (a secondary logon server), you -# must set this to 'no'; otherwise, the default behavior is recommended. -; domain master = auto + obey pam restrictions = yes # Some defaults for winbind (make sure you're not using the ranges # for something else.) -; idmap uid = 10000-20000 -; idmap gid = 10000-20000 +; winbind uid = 10000-20000 +; winbind gid = 10000-20000 ; template shell = /bin/bash #======================= Share Definitions ======================= @@ -200,19 +188,6 @@ 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 96e8945bf3d..5a660fc8d4e 100644 --- a/packaging/Debian/debian/smbclient.files +++ b/packaging/Debian/debian/smbclient.files @@ -2,14 +2,8 @@ usr/bin/smbclient usr/bin/smbtar 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 deleted file mode 100644 index e210fae55ea..00000000000 --- a/packaging/Debian/debian/swat.config +++ /dev/null @@ -1,11 +0,0 @@ -#/bin/sh -e -# -# - -# Source debconf library. -. /usr/share/debconf/confmodule - -db_title "Samba Web Administration Tool (SWAT)" - -db_input medium swat/smb_conf_warn || true -db_go diff --git a/packaging/Debian/debian/swat.docs b/packaging/Debian/debian/swat.docs new file mode 100755 index 00000000000..afbfcf0c612 --- /dev/null +++ b/packaging/Debian/debian/swat.docs @@ -0,0 +1 @@ +swat/README diff --git a/packaging/Debian/debian/swat.templates b/packaging/Debian/debian/swat.templates deleted file mode 100644 index 3407f7efbc1..00000000000 --- a/packaging/Debian/debian/swat.templates +++ /dev/null @@ -1,6 +0,0 @@ -Template: swat/smb_conf_warn -Type: note -_Description: Your smb.conf will be re-written! - SWAT will rewrite your smb.conf file. It will rearrange the entries and - delete all comments, include= and copy= options. If you have a carefully - crafted smb.conf then back it up or don't use SWAT! diff --git a/packaging/Debian/debian/winbind.conffiles b/packaging/Debian/debian/winbind.conffiles new file mode 100755 index 00000000000..c9adbfff174 --- /dev/null +++ b/packaging/Debian/debian/winbind.conffiles @@ -0,0 +1,2 @@ +/etc/init.d/winbind +/etc/logrotate.d/winbind diff --git a/packaging/Debian/debian/winbind.dirs b/packaging/Debian/debian/winbind.dirs deleted file mode 100644 index 1da8fba83ad..00000000000 --- a/packaging/Debian/debian/winbind.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/lintian/overrides diff --git a/packaging/Debian/debian/winbind.files b/packaging/Debian/debian/winbind.files index 2834acf7caf..9730900e7e9 100644 --- a/packaging/Debian/debian/winbind.files +++ b/packaging/Debian/debian/winbind.files @@ -4,4 +4,4 @@ usr/share/man/man1/wbinfo.1 usr/share/man/man8/winbindd.8 lib/security/pam_winbind.so lib/libnss_winbind.so.2 -lib/libnss_wins.so.2 +lib/libnss_wins.so diff --git a/packaging/Debian/debian/winbind.lintian b/packaging/Debian/debian/winbind.lintian deleted file mode 100644 index fca17d3cca1..00000000000 --- a/packaging/Debian/debian/winbind.lintian +++ /dev/null @@ -1,6 +0,0 @@ -winbind: ldconfig-symlink-missing-for-shlib lib/libnss_winbind.so lib/libnss_winbind.so.2 libnss_winbind.so -winbind: ldconfig-symlink-missing-for-shlib lib/libnss_wins.so lib/libnss_wins.so.2 libnss_wins.so -winbind: no-shlibs-control-file lib/libnss_winbind.so.2 -winbind: no-shlibs-control-file lib/libnss_wins.so.2 -winbind: postinst-must-call-ldconfig lib/libnss_wins.so.2 -winbind: postrm-should-call-ldconfig lib/libnss_wins.so.2 diff --git a/packaging/Debian/debian/winbind.logrotate b/packaging/Debian/debian/winbind.logrotate index e36cd1281c5..7300885eb12 100644 --- a/packaging/Debian/debian/winbind.logrotate +++ b/packaging/Debian/debian/winbind.logrotate @@ -3,7 +3,7 @@ missingok rotate 7 postrotate - [ -f /var/run/samba/winbindd.pid ] && kill -HUP `cat /var/run/samba/winbindd.pid` + killall -q -HUP winbindd || true endscript compress notifempty |