[Pkg-samba-maint] r1784 - in branches/samba/experimental/debian: . patches po
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Mon Mar 24 09:02:49 UTC 2008
tags 433449 pending
tags 470138 pending
tags 465121 pending
tags 469976 pending
tags 457105 pending
tags 445566 pending
tags 169624 pending
tags 256637 pending
tags 265468 pending
tags 289179 pending
tags 305210 pending
tags 410075 pending
tags 452940 pending
tags 453350 pending
tags 453144 pending
tags 340570 pending
tags 451839 pending
tags 451271 pending
thanks
Author: vorlon
Date: 2008-03-24 09:02:49 +0000 (Mon, 24 Mar 2008)
New Revision: 1784
Added:
branches/samba/experimental/debian/README.source
branches/samba/experimental/debian/mount.smbfs
branches/samba/experimental/debian/patches/disable-weak-auth.patch
branches/samba/experimental/debian/po/id.po
branches/samba/experimental/debian/samba-common.lintian
branches/samba/experimental/debian/smb.conf.dapper
branches/samba/experimental/debian/smb.conf.etch
branches/samba/experimental/debian/smb.conf.gutsy
branches/samba/experimental/debian/smbfs.dirs
branches/samba/experimental/debian/smbfs.links
Removed:
branches/samba/experimental/debian/control.in
branches/samba/experimental/debian/patches/chgpasswd.patch
branches/samba/experimental/debian/patches/cifs-umount-same-user.patch
branches/samba/experimental/debian/patches/cifs-umount-trailing-slashes.patch
branches/samba/experimental/debian/patches/get_global_sam_sid-non-root.patch
branches/samba/experimental/debian/patches/hide_password_length.patch
branches/samba/experimental/debian/patches/linux-cifs-user-perms.patch
branches/samba/experimental/debian/patches/make-distclean.patch
branches/samba/experimental/debian/patches/missing_userspace_bugzilla999.patch
branches/samba/experimental/debian/patches/no_smbmount_symlink.patch
branches/samba/experimental/debian/patches/smbmount-mtab-flags.patch
branches/samba/experimental/debian/patches/smbmount-nomtab.patch
Modified:
branches/samba/experimental/debian/
branches/samba/experimental/debian/NEWS
branches/samba/experimental/debian/README.debian
branches/samba/experimental/debian/changelog
branches/samba/experimental/debian/control
branches/samba/experimental/debian/copyright
branches/samba/experimental/debian/panic-action
branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch
branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch
branches/samba/experimental/debian/patches/documentation.patch
branches/samba/experimental/debian/patches/installswat.sh.patch
branches/samba/experimental/debian/patches/non-linux-ports.patch
branches/samba/experimental/debian/patches/pam-examples.patch
branches/samba/experimental/debian/patches/series
branches/samba/experimental/debian/patches/smbclient-pager.patch
branches/samba/experimental/debian/patches/usershare.patch
branches/samba/experimental/debian/rules
branches/samba/experimental/debian/samba-common.config
branches/samba/experimental/debian/samba-common.files
branches/samba/experimental/debian/samba-common.postinst
branches/samba/experimental/debian/samba-common.postrm
branches/samba/experimental/debian/samba-common.templates
branches/samba/experimental/debian/samba-doc.doc-base.samba-by-example
branches/samba/experimental/debian/samba-doc.doc-base.samba-developers-guide
branches/samba/experimental/debian/samba-doc.doc-base.samba-howto
branches/samba/experimental/debian/samba-doc.doc-base.samba-using
branches/samba/experimental/debian/samba.files
branches/samba/experimental/debian/samba.init
branches/samba/experimental/debian/samba.lintian
branches/samba/experimental/debian/samba.postinst
branches/samba/experimental/debian/smb.conf
branches/samba/experimental/debian/smbfs.files
branches/samba/experimental/debian/smbfs.lintian
Log:
merge revisions 1587-1773 from trunk
Property changes on: branches/samba/experimental/debian
___________________________________________________________________
Name: mergeWithUpstream
- 1
Modified: branches/samba/experimental/debian/NEWS
===================================================================
--- branches/samba/experimental/debian/NEWS 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/NEWS 2008-03-24 09:02:49 UTC (rev 1784)
@@ -1,3 +1,31 @@
+samba (3.0.27a-2) unstable; urgency=low
+
+ * Weak authentication methods are disabled by default
+
+ Beginning with this version, plaintext authentication is disabled for
+ clients and lanman authentication is disabled for both clients and
+ servers. Lanman authentication is not needed for Windows
+ NT/2000/XP/Vista, Mac OS X or Samba, but if you still have Windows
+ 95/98/ME clients (or servers) you may need to set lanman auth (or client
+ lanman auth) to yes in your smb.conf.
+
+ The "lanman auth = no" setting will also cause lanman password hashes to
+ be deleted from smbpasswd and prevent new ones from being written, so
+ that these can't be subjected to brute-force password attacks. This
+ means that re-enabling lanman auth after it has been disabled is more
+ difficult; it is therefore advisable that you re-enable the option as
+ soon as possible if you think you will need to support Win9x clients.
+
+ Client support for plaintext passwords is not needed for recent Windows
+ servers, and in fact this behavior change makes the Samba client behave
+ in a manner consistent with all Windows clients later than Windows 98.
+ However, if you need to connect to a Samba server that does not have
+ encrypted password support enabled, or to another server that does not
+ support NTLM authentication, you will need to set
+ "client plaintext auth = yes" and "client lanman auth = yes" in smb.conf.
+
+ -- Steve Langasek <vorlon at debian.org> Sat, 24 Nov 2007 00:23:37 -0800
+
samba (3.0.26a-2) unstable; urgency=low
* Default printing system has changed from BSD to CUPS
Modified: branches/samba/experimental/debian/README.debian
===================================================================
--- branches/samba/experimental/debian/README.debian 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/README.debian 2008-03-24 09:02:49 UTC (rev 1784)
@@ -1,80 +1,23 @@
Samba for Debian
----------------
-This package was built by Eloy Paris <peloy at debian.org> and Steve Langasek
-<vorlon at debian.org>, current maintainers of the Samba packages for Debian,
-based on previous work from Bruce Perens <Bruce at Pixar.com>, Andrew
-Howell <andrew at it.com.au>, Klee Dienes <klee at debian.org> and Michael
-Meskes <meskes at topsystem.de>, all previous maintainers of the packages
-samba and sambades (merged together for longer than we can remember.)
+This package was built by Eloy Paris <peloy at debian.org>, Steve
+Langasek <vorlon at debian.org>, Noèl Köthe <noel at debian.org>, Peter
+Eisentraut <petere at debian.org> and Christian Perrier
+<bubulle at debian.org>, current maintainers of the Samba packages for
+Debian, based on previous work from Bruce Perens <Bruce at Pixar.com>,
+Andrew Howell <andrew at it.com.au>, Klee Dienes <klee at debian.org> and
+Michael Meskes <meskes at topsystem.de>, all previous maintainers of the
+packages 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
-5. Reporting bugs
+1. Packages Generated from the Samba Sources
+2. Reporting bugs
-1. Notes
---------
-
-- As of Samba 2.0.6-1, the Debian version of Samba is compiled with
- Pluggable Authentication Modules (PAM) support. PAM support was
- discontinued during the libc5 -> libc6 migration process and I never
- brought it back until 2.0.6-1.
-
-- The smbfs package does not support the 2.0.x Linux kernels anymore.
- This has been the case since the very first packages of the CVS sources
- that eventually became Samba 2.2. To use the smbfs package you need to
- run a 2.2.x kernel or later.
-
-- Starting with the Debian packages for Samba 2.2, the Samba log files (for
- nmbd and smbd) have been moved to a new location: /var/log/samba/. The
- files also have new names: log.nmbd and log.smbd. The old files
- (/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 at 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
+1. Packages Generated from the Samba Sources
--------------------------------------------
Currently, the Samba sources produce the following binary packages:
@@ -85,47 +28,18 @@
swat: Samba Web Administration Tool
samba-doc: Samba documentation.
samba-doc-pdf: Samba documentation (PDF format).
-smbfs: Mount and umount commands for the smbfs (works with 2.2.x and
- above kernels, not with 2.0.x kernels.)
+smbfs: Mount and umount commands for smbfs and cifs
+ (Note: smbfs is considered deprecated)
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 a Windows NT
server.
-python2.2-samba: Python bindings that allow access to various aspects of
- Samba.
+samba-dbg: binaries with debugging symbols
-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
-does not exist any more. The reason is that starting with Samba 2.0.6-1, that
-code does not even compile, and the upstream author (Andrew Tridgell)
-recommended to disable the compilation of smbwrapper until some issues
-with glibc2.1 get cleared out (the problem is with glibc, not with Samba
-itself).
-
-4. Support for NT Domains
--------------------------
-
-Samba 2.2 includes preliminary support for NT domains. A Samba server
-can now be part of a Windows NT domain whose Primary Domain Controller
-is a Windows NT server. This feature is supposed to be stable although I
-haven't tried it myself. Read the documentation in the samba-doc package
-for help on how to do this (hint: "security = domain" in the smb.conf
-file).
-
-Samba 2.2 has also experimental support for Primary Domain
-Controller. This means that a Samba server can act now as a PDC. There
-are no special flags needed to compile Samba with NT domain PDC
-support. Please read the NTDOM PDC FAQ at www.samba.org (Documentation
-section).
-
-Please note that NT domain PDC support is far from complete and is still
-experimental.
-
-
-5. Reporting Bugs
+2. Reporting Bugs
-----------------
If you believe you have found a bug please make sure the possible bug
@@ -161,4 +75,6 @@
Eloy A. Paris <peloy at debian.org>
Steve Langasek <vorlon at debian.org>
-
+Noèl Köthe <noel at debian.org>
+Peter Eisentraut <petere at debian.org>
+Christian Perrier <bubulle at debian.org>
Added: branches/samba/experimental/debian/README.source
===================================================================
--- branches/samba/experimental/debian/README.source (rev 0)
+++ branches/samba/experimental/debian/README.source 2008-03-24 09:02:49 UTC (rev 1784)
@@ -0,0 +1,24 @@
+Merging upstream releases
+=========================
+
+$ svn-load -t tags/samba/upstream_${version} \
+svn+ssh://svn.debian.org/svn/pkg-samba branches/samba/upstream .
+
+The svn-load command is in the aptly-named "svn-load" package. The
+above is the simplest use of svn-load to merge a new upstream version
+into the "upstream" branch and copy it to a per-version tag directory;
+please see "svn-load --help" for a list of other options that are of
+interest. In particular, you may find that the --wc option saves time
+if you're on a slow connection, and the "-m" option may be needed if
+files are moved around in the upstream repository and this needs to be
+indicated to prevent subversion treating this as addition and deletion
+of unrelated files.
+
+Note that this only imports the new upstream version into the branch, it
+doesn't merge it onto the trunk. For this, you should go to your
+(clean) working copy of the trunk and run:
+
+$ svn merge \
+svn+ssh://svn.debian.org/svn/pkg-samba/tags/samba/upstream_{prev_version,new_version}
+$ svn diff # (to make sure the diff makes sense)
+$ svn commit -m "merge upstream $version"
Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/changelog 2008-03-24 09:02:49 UTC (rev 1784)
@@ -19,13 +19,153 @@
-- Christian Perrier <bubulle at debian.org> Wed, 05 Mar 2008 22:45:28 +0100
-samba (3.0.27-2) UNRELEASED; urgency=low
+samba (3.0.28a-1) unstable; urgency=low
+ [ Christian Perrier ]
+ * New upstream release. This fixes the following Debian bugs:
+ - Prevent nmbd from shutting down when no network
+ interfaces can be located. Closes: #433449
+ * Debian patches dropped as applied upstream:
+ - make-distclean.patch
+ - linux-cifs-user-perms.patch
+ - cifs-umount-same-user.patch
+ - get_global_sam_sid-non-root.patch
+ - chgpasswd.patch
+ - cups.patch
+ * Fix doc-base section from Apps/Net to Network
+ * Fix copyright in debian/copyright
+ * Updated Standards-Version to 3.7.3 (no changes needed)
+ * [Lintian] No longer use -1 revision for the libacl-dev build
+ dependency
+
+ [ Steve Langasek ]
+ * Merge smb.conf changes from Ubuntu:
+ - correct an inconsistency inthe winbind enum comment
+ - correct default and example settings to use the canonical names for all
+ options, rather than historical synonyms
+ - clarify the comment for 'max log size'.
+ Thanks to Chuck Short and Richard Laager.
+ * Add an additional sed command to samba-common.postinst to cleverly
+ pick up any shares that have been appended to the default smb.conf
+ and exclude them from the ucf diff.
+
+ -- Christian Perrier <bubulle at debian.org> Fri, 14 Mar 2008 21:28:16 +0100
+
+samba (3.0.28-4) unstable; urgency=low
+
+ [ Steve Langasek ]
+ * Brown paper bag: fix samba-common.files to list all of the smb.conf
+ templates, not just the current one. Closes: #470138.
+ * Drop debian/patches/gcc42-arm-workaround.patch, which should have been
+ dropped in the previous upload
+
+ -- Steve Langasek <vorlon at debian.org> Sun, 09 Mar 2008 04:09:26 -0700
+
+samba (3.0.28-3) unstable; urgency=low
+
+ * Drop the arm optimization workaround, as the compiler is now reported
+ to be fixed.
+ * Add missing eventlogadm(8) manpage.
+ * Refresh the list of Linux architectures from type-handling, to pick up
+ libacl-dev on armel. Closes: #465121.
+ * Convert handling of smb.conf to use ucf, so that we can sanely manage
+ syntax changes going forward.
+ * In the process, fix the dhcp handling to allow proper reconfiguration
+ via debconf.
+
+ [ Debconf translations ]
+ * Indonesian added. Closes: #469976
+
+ -- Steve Langasek <vorlon at debian.org> Sat, 08 Mar 2008 17:11:16 -0800
+
+samba (3.0.28-2) unstable; urgency=low
+
+ [ Steve Langasek ]
+ * Drop some further code in samba-common.postinst that's specific to
+ pre-3.0 upgrades.
+ * Make the mount.smbfs wrapper a bash script instead of a POSIX sh script,
+ so we can use bash array variables and cope with arguments containing
+ embedded spaces (such as share names). Thanks to Julian Gilbey
+ <jdg at debian.org> for the patch. Closes: #457105.
+ * debian/patches/gcc42-arm-workaround.patch: work around an arm compiler
+ problem by building rpc_parse/parse_prs.o with -O0 on this architecture.
+ Thanks to Martin Michlmayr for helping to pin down the problem file.
+ Closes: #445566.
+ * mount.smbfs: map the smbfs "guest" option to "guest,sec=none", which is
+ a closer approximation of the semantics with cifs.
+
+ -- Christian Perrier <bubulle at debian.org> Sat, 05 Jan 2008 09:46:06 +0100
+
+samba (3.0.28-1) unstable; urgency=high
+
+ * New upstream release. Security fix
+ * Fix a remote code execution vulnerability when running as a domain
+ logon server (PDC or BDC). (CVE-2007-6015)
+
+ -- Christian Perrier <bubulle at debian.org> Tue, 11 Dec 2007 00:12:11 +0530
+
+samba (3.0.27a-2) unstable; urgency=low
+
+ * debian/patches/disable-weak-auth.patch: disable plaintext authentication
+ on the client, and lanman authentication on both client and server, by
+ default since these are only needed for Win9x or Samba with encrypted
+ passwords disabled and are potential password attack vectors. This
+ change is backported from Samba 3.2. LP: #163194.
+ * Don't build the userspace tools for the deprecated smbfs kernel driver
+ anymore; instead, use a shell wrapper around mount.cifs that translates
+ option names between the smbfs and cifs drivers.
+ Closes: #169624, #256637, #265468, #289179, #305210, #410075;
+ LP: #29413
+ * debian/panic-action: detect when we're on an Ubuntu system and direct bug
+ reporters to Launchpad instead of to the Debian BTS. Closes: #452940.
+ * debian/samba.init: call log_progress_msg separately for each daemon on
+ stop rather than passing a second arg to log_daemon_msg, for greater
+ compatibility with both Debian and Ubuntu LSB initscript implementations.
+ Closes: #453350.
+ * Drop smbldap-tools to Suggests:, consistent with the textbook meaning of
+ recommends/suggests which is now implemented correctly in apt.
+ Closes: #453144.
+ * Get rid of the build-dependency on type-handling:
+ - add a new target, "update-archs", to be invoked by hand to refresh
+ the list of known Linux architectures for the libacl1-dev
+ build-dep; this avoids the clean target making changes to
+ debian/control
+ - rework the sed line so that it works in-place on debian/control,
+ so we can get rid of debian/control.in as well and just update
+ debian/control directly
+ Closes: #340570.
+
+ -- Steve Langasek <vorlon at debian.org> Tue, 04 Dec 2007 18:35:29 -0800
+
+samba (3.0.27a-1) unstable; urgency=low
+
+ [ Steve Langasek ]
+ * New upstream release
+ - fix regression with smbfs clients, introduced by the security fix in
+ 3.0.27. Closes: #451839.
+ - debian/patches/cifs-umount-trailing-slashes.patch: merged upstream.
* Drop the deprecated "printer admin" example from the default smb.conf.
Closes: #451273.
+ * Add a *new* debian/patches/cups.patch to *enable* cups as the default
+ printing system, because since the original introduction of this patch
+ in Debian there was a regression upstream that caused cups to never be
+ selected as the default print system.
+ * Set the default value for the workgroup question to "WORKGROUP" in
+ samba-common.templates, not just in the template smb.conf, so that the
+ debconf question comes out right every time; and always treat this
+ as a high-priority debconf question instead of selecting the
+ priority based on whether there's an existing value, since there's
+ now *always* an existing value but the value doesn't tell us
+ anything meaningful about the user's preference. Closes: #451271.
+ * Drop some code from samba.postinst that only applies to upgrades from
+ pre-3.0 (i.e., pre-sarge) packages
- -- Steve Langasek <vorlon at debian.org> Mon, 19 Nov 2007 12:57:26 -0800
+ [ Christian Perrier ]
+ * Update the "built by" part of README.debian
+ * Remove the very outdated parts of README.debian
+ -- Steve Langasek <vorlon at debian.org> Fri, 23 Nov 2007 13:04:52 -0800
+
samba (3.0.27-1) unstable; urgency=low
* New upstream version
Modified: branches/samba/experimental/debian/control
===================================================================
--- branches/samba/experimental/debian/control 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/control 2008-03-24 09:02:49 UTC (rev 1784)
@@ -3,15 +3,14 @@
Priority: optional
Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
Uploaders: Eloy A. Paris <peloy at debian.org>, Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Adam Conrad <adconrad at 0c3.net>, Peter Eisentraut <petere at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40), uuid-dev
+Build-Depends: debhelper (>= 5.0.37.2), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11) [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, binutils (>= 2.14.90.0.7), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40), uuid-dev
Build-Conflicts: libfam-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Package: samba
Architecture: any
Depends: samba-common (= ${binary:Version}), logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.0-6), procps, update-inetd, adduser
-Recommends: smbldap-tools
-Suggests: openbsd-inetd | inet-superserver
+Suggests: openbsd-inetd | inet-superserver, smbldap-tools
Replaces: samba-common (<= 2.0.5a-2)
Description: a LanManager-like file and printer server for Unix
The Samba software suite is a collection of programs that
@@ -47,7 +46,7 @@
Package: samba-common
Architecture: any
-Depends: libpam-modules, ${shlibs:Depends}, ${misc:Depends}
+Depends: libpam-modules, ucf, ${shlibs:Depends}, ${misc:Depends}
Replaces: samba (<< 3.0.20b-1)
Description: Samba common files used by both the server and the client
The Samba software suite is a collection of programs that
Deleted: branches/samba/experimental/debian/control.in
===================================================================
--- branches/samba/experimental/debian/control.in 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/control.in 2008-03-24 09:02:49 UTC (rev 1784)
@@ -1,206 +0,0 @@
-Source: samba
-Section: net
-Priority: optional
-Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
-Uploaders: Eloy A. Paris <peloy at debian.org>, Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Adam Conrad <adconrad at 0c3.net>, Peter Eisentraut <petere at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [@libacl@], libkrb5-dev, libldap2-dev, po-debconf, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40), uuid-dev
-Build-Conflicts: libfam-dev
-Standards-Version: 3.7.2
-
-Package: samba
-Architecture: any
-Depends: samba-common (= ${binary:Version}), logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.0-6), procps, update-inetd, adduser
-Recommends: smbldap-tools
-Suggests: openbsd-inetd | inet-superserver
-Replaces: samba-common (<= 2.0.5a-2)
-Description: a LanManager-like file and printer server for Unix
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
- .
- This package contains all the components necessary to turn your
- Debian GNU/Linux box into a powerful file and printer server.
- .
- Currently, the Samba Debian packages consist of the following:
- .
- samba - 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.
- swat - Samba Web Administration Tool
- samba-doc - Samba documentation.
- samba-doc-pdf - Samba documentation in PDF format.
- smbfs - Mount and umount commands for the smbfs (kernels 2.2.x and above).
- libpam-smbpass - pluggable authentication module for SMB/CIFS password
- database
- libsmbclient - Shared library that allows applications to talk to SMB/CIFS
- servers
- libsmbclient-dev - libsmbclient shared libraries
- winbind - Service to resolve user and group information from Windows NT
- servers
- .
- It is possible to install a subset of these packages depending on
- your particular needs. For example, to access other SMB/CIFS servers you
- should only need the smbclient and samba-common packages.
- .
- http://www.samba.org/
-
-Package: samba-common
-Architecture: any
-Depends: libpam-modules, ${shlibs:Depends}, ${misc:Depends}
-Replaces: samba (<< 3.0.20b-1)
-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/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
- .
- This package contains the common files that are used by both the server
- (provided in the samba package) and the client (provided in the smbclient
- package).
-
-Package: smbclient
-Architecture: any
-Depends: samba-common (= ${binary:Version}), ${shlibs:Depends}
-Replaces: samba (<< 2.999+3.0.alpha21-4), smbget
-Conflicts: smbget
-Provides: samba-client
-Suggests: smbfs
-Description: a LanManager-like simple client for Unix
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
- .
- This package contains some client components of the Samba suite. In
- particular it includes the command line utilities smbclient, smbtar,
- and smbspool. If you want to mount shares exported from Microsoft
- Windows machines or a Samba server you must install the smbfs package.
-
-Package: swat
-Architecture: any
-Depends: samba (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, openbsd-inetd | inet-superserver
-Recommends: samba-doc (= ${source:Version})
-Description: Samba Web Administration Tool
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
- .
- This package contains the components of the Samba suite that are needed
- for Web administration of the Samba server.
- .
- SWAT will rewrite the smb.conf file. It will rearrange the entries and
- delete all comments, include= and copy= options. If you use a carefully
- crafted smb.conf, you should probably avoid using SWAT.
-
-Package: samba-doc
-Section: doc
-Architecture: all
-Suggests: samba-doc-pdf
-Description: Samba documentation
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
- .
- This package contains all the documentation that comes in the original
- tarball, except in PDF format.
-
-Package: samba-doc-pdf
-Section: doc
-Architecture: all
-Description: Samba documentation (PDF format)
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
- .
- This package contains all the documentation that comes in the original
- tarball in PDF format.
-
-Package: smbfs
-Section: otherosfs
-Priority: optional
-Architecture: any
-Depends: netbase (>= 2.02), samba-common (= ${binary:Version}), ${shlibs:Depends}
-Suggests: smbclient
-Replaces: smbfsx
-Conflicts: smbfsx, suidmanager (<< 0.50)
-Description: mount and umount commands for the smbfs (for kernels >= than 2.2.x)
- Smbfs is a filesystem which understands the SMB/CIFS protocol.
- This is the protocol Windows for Workgroups, Windows NT or
- LAN Manager use to talk to each other. It was inspired by
- samba, the program by Andrew Tridgell that turns any unix
- 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.
-
-Package: libpam-smbpass
-Section: admin
-Priority: extra
-Architecture: any
-Depends: ${shlibs:Depends}, samba-common (= ${binary:Version})
-Suggests: samba
-Description: pluggable authentication module for SMB/CIFS password database
- This is a stackable PAM module that allows a system administrator to easily
- migrate to using encrypted passwords for Samba and to keep smb passwords in
- sync with unix passwords. Unlike other solutions, it does this without
- requiring users to change their existing passwords or login to Samba using
- cleartext passwords.
-
-Package: libsmbclient
-Section: libs
-Priority: optional
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: shared library that allows applications to talk to SMB/CIFS servers
- libsmbclient allows to write applications that use the SMB/CIFS protocol.
- This gives applications the ability to talk to Microsoft Windows servers
- and Unix servers running Samba.
- .
- This package contains the libsmbclient shared library.
-
-Package: libsmbclient-dev
-Section: libdevel
-Priority: extra
-Architecture: any
-Depends: libsmbclient (= ${binary:Version})
-Description: libsmbclient static libraries and headers
- libsmbclient allows to write applications that use the SMB/CIFS protocol.
- This gives applications the ability to talk to Microsoft Windows servers
- and Unix servers running Samba.
- .
- This package contains libraries and headers needed to build applications
- that use SMB/CIFS services.
-
-Package: winbind
-Section: net
-Priority: optional
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (= ${binary:Version}), lsb-base (>= 3.0-6), adduser
-Replaces: samba (<= 2.2.3-2)
-Description: service to resolve user and group information from Windows NT servers
- This package provides the winbindd daemon, which provides a
- service for the Name Service Switch capability that is present
- in most modern C libraries (like the GNU C Library - glibc.)
- .
- The service provided by winbindd is called `winbind' and
- 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: samba-dbg
-Section: devel
-Priority: extra
-Architecture: any
-Depends: samba (= ${binary:Version})
-Description: Samba debugging symbols
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
- .
- This package contains debugging symbols for the programs included in
- the samba and smbclient packages.
Modified: branches/samba/experimental/debian/copyright
===================================================================
--- branches/samba/experimental/debian/copyright 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/copyright 2008-03-24 09:02:49 UTC (rev 1784)
@@ -9,7 +9,7 @@
<bruce at pixar.com> from sources found at
<URL:ftp://ftp.samba.org/pub/samba>.
-Copyright:
+Copyright © 1992-2008 Andrew Tridgell and the Samba Team
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Added: branches/samba/experimental/debian/mount.smbfs
===================================================================
--- branches/samba/experimental/debian/mount.smbfs (rev 0)
+++ branches/samba/experimental/debian/mount.smbfs 2008-03-24 09:02:49 UTC (rev 1784)
@@ -0,0 +1,115 @@
+#!/bin/bash
+# Debian mount.smbfs compatibility wrapper
+# Copyright 2007, Steve Langasek <vorlon at debian.org>
+# Licensed under the GNU General Public License, version 2. See the
+# file /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+
+# This script accepts all documented mount options for mount.smbfs,
+# passing through those that are also recognized by mount.cifs,
+# converting those that are not recognized but map to available cifs
+# options, and warning about the use of options for which no equivalent
+# exists.
+
+# known bugs: quoted spaces in arguments are not passed intact
+
+set -e
+
+# reverse the order of username and password in a "username" parameter,
+# taking care to leave any "%password" bit intact
+
+reverse_username_workgroup() {
+ local workgroup password username
+
+ username="$1"
+ case "$username" in
+ *%*) password="${username#*%}"
+ username="${username%%%*}"
+ ;;
+ *) ;;
+ esac
+ case "$username" in
+ */*) workgroup="${username#*/}"
+ username="${username%%/*}"
+ ;;
+ *) ;;
+ esac
+ if [ -n "$workgroup" ]; then
+ username="$workgroup\\$username"
+ fi
+ if [ -n "$password" ]; then
+ username="$username%$password"
+ fi
+ echo "$username"
+}
+
+
+# parse out the mount options that have been specified using -o, and if
+# necessary, convert them for use by mount.cifs
+
+parse_mount_options () {
+ local OLD_IFS IFS options option username
+ OLD_IFS="$IFS"
+ IFS=","
+ options=""
+ workgroup=""
+ password=""
+
+ for option in $@; do
+ case "$option" in
+ sockopt=* | scope=* | codepage=* | ttl=* | debug=*)
+ echo "Warning: ignoring deprecated smbfs option '$option'" >&2
+ ;;
+
+ krb)
+ options="$options${options:+,}sec=krb5"
+ ;;
+
+ guest)
+ echo "Warning: mapping 'guest' to 'guest,sec=none'" >&2
+ options="$options${options:+,}guest,sec=none"
+ ;;
+
+ # username and workgroup are reversed in username= arguments,
+ # so need to be parsed out
+ username=*/*)
+ IFS="$OLD_IFS"
+ username="${option#username=}"
+ username="$(reverse_username_workgroup "$username")"
+ IFS=","
+ options="$options${options:+,}username=$username"
+ ;;
+
+ *)
+ options="$options${options:+,}$option"
+ ;;
+ esac
+ done
+ IFS="$OLD_IFS"
+ echo $options
+}
+
+args=()
+while [ "$#" -gt 0 ]; do
+ case "$1" in
+ -o*)
+ arg=${1#-o}
+ shift
+ if [ -z "$arg" ]; then
+ arg=$1
+ shift
+ fi
+ arg="$(parse_mount_options "$arg")"
+ if [ -n "$arg" ]; then
+ args=("${args[@]}" "-o" "$arg")
+ fi
+ ;;
+ *)
+ args=("${args[@]}" "$1")
+ shift
+ ;;
+ esac
+done
+
+USER="$(reverse_username_workgroup "$USER")"
+
+exec /sbin/mount.cifs "${args[@]}"
Property changes on: branches/samba/experimental/debian/mount.smbfs
___________________________________________________________________
Name: svn:executable
+ *
Modified: branches/samba/experimental/debian/panic-action
===================================================================
--- branches/samba/experimental/debian/panic-action 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/panic-action 2008-03-24 09:02:49 UTC (rev 1784)
@@ -48,9 +48,16 @@
echo "If the problem persists, you are encouraged to first install the"
echo "samba-dbg package, which contains the debugging symbols for the Samba"
echo "binaries. Then submit the provided information as a bug report to"
- echo "Debian. For information about the procedure for submitting bug reports,"
- echo "please see http://www.debian.org/Bugs/Reporting or the reportbug(1)"
- echo "manual page."
+ if [ -x "`which lsb_release 2>/dev/null`" ] \
+ && [ "`lsb_release -s -i`" = "Ubuntu" ]
+ then
+ echo "Ubuntu by visiting this link:"
+ echo "https://launchpad.net/ubuntu/+source/samba/+filebug"
+ else
+ echo "Debian. For information about the procedure for submitting bug reports,"
+ echo "please see http://www.debian.org/Bugs/Reporting or the reportbug(1)"
+ echo "manual page."
+ fi
echo
gdb -x /etc/samba/gdbcommands -batch "$BINARYNAME" "$1"
) | mail -s "Panic or segfault in Samba" root
Modified: branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch
===================================================================
--- branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -6,10 +6,10 @@
Note:
-Index: samba-3.0.25c/examples/LDAP/README
+Index: samba-3.0.28a/examples/LDAP/README
===================================================================
---- samba-3.0.25c.orig/examples/LDAP/README 2007-08-26 12:07:16.598298995 +0200
-+++ samba-3.0.25c/examples/LDAP/README 2007-08-26 13:09:02.419701485 +0200
+--- samba-3.0.28a.orig/examples/LDAP/README
++++ samba-3.0.28a/examples/LDAP/README
@@ -59,6 +59,9 @@
The smbldap-tools package can be downloaded individually from
http://samba.idealx.org/dist/
Modified: branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch
===================================================================
--- branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -6,10 +6,10 @@
Note:
-Index: samba-3.0.25c/docs/manpages/smb.conf.5
+Index: samba-3.0.28a/docs/manpages/smb.conf.5
===================================================================
---- samba-3.0.25c.orig/docs/manpages/smb.conf.5 2007-08-26 12:07:15.098370040 +0200
-+++ samba-3.0.25c/docs/manpages/smb.conf.5 2007-08-26 13:09:05.419555107 +0200
+--- samba-3.0.28a.orig/docs/manpages/smb.conf.5
++++ samba-3.0.28a/docs/manpages/smb.conf.5
@@ -662,8 +662,8 @@
Default:
\fB\fIadd machine script\fR = \fR
Deleted: branches/samba/experimental/debian/patches/chgpasswd.patch
===================================================================
--- branches/samba/experimental/debian/patches/chgpasswd.patch 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/chgpasswd.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -1,51 +0,0 @@
-Goal: Recent versions of Linux-PAM support localization of user prompts,
-so Samba must use the C locale when invoking PAM (directly or via
-/usr/bin/passwd) to ensure that password chat values match the prompts in a
-locale-invariant fashion.
-
-Authors: Mathias Gug <mathiaz at ubuntu.com>,
- Steve Langasek <vorlon at debian.org>
-
-Upstream status: submitted in bugzilla bug #5082
-
-Index: samba-3.0.26a/source/smbd/chgpasswd.c
-===================================================================
---- samba-3.0.26a.orig/source/smbd/chgpasswd.c
-+++ samba-3.0.26a/source/smbd/chgpasswd.c
-@@ -126,6 +126,7 @@
- struct termios stermios;
- gid_t gid;
- uid_t uid;
-+ char *eptrs[1] = { NULL };
-
- if (pass == NULL)
- {
-@@ -222,7 +223,7 @@
- passwordprogram));
-
- /* execl() password-change application */
-- if (execl("/bin/sh", "sh", "-c", passwordprogram, NULL) < 0)
-+ if (execle("/bin/sh", "sh", "-c", passwordprogram, NULL, eptrs) < 0)
- {
- DEBUG(3, ("Bad status returned from %s\n", passwordprogram));
- return (False);
-@@ -498,6 +499,9 @@
- #ifdef WITH_PAM
- if (lp_pam_password_change()) {
- BOOL ret;
-+#ifdef HAVE_SETLOCALE
-+ char *prevlocale = setlocale(LC_MESSAGES, "C");
-+#endif
-
- if (as_root)
- become_root();
-@@ -511,6 +515,9 @@
- if (as_root)
- unbecome_root();
-
-+#ifdef HAVE_SETLOCALE
-+ setlocale(LC_MESSAGES, prevlocale);
-+#endif
- return ret;
- }
- #endif
Deleted: branches/samba/experimental/debian/patches/cifs-umount-same-user.patch
===================================================================
--- branches/samba/experimental/debian/patches/cifs-umount-same-user.patch 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/cifs-umount-same-user.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -1,22 +0,0 @@
-Goal: the CIFS_IOC_CHECKMOUNT ioctl check assumed that errors would return a
-value > 0, when in fact the return value on failure is -1. Correct this
-assumption, which was allowing any user to unmount shares mounted by other
-users.
-
-Author: Steve Langasek <vorlon at debian.org>
-
-Upstream status: submitted as bugzilla bug #4784
-
-Index: samba-3.0.25c/source/client/umount.cifs.c
-===================================================================
---- samba-3.0.25c.orig/source/client/umount.cifs.c 2007-08-26 13:09:08.419408730 +0200
-+++ samba-3.0.25c/source/client/umount.cifs.c 2007-08-26 13:09:08.919384334 +0200
-@@ -131,7 +131,7 @@
- printf("user unmounting via %s is an optional feature of",thisprogram);
- printf(" the cifs filesystem driver (cifs.ko)");
- printf("\n\tand requires cifs.ko version 1.32 or later\n");
-- } else if (rc > 0)
-+ } else if (rc != 0)
- printf("user unmount of %s failed with %d %s\n",dir,errno,strerror(errno));
- close(fileid);
-
Deleted: branches/samba/experimental/debian/patches/cifs-umount-trailing-slashes.patch
===================================================================
--- branches/samba/experimental/debian/patches/cifs-umount-trailing-slashes.patch 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/cifs-umount-trailing-slashes.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -1,21 +0,0 @@
-Goal: canonicalize mount point names when umount.cifs is called, to avoid
-unnecessarily leaving entries behind in /etc/mtab if invoked with a trailing
-slash in the mount point name
-
-Upstream status: submitted as bugzilla bug #4781
-
-Index: samba-3.0.25c/source/client/umount.cifs.c
-===================================================================
---- samba-3.0.25c.orig/source/client/umount.cifs.c 2007-08-26 12:07:14.598393722 +0200
-+++ samba-3.0.25c/source/client/umount.cifs.c 2007-08-26 13:09:08.419408730 +0200
-@@ -342,6 +342,10 @@
-
- /* fixup path if needed */
-
-+ /* Trim any trailing slashes */
-+ while (mountpoint[strlen(mountpoint)-1] == '/')
-+ mountpoint[strlen(mountpoint)-1] = '\0';
-+
- /* make sure that this is a cifs filesystem */
- rc = statfs(mountpoint, &statbuf);
-
Added: branches/samba/experimental/debian/patches/disable-weak-auth.patch
===================================================================
--- branches/samba/experimental/debian/patches/disable-weak-auth.patch (rev 0)
+++ branches/samba/experimental/debian/patches/disable-weak-auth.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -0,0 +1,88 @@
+Goal: disable weak authentication methods, both on the client and
+server, so that we aren't sending passwords in plaintext across the wire
+and also aren't storing weak password hashes on the server
+
+Fixes: LP #163194
+
+Upstream status: pulled from upstream 3.2 git tree, will be superseded
+with first release of 3.2
+
+Index: samba-3.0.28a/source/param/loadparm.c
+===================================================================
+--- samba-3.0.28a.orig/source/param/loadparm.c
++++ samba-3.0.28a/source/param/loadparm.c
+@@ -1572,9 +1572,9 @@
+ Globals.bStatCache = True; /* use stat cache by default */
+ Globals.iMaxStatCacheSize = 1024; /* one Meg by default. */
+ Globals.restrict_anonymous = 0;
+- Globals.bClientLanManAuth = True; /* Do use the LanMan hash if it is available */
+- Globals.bClientPlaintextAuth = True; /* Do use a plaintext password if is requested by the server */
+- Globals.bLanmanAuth = True; /* Do use the LanMan hash if it is available */
++ Globals.bClientLanManAuth = False; /* Do NOT use the LanMan hash if it is available */
++ Globals.bClientPlaintextAuth = False; /* Do NOT use a plaintext password even if is requested by the server */
++ Globals.bLanmanAuth = False; /* Do NOT use the LanMan hash, even if it is supplied */
+ Globals.bNTLMAuth = True; /* Do use NTLMv1 if it is available (otherwise NTLMv2) */
+ Globals.bClientNTLMv2Auth = False; /* Client should not use NTLMv2, as we can't tell that the server supports it. */
+ /* Note, that we will use NTLM2 session security (which is different), if it is available */
+Index: samba-3.0.28a/docs/htmldocs/manpages/smb.conf.5.html
+===================================================================
+--- samba-3.0.28a.orig/docs/htmldocs/manpages/smb.conf.5.html
++++ samba-3.0.28a/docs/htmldocs/manpages/smb.conf.5.html
+@@ -780,7 +780,7 @@
+ without Windows 95/98 servers are advised to disable
+ this option. </p><p>Disabling this option will also disable the <code class="literal">client plaintext auth</code> option</p><p>Likewise, if the <code class="literal">client ntlmv2
+ auth</code> parameter is enabled, then only NTLMv2 logins will be
+- attempted.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>client lanman auth</code></em> = <code class="literal">yes</code>
++ attempted.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>client lanman auth</code></em> = <code class="literal">no</code>
+ </em></span>
+ </p></dd><dt><span class="term"><a name="CLIENTNTLMV2AUTH"></a>client ntlmv2 auth (G)</span></dt><dd><p>This parameter determines whether or not <a href="smbclient.8.html"><span class="citerefentry"><span class="refentrytitle">smbclient</span>(8)</span></a> will attempt to
+ authenticate itself to servers using the NTLMv2 encrypted password
+@@ -795,7 +795,7 @@
+ responses, and not the weaker LM or NTLM.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>client ntlmv2 auth</code></em> = <code class="literal">no</code>
+ </em></span>
+ </p></dd><dt><span class="term"><a name="CLIENTPLAINTEXTAUTH"></a>client plaintext auth (G)</span></dt><dd><p>Specifies whether a client should send a plaintext
+- password if the server does not support encrypted passwords.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>client plaintext auth</code></em> = <code class="literal">yes</code>
++ password if the server does not support encrypted passwords.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>client plaintext auth</code></em> = <code class="literal">no</code>
+ </em></span>
+ </p></dd><dt><span class="term"><a name="CLIENTSCHANNEL"></a>client schannel (G)</span></dt><dd><p>
+ This controls whether the client offers or even demands the use of the netlogon schannel.
+@@ -2007,7 +2007,7 @@
+ auth</code> to disable this for Samba's clients (such as smbclient)</p><p>If this option, and <code class="literal">ntlm
+ auth</code> are both disabled, then only NTLMv2 logins will be
+ permited. Not all clients support NTLMv2, and most will require
+- special configuration to use it.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>lanman auth</code></em> = <code class="literal">yes</code>
++ special configuration to use it.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>lanman auth</code></em> = <code class="literal">no</code>
+ </em></span>
+ </p></dd><dt><span class="term"><a name="LARGEREADWRITE"></a>large readwrite (G)</span></dt><dd><p>This parameter determines whether or not
+ <a href="smbd.8.html"><span class="citerefentry"><span class="refentrytitle">smbd</span>(8)</span></a> supports the new 64k
+Index: samba-3.0.28a/docs/manpages/smb.conf.5
+===================================================================
+--- samba-3.0.28a.orig/docs/manpages/smb.conf.5
++++ samba-3.0.28a/docs/manpages/smb.conf.5
+@@ -1272,7 +1272,7 @@
+ parameter is enabled, then only NTLMv2 logins will be attempted.
+ .sp
+ Default:
+-\fB\fIclient lanman auth\fR = yes \fR
++\fB\fIclient lanman auth\fR = no \fR
+ .RE
+ .PP
+ client ntlmv2 auth (G)
+@@ -1303,7 +1303,7 @@
+ Specifies whether a client should send a plaintext password if the server does not support encrypted passwords.
+ .sp
+ Default:
+-\fB\fIclient plaintext auth\fR = yes \fR
++\fB\fIclient plaintext auth\fR = no \fR
+ .RE
+ .PP
+ client schannel (G)
+@@ -3082,7 +3082,7 @@
+ are both disabled, then only NTLMv2 logins will be permited. Not all clients support NTLMv2, and most will require special configuration to use it.
+ .sp
+ Default:
+-\fB\fIlanman auth\fR = yes \fR
++\fB\fIlanman auth\fR = no \fR
+ .RE
+ .PP
+ large readwrite (G)
Modified: branches/samba/experimental/debian/patches/documentation.patch
===================================================================
--- branches/samba/experimental/debian/patches/documentation.patch 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/documentation.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -6,10 +6,10 @@
Note: Some part should maybe go in the FHS patch
-Index: samba-3.0.25c/docs/manpages/swat.8
+Index: samba-3.0.28a/docs/manpages/swat.8
===================================================================
---- samba-3.0.25c.orig/docs/manpages/swat.8 2007-08-26 13:07:03.425508276 +0200
-+++ samba-3.0.25c/docs/manpages/swat.8 2007-08-26 13:08:58.919872259 +0200
+--- samba-3.0.28a.orig/docs/manpages/swat.8
++++ samba-3.0.28a/docs/manpages/swat.8
@@ -111,60 +111,6 @@
.RS 3n
Print a summary of command line options.
@@ -88,10 +88,10 @@
.RE
.SH "WARNINGS"
.PP
-Index: samba-3.0.25c/docs/manpages/nmbd.8
+Index: samba-3.0.28a/docs/manpages/nmbd.8
===================================================================
---- samba-3.0.25c.orig/docs/manpages/nmbd.8 2007-08-26 13:07:03.425508276 +0200
-+++ samba-3.0.25c/docs/manpages/nmbd.8 2007-08-26 13:08:58.919872259 +0200
+--- samba-3.0.28a.orig/docs/manpages/nmbd.8
++++ samba-3.0.28a/docs/manpages/nmbd.8
@@ -113,11 +113,9 @@
to answer any name queries. Adding a line to this file affects name NetBIOS resolution from this host
\fBONLY\fR.
@@ -137,10 +137,10 @@
nmbd
to dump out its server database in the
\fIlog.nmb\fR
-Index: samba-3.0.25c/docs/manpages/smbd.8
+Index: samba-3.0.28a/docs/manpages/smbd.8
===================================================================
---- samba-3.0.25c.orig/docs/manpages/smbd.8 2007-08-26 13:07:03.425508276 +0200
-+++ samba-3.0.25c/docs/manpages/smbd.8 2007-08-26 13:08:58.919872259 +0200
+--- samba-3.0.28a.orig/docs/manpages/smbd.8
++++ samba-3.0.28a/docs/manpages/smbd.8
@@ -168,14 +168,11 @@
inetd, this file must contain a mapping of service name (e.g., netbios-ssn) to service port (e.g., 139) and protocol type (e.g., tcp).
.RE
@@ -158,10 +158,10 @@
.sp
This file describes all the services the server is to make available to clients. See
\fBsmb.conf\fR(5)
-Index: samba-3.0.25c/docs/manpages/lmhosts.5
+Index: samba-3.0.28a/docs/manpages/lmhosts.5
===================================================================
---- samba-3.0.25c.orig/docs/manpages/lmhosts.5 2007-08-26 13:07:03.425508276 +0200
-+++ samba-3.0.25c/docs/manpages/lmhosts.5 2007-08-26 13:08:58.919872259 +0200
+--- samba-3.0.28a.orig/docs/manpages/lmhosts.5
++++ samba-3.0.28a/docs/manpages/lmhosts.5
@@ -77,10 +77,8 @@
file.
.SH "FILES"
@@ -175,10 +175,10 @@
.SH "VERSION"
.PP
This man page is correct for version 3.0 of the Samba suite.
-Index: samba-3.0.25c/docs/manpages/ntlm_auth.1
+Index: samba-3.0.28a/docs/manpages/ntlm_auth.1
===================================================================
---- samba-3.0.25c.orig/docs/manpages/ntlm_auth.1 2007-08-26 13:07:03.425508276 +0200
-+++ samba-3.0.25c/docs/manpages/ntlm_auth.1 2007-08-26 13:08:58.919872259 +0200
+--- samba-3.0.28a.orig/docs/manpages/ntlm_auth.1
++++ samba-3.0.28a/docs/manpages/ntlm_auth.1
@@ -43,7 +43,7 @@
Some of these commands also require access to the directory
\fIwinbindd_privileged\fR
@@ -206,10 +206,10 @@
.RE
.PP
gss-spnego-client
-Index: samba-3.0.25c/docs/manpages/tdbbackup.8
+Index: samba-3.0.28a/docs/manpages/tdbbackup.8
===================================================================
---- samba-3.0.25c.orig/docs/manpages/tdbbackup.8 2007-08-26 13:07:03.425508276 +0200
-+++ samba-3.0.25c/docs/manpages/tdbbackup.8 2007-08-26 13:08:58.919872259 +0200
+--- samba-3.0.28a.orig/docs/manpages/tdbbackup.8
++++ samba-3.0.28a/docs/manpages/tdbbackup.8
@@ -70,17 +70,17 @@
\(bu
@@ -231,10 +231,10 @@
.SH "VERSION"
.PP
This man page is correct for version 3.0 of the Samba suite.
-Index: samba-3.0.25c/docs/manpages/winbindd.8
+Index: samba-3.0.28a/docs/manpages/winbindd.8
===================================================================
---- samba-3.0.25c.orig/docs/manpages/winbindd.8 2007-08-26 13:07:03.425508276 +0200
-+++ samba-3.0.25c/docs/manpages/winbindd.8 2007-08-26 13:08:58.919872259 +0200
+--- samba-3.0.28a.orig/docs/manpages/winbindd.8
++++ samba-3.0.28a/docs/manpages/winbindd.8
@@ -440,16 +440,16 @@
file are owned by root.
.RE
Deleted: branches/samba/experimental/debian/patches/get_global_sam_sid-non-root.patch
===================================================================
--- branches/samba/experimental/debian/patches/get_global_sam_sid-non-root.patch 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/get_global_sam_sid-non-root.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -1,73 +0,0 @@
-Goal: client programs should short-circuit before calling
-get_global_sam_sid() as not-root, because the SAM SID can't be read without
-root privileges and get_global_sam_sid() panics when it can't be accessed --
-reasonable for the server, not reasonable for the client.
-
-Author: Steve Langasek <vorlon at debian.org>
-
-Upstream status: submitted in bugzilla bug #3727
-
-Index: samba-3.0.26a/source/utils/smbpasswd.c
-===================================================================
---- samba-3.0.26a.orig/source/utils/smbpasswd.c
-+++ samba-3.0.26a/source/utils/smbpasswd.c
-@@ -96,6 +96,10 @@
- while ((ch = getopt(argc, argv, "c:axdehminjr:sw:R:D:U:LW")) != EOF) {
- switch(ch) {
- case 'L':
-+ if (getuid() != 0) {
-+ fprintf(stderr, "smbpasswd -L can only be used by root.\n");
-+ exit(1);
-+ }
- local_flags |= LOCAL_AM_ROOT;
- break;
- case 'c':
-Index: samba-3.0.26a/source/pam_smbpass/pam_smb_auth.c
-===================================================================
---- samba-3.0.26a.orig/source/pam_smbpass/pam_smb_auth.c
-+++ samba-3.0.26a/source/pam_smbpass/pam_smb_auth.c
-@@ -100,6 +100,12 @@
- _log_err(pamh, LOG_DEBUG, "username [%s] obtained", name);
- }
-
-+ if (geteuid() != 0) {
-+ _log_err(pamh, LOG_DEBUG, "Cannot access samba password database, not running as root.");
-+ retval = PAM_AUTHINFO_UNAVAIL;
-+ AUTH_RETURN;
-+ }
-+
- if (!initialize_password_db(True)) {
- _log_err(pamh, LOG_ALERT, "Cannot access samba password database");
- retval = PAM_AUTHINFO_UNAVAIL;
-Index: samba-3.0.26a/source/pam_smbpass/pam_smb_acct.c
-===================================================================
---- samba-3.0.26a.orig/source/pam_smbpass/pam_smb_acct.c
-+++ samba-3.0.26a/source/pam_smbpass/pam_smb_acct.c
-@@ -69,6 +69,11 @@
- _log_err(pamh, LOG_DEBUG, "acct: username [%s] obtained", name);
- }
-
-+ if (geteuid() != 0) {
-+ _log_err(pamh, LOG_DEBUG, "Cannot access samba password database, not running as root.");
-+ return PAM_AUTHINFO_UNAVAIL;
-+ }
-+
- /* Getting into places that might use LDAP -- protect the app
- from a SIGPIPE it's not expecting */
- oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN);
-Index: samba-3.0.26a/source/pam_smbpass/pam_smb_passwd.c
-===================================================================
---- samba-3.0.26a.orig/source/pam_smbpass/pam_smb_passwd.c
-+++ samba-3.0.26a/source/pam_smbpass/pam_smb_passwd.c
-@@ -124,6 +124,11 @@
- _log_err(pamh, LOG_DEBUG, "username [%s] obtained", user);
- }
-
-+ if (geteuid() != 0) {
-+ _log_err(pamh, LOG_DEBUG, "Cannot access samba password database, not running as root.");
-+ return PAM_AUTHINFO_UNAVAIL;
-+ }
-+
- /* Getting into places that might use LDAP -- protect the app
- from a SIGPIPE it's not expecting */
- oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN);
Deleted: branches/samba/experimental/debian/patches/hide_password_length.patch
===================================================================
--- branches/samba/experimental/debian/patches/hide_password_length.patch 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/hide_password_length.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -1,42 +0,0 @@
-Goal: Seems to be meant to avoid one to guess the password's length
- by how many Xs are left in the argv buffer
-
-Fixes: some paranoid coniderations?
-
-Status wrt upstream: Forwarded on 2007/05/30
-
-Author: Unknown
-
-Note:
-
-Index: samba-3.0.25a/source/client/smbmount.c
-===================================================================
---- samba-3.0.25a.orig/source/client/smbmount.c 2007-05-26 07:45:39.744216228 +0200
-+++ samba-3.0.25a/source/client/smbmount.c 2007-05-26 07:46:32.692638041 +0200
-@@ -768,7 +768,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));
- }
- if ((lp=strchr_m(username,'/'))) {
- *lp = 0;
-@@ -778,7 +778,7 @@
- !strcmp(opts, "password")) {
- pstrcpy(password,opteq+1);
- got_pass = True;
-- memset(opteq+1,'X',strlen(password));
-+ memset(opteq+1,'\0',strlen(password));
- } else if(!strcmp(opts, "credentials")) {
- pstrcpy(credentials,opteq+1);
- } else if(!strcmp(opts, "netbiosname")) {
-@@ -892,7 +892,7 @@
- *p = 0;
- pstrcpy(password,p+1);
- got_pass = True;
-- memset(strchr_m(getenv("USER"),'%')+1,'X',strlen(password));
-+ memset(strchr_m(getenv("USER"),'%')+1,'\0',strlen(password));
- }
- strupper_m(username);
- }
Modified: branches/samba/experimental/debian/patches/installswat.sh.patch
===================================================================
--- branches/samba/experimental/debian/patches/installswat.sh.patch 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/installswat.sh.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -6,10 +6,10 @@
Note:
-Index: samba-3.0.25c/source/script/installswat.sh
+Index: samba-3.0.28a/source/script/installswat.sh
===================================================================
---- samba-3.0.25c.orig/source/script/installswat.sh 2007-08-26 12:07:17.098275313 +0200
-+++ samba-3.0.25c/source/script/installswat.sh 2007-08-26 13:09:01.419750278 +0200
+--- samba-3.0.28a.orig/source/script/installswat.sh
++++ samba-3.0.28a/source/script/installswat.sh
@@ -198,7 +198,11 @@
# Install/ remove Using Samba book (but only if it is there)
Deleted: branches/samba/experimental/debian/patches/linux-cifs-user-perms.patch
===================================================================
--- branches/samba/experimental/debian/patches/linux-cifs-user-perms.patch 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/linux-cifs-user-perms.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -1,112 +0,0 @@
-Goal: when mount.cifs is called by a non-root user, provide default uid= and
-gid= options matching the current process
-
-Upstream status: submitted as bugzilla bug #4780
-
-Index: samba-3.0.25c/source/client/mount.cifs.c
-===================================================================
---- samba-3.0.25c.orig/source/client/mount.cifs.c 2007-08-26 12:07:14.598393722 +0200
-+++ samba-3.0.25c/source/client/mount.cifs.c 2007-08-26 13:09:08.419408730 +0200
-@@ -321,6 +321,8 @@
- int out_len = 0;
- int word_len;
- int rc = 0;
-+ char user[32];
-+ char group[32];
-
- if (!optionsp || !*optionsp)
- return 1;
-@@ -331,6 +333,13 @@
-
- /* BB fixme check for separator override BB */
-
-+ if (getuid()) {
-+ got_uid = 1;
-+ sprintf(user,"%u",getuid());
-+ got_gid = 1;
-+ sprintf(group,"%u",getgid());
-+ }
-+
- /* while ((data = strsep(&options, ",")) != NULL) { */
- while(data != NULL) {
- /* check if ends with trailing comma */
-@@ -493,33 +502,35 @@
- got_uid = 1;
- if (!isdigit(*value)) {
- struct passwd *pw;
-- static char temp[32];
-
- if (!(pw = getpwnam(value))) {
- printf("bad user name \"%s\"\n", value);
- exit(1);
- }
-- sprintf(temp, "%u", pw->pw_uid);
-- value = temp;
-+ sprintf(user, "%u", pw->pw_uid);
- endpwent();
-+ } else {
-+ strcpy(user,value);
- }
- }
-+ goto nocopy;
- } else if (strncmp(data, "gid", 3) == 0) {
- if (value && *value) {
- got_gid = 1;
- if (!isdigit(*value)) {
- struct group *gr;
-- static char temp[32];
-
- if (!(gr = getgrnam(value))) {
- printf("bad group name \"%s\"\n", value);
- exit(1);
- }
-- sprintf(temp, "%u", gr->gr_gid);
-- value = temp;
-+ sprintf(group, "%u", gr->gr_gid);
- endpwent();
-+ } else {
-+ strcpy(group,value);
- }
- }
-+ goto nocopy;
- /* fmask and dmask synonyms for people used to smbfs syntax */
- } else if (strcmp(data, "file_mode") == 0 || strcmp(data, "fmask")==0) {
- if (!value || !*value) {
-@@ -621,6 +632,37 @@
- nocopy:
- data = next_keyword;
- }
-+
-+ // special-case the uid and gid
-+ if (got_uid) {
-+ word_len = strlen(user);
-+
-+ out = (char *)realloc(out, out_len + word_len + 6);
-+ if (out == NULL) {
-+ perror("malloc");
-+ exit(1);
-+ }
-+
-+ if (out_len)
-+ out[out_len++] = ',';
-+ sprintf(out + out_len, "uid=%s", user);
-+ out_len = strlen(out);
-+ }
-+ if (got_gid) {
-+ word_len = strlen(group);
-+
-+ out = (char *)realloc(out, out_len + word_len + 6);
-+ if (out == NULL) {
-+ perror("malloc");
-+ exit(1);
-+ }
-+
-+ if (out_len)
-+ out[out_len++] = ',';
-+ sprintf(out + out_len, "gid=%s", group);
-+ out_len = strlen(out);
-+ }
-+
- free(*optionsp);
- *optionsp = out;
- return 0;
Deleted: branches/samba/experimental/debian/patches/make-distclean.patch
===================================================================
--- branches/samba/experimental/debian/patches/make-distclean.patch 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/make-distclean.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -1,28 +0,0 @@
-Goal: add some missing files to the distclean target in source/Makefile.in
-
-Fixes: #276203 (mostly)
-
-Status wrt upstream: Forwarded upstream, will be in 3.0.26
-
-Note:
-
-Index: samba-3.0.25c/source/Makefile.in
-===================================================================
---- samba-3.0.25c.orig/source/Makefile.in 2007-08-26 13:08:59.419847863 +0200
-+++ samba-3.0.25c/source/Makefile.in 2007-08-26 13:09:01.919725881 +0200
-@@ -1688,6 +1688,7 @@
-
- python_clean:
- @-if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi
-+ @-rm -rf build/
-
- # revert to the previously installed version
- revert:
-@@ -1876,6 +1877,7 @@
-
- distclean: realclean
- -rm -f include/stamp-h
-+ -rm -f smbadduser
- -rm -f include/config.h Makefile
- -rm -f config.status config.cache so_locations
- -rm -rf .deps TAGS
Deleted: branches/samba/experimental/debian/patches/missing_userspace_bugzilla999.patch
===================================================================
--- branches/samba/experimental/debian/patches/missing_userspace_bugzilla999.patch 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/missing_userspace_bugzilla999.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -1,144 +0,0 @@
-Goal: Userspaces fixes to properly use uid and gid options with kernel 2.6
-
-Fixes: Bugzilla #999
-
-Status wrt upstream: Not applied. Mentioned by Dann Frazier in
- http://lists.samba.org/archive/samba-technical/2007-January/051069.html
- Jerry Carter agreed to apply but not applied yet
- Reminded to upstream on June 3rd 2007
-
-Author: Haroldo Gamal (see https://bugzilla.samba.org/attachment.cgi?id=634&action=view)
-
-
-Index: samba-3.0.25c/source/client/smbmnt.c
-===================================================================
---- samba-3.0.25c.orig/source/client/smbmnt.c 2007-08-26 13:09:03.919628296 +0200
-+++ samba-3.0.25c/source/client/smbmnt.c 2007-08-26 13:09:07.919433127 +0200
-@@ -49,6 +49,10 @@
- static unsigned mount_dmask;
- static int user_mount;
- static char *options;
-+static int opt_uid = 0;
-+static int opt_gid = 0;
-+static int opt_fmode = 0;
-+static int opt_dmode = 0;
-
- static void
- help(void)
-@@ -82,11 +86,13 @@
- case 'u':
- if (!user_mount) {
- mount_uid = strtol(optarg, NULL, 0);
-+ opt_uid++;
- }
- break;
- case 'g':
- if (!user_mount) {
- mount_gid = strtol(optarg, NULL, 0);
-+ opt_gid++;
- }
- break;
- case 'n':
-@@ -97,9 +103,11 @@
- break;
- case 'f':
- mount_fmask = strtol(optarg, NULL, 8);
-+ opt_fmode++;
- break;
- case 'd':
- mount_dmask = strtol(optarg, NULL, 8);
-+ opt_dmode++;
- break;
- case 'o':
- options = optarg;
-@@ -182,9 +190,17 @@
- data2 = (char *) data;
- }
-
-- slprintf(opts, sizeof(opts)-1,
-- "version=7,uid=%d,gid=%d,file_mode=0%o,dir_mode=0%o,%s",
-- mount_uid, mount_gid, data->file_mode, data->dir_mode,options);
-+ slprintf(opts, sizeof(opts)-1, "version=7,");
-+ if (opt_uid)
-+ slprintf(opts+strlen(opts), sizeof(opts)-strlen(opts)-1, "uid=%d,", mount_uid);
-+ if (opt_gid)
-+ slprintf(opts+strlen(opts), sizeof(opts)-strlen(opts)-1, "gid=%d,", mount_gid);
-+ if (opt_fmode)
-+ slprintf(opts+strlen(opts), sizeof(opts)-strlen(opts)-1, "file_mode=%d,", data->file_mode);
-+ if (opt_dmode)
-+ slprintf(opts+strlen(opts), sizeof(opts)-strlen(opts)-1, "dir_mode=%d,", data->dir_mode);
-+ slprintf(opts+strlen(opts), sizeof(opts)-strlen(opts)-1, "%s",options);
-+
- if (mount(share_name, ".", "smbfs", flags, data1) == 0)
- return 0;
- return mount(share_name, ".", "smbfs", flags, data2);
-@@ -213,6 +229,8 @@
-
- if (getuid() != 0) {
- user_mount = 1;
-+ opt_uid++;
-+ opt_gid++;
- }
-
- if (geteuid() != 0) {
-Index: samba-3.0.25c/source/client/smbmount.c
-===================================================================
---- samba-3.0.25c.orig/source/client/smbmount.c 2007-08-26 13:09:03.919628296 +0200
-+++ samba-3.0.25c/source/client/smbmount.c 2007-08-26 13:09:07.919433127 +0200
-@@ -43,6 +43,10 @@
- static int smb_port = 0;
- static BOOL got_user;
- static BOOL got_pass;
-+static BOOL use_uid = 0;
-+static BOOL use_gid = 0;
-+static BOOL use_fmask = 0;
-+static BOOL use_dmask = 0;
- static uid_t mount_uid;
- static gid_t mount_gid;
- static int mount_ro;
-@@ -480,22 +484,22 @@
- if (mount_ro) {
- args[i++] = "-r";
- }
-- if (mount_uid) {
-+ if (use_uid) {
- slprintf(tmp, sizeof(tmp)-1, "%d", mount_uid);
- args[i++] = "-u";
- args[i++] = smb_xstrdup(tmp);
- }
-- if (mount_gid) {
-+ if (use_gid) {
- slprintf(tmp, sizeof(tmp)-1, "%d", mount_gid);
- args[i++] = "-g";
- args[i++] = smb_xstrdup(tmp);
- }
-- if (mount_fmask) {
-+ if (use_fmask) {
- slprintf(tmp, sizeof(tmp)-1, "0%o", mount_fmask);
- args[i++] = "-f";
- args[i++] = smb_xstrdup(tmp);
- }
-- if (mount_dmask) {
-+ if (use_dmask) {
- slprintf(tmp, sizeof(tmp)-1, "0%o", mount_dmask);
- args[i++] = "-d";
- args[i++] = smb_xstrdup(tmp);
-@@ -800,14 +804,18 @@
- pstrcpy(my_netbios_name,opteq+1);
- } else if(!strcmp(opts, "uid")) {
- mount_uid = nametouid(opteq+1);
-+ use_uid++;
- } else if(!strcmp(opts, "gid")) {
- mount_gid = nametogid(opteq+1);
-+ use_gid++;
- } else if(!strcmp(opts, "port")) {
- smb_port = val;
- } else if(!strcmp(opts, "fmask")) {
- mount_fmask = strtol(opteq+1, NULL, 8);
-+ use_fmask++;
- } else if(!strcmp(opts, "dmask")) {
- mount_dmask = strtol(opteq+1, NULL, 8);
-+ use_dmask++;
- } else if(!strcmp(opts, "debug")) {
- DEBUGLEVEL = val;
- } else if(!strcmp(opts, "ip")) {
Deleted: branches/samba/experimental/debian/patches/no_smbmount_symlink.patch
===================================================================
--- branches/samba/experimental/debian/patches/no_smbmount_symlink.patch 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/no_smbmount_symlink.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -1,35 +0,0 @@
-Goal: installing smbmount and smbumount is done The Debian Way in debian/rules
-
-Fixes: ?
-
-Status wrt upstream: Debian specific
-
-Note:
-
-Index: samba-3.0.25c/source/script/installbin.sh.in
-===================================================================
---- samba-3.0.25c.orig/source/script/installbin.sh.in 2007-08-26 12:07:16.598298995 +0200
-+++ samba-3.0.25c/source/script/installbin.sh.in 2007-08-26 13:09:02.919677088 +0200
-@@ -21,13 +21,15 @@
- chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
-
- # this is a special case, mount needs this in a specific location
-- if [ $p2 = smbmount ]; then
-- if [ ! -d $DESTDIR/@rootsbindir@ ]; then
-- mkdir $DESTDIR/@rootsbindir@
-- fi
-- echo "Creating sym link $DESTDIR/@rootsbindir@/mount.smbfs to $BINDIR/$p2 "
-- ln -sf $BINDIR/$p2 $DESTDIR/@rootsbindir@/mount.smbfs
-- fi
-+ # Commented out for the Debian Samba package. We take care of this
-+ # important symlink in debian/rules. (peloy at debian.org)
-+ # if [ $p2 = smbmount ]; then
-+ # if [ ! -d $DESTDIR/@rootsbindir@ ]; then
-+ # mkdir $DESTDIR/@rootsbindir@
-+ # fi
-+ # echo "Creating sym link $DESTDIR/@rootsbindir@/mount.smbfs to $BINDIR/$p2 "
-+ # ln -sf $BINDIR/$p2 $DESTDIR/@rootsbindir@/mount.smbfs
-+ # fi
- done
-
-
Modified: branches/samba/experimental/debian/patches/non-linux-ports.patch
===================================================================
--- branches/samba/experimental/debian/patches/non-linux-ports.patch 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/non-linux-ports.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -7,11 +7,11 @@
Note: Upstream would probably welcome patches allowing to build on new architectures.
As this patch is the most often broken by new upstream releases, everybody would benefit from it.
-Index: samba-3.0.25c/source/configure.in
+Index: samba-3.0.28a/source/configure.in
===================================================================
---- samba-3.0.25c.orig/source/configure.in 2007-08-26 13:08:59.419847863 +0200
-+++ samba-3.0.25c/source/configure.in 2007-08-26 13:09:01.919725881 +0200
-@@ -758,6 +758,15 @@
+--- samba-3.0.28a.orig/source/configure.in
++++ samba-3.0.28a/source/configure.in
+@@ -769,6 +769,15 @@
fi
;;
@@ -27,7 +27,7 @@
# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
#
*linux*)
-@@ -1380,7 +1389,7 @@
+@@ -1391,7 +1400,7 @@
#
#
case "$host_os" in
@@ -36,7 +36,7 @@
# glibc <= 2.3.2 has a broken getgrouplist
AC_TRY_RUN([
#include <unistd.h>
-@@ -1689,7 +1698,10 @@
+@@ -1700,7 +1709,10 @@
# and these are for particular systems
case "$host_os" in
@@ -48,7 +48,7 @@
BLDSHARED="true"
if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -5417,7 +5429,7 @@
+@@ -5467,7 +5479,7 @@
AC_MSG_RESULT(yes);
case "$host_os" in
@@ -57,7 +57,7 @@
AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[
AC_TRY_LINK([#include <sys/sendfile.h>],
[\
-@@ -5722,11 +5734,11 @@
+@@ -5772,11 +5784,11 @@
SMB_KRB5_LOCATOR="bin/smb_krb5_locator.$SHLIBEXT"
case "$host_os" in
Modified: branches/samba/experimental/debian/patches/pam-examples.patch
===================================================================
--- branches/samba/experimental/debian/patches/pam-examples.patch 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/pam-examples.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -6,10 +6,10 @@
Note:
-Index: samba-3.0.25c/source/pam_smbpass/README
+Index: samba-3.0.28a/source/pam_smbpass/README
===================================================================
---- samba-3.0.25c.orig/source/pam_smbpass/README 2007-08-26 12:07:16.598298995 +0200
-+++ samba-3.0.25c/source/pam_smbpass/README 2007-08-26 13:09:02.419701485 +0200
+--- samba-3.0.28a.orig/source/pam_smbpass/README
++++ samba-3.0.28a/source/pam_smbpass/README
@@ -37,7 +37,7 @@
smbconf=<file> - specify an alternate path to the smb.conf
file.
Modified: branches/samba/experimental/debian/patches/series
===================================================================
--- branches/samba/experimental/debian/patches/series 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/series 2008-03-24 09:02:49 UTC (rev 1784)
@@ -7,20 +7,12 @@
non-linux-ports.patch
pam-examples.patch
README_nosmbldap-tools.patch
-no_smbmount_symlink.patch
smbclient-pager.patch
-smbmount-mtab-flags.patch
-smbmount-nomtab.patch
smbstatus-locking.patch
undefined-symbols.patch
VERSION.patch
adapt_machine_creation_script.patch
autoconf.patch
-missing_userspace_bugzilla999.patch
-linux-cifs-user-perms.patch
-cifs-umount-trailing-slashes.patch
-cifs-umount-same-user.patch
smbpasswd-syslog.patch
-get_global_sam_sid-non-root.patch
usershare.patch
-chgpasswd.patch
+disable-weak-auth.patch
Modified: branches/samba/experimental/debian/patches/smbclient-pager.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbclient-pager.patch 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/smbclient-pager.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -8,10 +8,10 @@
Note:
-Index: samba-3.0.25c/source/include/local.h
+Index: samba-3.0.28a/source/include/local.h
===================================================================
---- samba-3.0.25c.orig/source/include/local.h 2007-08-26 12:07:16.098322677 +0200
-+++ samba-3.0.25c/source/include/local.h 2007-08-26 13:09:03.419652692 +0200
+--- samba-3.0.28a.orig/source/include/local.h
++++ samba-3.0.28a/source/include/local.h
@@ -109,7 +109,7 @@
/* the default pager to use for the client "more" command. Users can
override this with the PAGER environment variable */
Deleted: branches/samba/experimental/debian/patches/smbmount-mtab-flags.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbmount-mtab-flags.patch 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/smbmount-mtab-flags.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -1,26 +0,0 @@
-Goal: Always put the "ro|rw" option in mtab
-
-Fixes: #140397?
-
-Status wrt upstream: Forwarded on 2007/05/30
-
-Author: Steve Langasek <vorlon at debian.org>
-
-Note:
-
-Index: samba-3.0.25c/source/client/smbmnt.c
-===================================================================
---- samba-3.0.25c.orig/source/client/smbmnt.c 2007-08-26 12:07:16.098322677 +0200
-+++ samba-3.0.25c/source/client/smbmnt.c 2007-08-26 13:09:03.419652692 +0200
-@@ -276,7 +276,10 @@
- ment.mnt_fsname = share_name ? share_name : "none";
- ment.mnt_dir = mount_point;
- ment.mnt_type = "smbfs";
-- ment.mnt_opts = "";
-+ if (mount_ro)
-+ ment.mnt_opts = "ro";
-+ else
-+ ment.mnt_opts = "rw";
- ment.mnt_freq = 0;
- ment.mnt_passno= 0;
-
Deleted: branches/samba/experimental/debian/patches/smbmount-nomtab.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbmount-nomtab.patch 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/smbmount-nomtab.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -1,172 +0,0 @@
-Goal: Add an option to not update mtab. This allows using smbfs when
- the root filesystem is mounted read-only
-
-Fixes: #139590
-
-Status wrt upstream: Forwarded on 2007/05/30
-
-Note: Part of no-longer maintained smbfs stuff?
- The manpages are not modified
-
-Index: samba-3.0.25c/source/client/smbmnt.c
-===================================================================
---- samba-3.0.25c.orig/source/client/smbmnt.c 2007-08-26 13:09:03.419652692 +0200
-+++ samba-3.0.25c/source/client/smbmnt.c 2007-08-26 13:09:03.919628296 +0200
-@@ -44,6 +44,7 @@
- static uid_t mount_uid;
- static gid_t mount_gid;
- static int mount_ro;
-+static int no_mtab;
- static unsigned mount_fmask;
- static unsigned mount_dmask;
- static int user_mount;
-@@ -56,6 +57,7 @@
- printf("Usage: smbmnt mount-point [options]\n");
- printf("Version %s\n\n",SAMBA_VERSION_STRING);
- printf("-s share share name on server\n"
-+ "-n don't update /etc/mtab\n"
- "-r mount read-only\n"
- "-u uid mount as uid\n"
- "-g gid mount as gid\n"
-@@ -70,7 +72,7 @@
- {
- int opt;
-
-- while ((opt = getopt (argc, argv, "s:u:g:rf:d:o:")) != EOF)
-+ while ((opt = getopt (argc, argv, "s:u:g:nrf:d:o:")) != EOF)
- {
- switch (opt)
- {
-@@ -87,6 +89,9 @@
- mount_gid = strtol(optarg, NULL, 0);
- }
- break;
-+ case 'n':
-+ no_mtab = 1;
-+ break;
- case 'r':
- mount_ro = 1;
- break;
-@@ -291,36 +296,38 @@
- return -1;
- }
-
-- if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1)
-- {
-- fprintf(stderr, "Can't get "MOUNTED"~ lock file");
-- return 1;
-- }
-- close(fd);
-+ if (!no_mtab) {
-+ if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1)
-+ {
-+ fprintf(stderr, "Can't get "MOUNTED"~ lock file");
-+ return 1;
-+ }
-+ close(fd);
-
-- if ((mtab = setmntent(MOUNTED, "a+")) == NULL)
-- {
-- fprintf(stderr, "Can't open " MOUNTED);
-- return 1;
-- }
-+ if ((mtab = setmntent(MOUNTED, "a+")) == NULL)
-+ {
-+ fprintf(stderr, "Can't open " MOUNTED);
-+ return 1;
-+ }
-
-- if (addmntent(mtab, &ment) == 1)
-- {
-- fprintf(stderr, "Can't write mount entry");
-- return 1;
-- }
-- if (fchmod(fileno(mtab), 0644) == -1)
-- {
-- fprintf(stderr, "Can't set perms on "MOUNTED);
-- return 1;
-- }
-- endmntent(mtab);
-+ if (addmntent(mtab, &ment) == 1)
-+ {
-+ fprintf(stderr, "Can't write mount entry");
-+ return 1;
-+ }
-+ if (fchmod(fileno(mtab), 0644) == -1)
-+ {
-+ fprintf(stderr, "Can't set perms on "MOUNTED);
-+ return 1;
-+ }
-+ endmntent(mtab);
-
-- if (unlink(MOUNTED"~") == -1)
-- {
-- fprintf(stderr, "Can't remove "MOUNTED"~");
-- return 1;
-- }
-+ if (unlink(MOUNTED"~") == -1)
-+ {
-+ fprintf(stderr, "Can't remove "MOUNTED"~");
-+ return 1;
-+ }
-+ }
-
- return 0;
- }
-Index: samba-3.0.25c/source/client/smbmount.c
-===================================================================
---- samba-3.0.25c.orig/source/client/smbmount.c 2007-08-26 12:07:16.098322677 +0200
-+++ samba-3.0.25c/source/client/smbmount.c 2007-08-26 13:09:03.919628296 +0200
-@@ -48,6 +48,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 @@
- return;
- }
-
-+ if (no_mtab)
-+ return;
-+
- if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1) {
- DEBUG(0,("%d: Can't get "MOUNTED"~ lock file", sys_getpid()));
- return;
-@@ -470,6 +474,9 @@
- args[i++] = "-s";
- args[i++] = svc2;
-
-+ if (no_mtab) {
-+ args[i++] = "-n";
-+ }
- if (mount_ro) {
- args[i++] = "-r";
- }
-@@ -665,7 +672,7 @@
- ****************************************************************************/
- static void usage(void)
- {
-- printf("Usage: mount.smbfs service mountpoint [-o options,...]\n");
-+ printf("Usage: mount.smbfs service mountpoint [-n] [-o options,...]\n");
-
- printf("Version %s\n\n",SAMBA_VERSION_STRING);
-
-@@ -745,8 +752,13 @@
- argc -= 2;
- argv += 2;
-
-- opt = getopt(argc, argv, "o:");
-- if(opt != 'o') {
-+ opt = getopt(argc, argv, "no:");
-+ if (opt == 'n') {
-+ DEBUG(3,("No mtab!\n"));
-+ no_mtab = True;
-+ opt = getopt(argc, argv, "o:");
-+ }
-+ if (opt != 'o') {
- return;
- }
-
Modified: branches/samba/experimental/debian/patches/usershare.patch
===================================================================
--- branches/samba/experimental/debian/patches/usershare.patch 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/patches/usershare.patch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -8,10 +8,10 @@
Status wrt upstream: Debian-specific
-Index: samba-3.0.26a/docs/manpages/smb.conf.5
+Index: samba-3.0.28a/docs/manpages/smb.conf.5
===================================================================
---- samba-3.0.26a.orig/docs/manpages/smb.conf.5
-+++ samba-3.0.26a/docs/manpages/smb.conf.5
+--- samba-3.0.28a.orig/docs/manpages/smb.conf.5
++++ samba-3.0.28a/docs/manpages/smb.conf.5
@@ -253,7 +253,7 @@
.PP
usershare path
@@ -88,10 +88,10 @@
.RE
.PP
usershare prefix allow list (G)
-Index: samba-3.0.26a/docs/manpages/net.8
+Index: samba-3.0.28a/docs/manpages/net.8
===================================================================
---- samba-3.0.26a.orig/docs/manpages/net.8
-+++ samba-3.0.26a/docs/manpages/net.8
+--- samba-3.0.28a.orig/docs/manpages/net.8
++++ samba-3.0.28a/docs/manpages/net.8
@@ -675,9 +675,9 @@
Store a secret for the sepcified domain, used primarily for domains that use idmap_ldap as a backend. In this case the secret is used as the password for the user DN used to bind to the ldap server.
.SS "USERSHARE"
@@ -104,11 +104,11 @@
.PP
The usershare commands are:
.IP "" 3n
-Index: samba-3.0.26a/source/param/loadparm.c
+Index: samba-3.0.28a/source/param/loadparm.c
===================================================================
---- samba-3.0.26a.orig/source/param/loadparm.c
-+++ samba-3.0.26a/source/param/loadparm.c
-@@ -1676,7 +1676,7 @@
+--- samba-3.0.28a.orig/source/param/loadparm.c
++++ samba-3.0.28a/source/param/loadparm.c
+@@ -1689,7 +1689,7 @@
pstrcat(s, "/usershares");
string_set(&Globals.szUsersharePath, s);
string_set(&Globals.szUsershareTemplateShare, "");
@@ -117,10 +117,10 @@
/* By default disallow sharing of directories not owned by the sharer. */
Globals.bUsershareOwnerOnly = True;
/* By default disallow guest access to usershares. */
-Index: samba-3.0.26a/docs/htmldocs/manpages/smb.conf.5.html
+Index: samba-3.0.28a/docs/htmldocs/manpages/smb.conf.5.html
===================================================================
---- samba-3.0.26a.orig/docs/htmldocs/manpages/smb.conf.5.html
-+++ samba-3.0.26a/docs/htmldocs/manpages/smb.conf.5.html
+--- samba-3.0.28a.orig/docs/htmldocs/manpages/smb.conf.5.html
++++ samba-3.0.28a/docs/htmldocs/manpages/smb.conf.5.html
@@ -164,8 +164,8 @@
their own share definitions has been added. This capability is called <span class="emphasis"><em>usershares</em></span> and
is controlled by a set of parameters in the [global] section of the smb.conf.
@@ -166,10 +166,10 @@
</em></span>
</p></dd><dt><span class="term"><a name="USERSHAREPREFIXALLOWLIST"></a>usershare prefix allow list (G)</span></dt><dd><p>This parameter specifies a list of absolute pathnames
the root of which are allowed to be exported by user defined share definitions.
-Index: samba-3.0.26a/docs/htmldocs/manpages/net.8.html
+Index: samba-3.0.28a/docs/htmldocs/manpages/net.8.html
===================================================================
---- samba-3.0.26a.orig/docs/htmldocs/manpages/net.8.html
-+++ samba-3.0.26a/docs/htmldocs/manpages/net.8.html
+--- samba-3.0.28a.orig/docs/htmldocs/manpages/net.8.html
++++ samba-3.0.28a/docs/htmldocs/manpages/net.8.html
@@ -249,30 +249,10 @@
that use idmap_ldap as a backend. In this case the secret is used
as the password for the user DN used to bind to the ldap server.
Added: branches/samba/experimental/debian/po/id.po
===================================================================
--- branches/samba/experimental/debian/po/id.po (rev 0)
+++ branches/samba/experimental/debian/po/id.po 2008-03-24 09:02:49 UTC (rev 1784)
@@ -0,0 +1,201 @@
+# translation of samba_po-id.po to Bahasa Indonesia
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Arief S Fitrianto <arief at gurame.fisika.ui.ac.id>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: samba_po-id\n"
+"Report-Msgid-Bugs-To: pkg-samba-maint at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"PO-Revision-Date: 2008-03-08 18:24+0700\n"
+"Last-Translator: Arief S Fitrianto <arief at gurame.fisika.ui.ac.id>\n"
+"Language-Team: Bahasa Indonesia <debian-l10n-id at gurame.fisika.ui.ac.id>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplural=1, plural>1\n"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:1001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Ubah smb.conf agar menggunakan setelan WINS dari DHCP?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:1001
+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 ""
+"Jika komputer Anda mendapatkan alamat IP dari sebuah server DHCP di "
+"jaringan, server DHCP tersebut mungkin juga memberikan info tentang server "
+"WINS (\"server NetBIOS\") yang tersedia dalam jaringan. Berkas smb.conf "
+"perlu diubah agar setelan WINS dari server DHCP dapat dibaca otomatis dari /"
+"etc/samba/dhcp.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:1001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr "Paket dhcp3-client harus dipasang agar fitur ini dapat digunakan."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Configure smb.conf automatically?"
+msgstr "Konfigurasikan smb.conf secara otomatis?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+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 the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"Konfigurasi Samba selanjutnya berhubungan dengan pertanyaan seputar "
+"parameter dalam /etc/samba/smb.conf yang digunakan untuk mengonfigurasi "
+"program Samba (nmbd dan smbd). Konfigurasi smb.conf Anda saat ini berisi "
+"setelah yang lebih dari satu baris, yang dapat membingungkan proses "
+"konfigurasi otomatis. Anda harus mengubah smb.conf secara manual agar dapat "
+"digunakan lagi."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Jika Anda tidak mengambil pilihan ini, Anda harus menangani sendiri semua "
+"konfigurasi dan tidak dapat memanfaatkan keuntungan dari pembaharuan "
+"konfigurasi secara periodik."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3001
+msgid "Workgroup/Domain Name:"
+msgstr "Nama Domain/Workgrop:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
+msgstr ""
+"Mohon tentukan workgroup yang Anda ingin server ini dikenali oleh klien. "
+"Ingat bahwa parameter ini juga mengendalikan nama domain yang digunakan oleh "
+"setelan security=domain."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:4001
+msgid "Use password encryption?"
+msgstr "Gunakan enkripsi sandi?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"All 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."
+msgstr ""
+"Semua klien Windows terbaru berkomunikasi dengan server SMB menggunakan "
+"sandi terenkripsi. Jika Anda ingin menggunakan sandi teks, Anda harus "
+"mengubah parameter tersebut dalam register Windows."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Enabling this option is highly recommended. 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 ""
+"Mengaktifkan pilihan ini sangat dianjurkan. Jika demikian, pastikan Anda "
+"memiliki berkas /etc/samba/smbpasswd tempat Anda menyimpan semua sandi "
+"pengguna menggunakan perintah smbpasswd."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:1001
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Buat basis data sandi samba dalam /var/lib/samba/passdb.tdb?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:1001
+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 running smbpasswd "
+"and be kept up-to-date in the future."
+msgstr ""
+"Agar kompatibel dengan semua versi Windows, Samba harus dikonfigurasi untuk "
+"menggunakan sandi terenkripsi. Hal ini mengharuskan sandi pengguna disimpan "
+"dalam berkas selain /etc/passwd. Berkas ini dapat dibuat otomatis, tetapi "
+"kata sandi harus ditambahkan secara manual dengan menjalankan perintah "
+"smbpasswd dan diperbaharui setiap ada perubahan pengguna."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:1001
+msgid ""
+"If you do not create it, you will have to reconfigure Samba (and probably "
+"your client machines) to use plaintext passwords."
+msgstr ""
+"Jika Anda tidak membuatnya, Anda harus mengonfigurasi ulang Samba (dan juga "
+"komputer klien) untuk menggunakan sandi teks-murni."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:1001
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+"Lihat /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html dalam paket samba-"
+"doc."
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "server"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Bagaimana Anda ingin menjalankan Samba"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Server samba (smbd) dapat berjalan sebagai server normal (daemon) atau dari "
+"inetd. Sangat dianjurkan menjalankannya sebagai server normal."
Modified: branches/samba/experimental/debian/rules
===================================================================
--- branches/samba/experimental/debian/rules 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/rules 2008-03-24 09:02:49 UTC (rev 1784)
@@ -52,17 +52,18 @@
--with-automount \
--with-ldap \
--with-ads \
+ --without-smbmount \
--with-dnsupdate
ifeq ($(DEB_HOST_ARCH_OS),linux)
conf_args += \
- --with-smbmount --with-cifsmount \
+ --with-cifsmount \
--with-acl-support \
--with-quotas
mount_cifs = yes
smbfs = yes
else
- conf_args += --without-quotas --without-smbmount --without-cifsmount
+ conf_args += --without-quotas --without-cifsmount
mount_cifs = no
smbfs = no
endif
@@ -109,9 +110,6 @@
source/client/mount.cifs source/client/umount.cifs \
source/include/stamp-h
- sed -e "s/@libacl@/`type-handling any linux-gnu`/g" \
- < debian/control.in > debian/control
-
debconf-updatepo
dh_clean
@@ -147,16 +145,8 @@
install -m 0644 source/nsswitch/libnss_winbind.so $(DESTDIR)/lib/libnss_winbind.so.2
install -m 0644 source/nsswitch/libnss_wins.so $(DESTDIR)/lib/libnss_wins.so.2
-ifeq ($(smbfs),yes)
- # Create the symlinks that will allow us to do "mount -t smbfs ..."
- # and "mount -t smb ...". Note that the source/script/installbin.sh
- # tries to create the first symlink, but we have commented
- # that code out and do everything here. We also create
- # symlinks for the man pages.
- ln -s /usr/bin/smbmount $(DESTDIR)/sbin/mount.smbfs
- ln -s /usr/bin/smbmount $(DESTDIR)/sbin/mount.smb
- ln -s smbmount.8 $(DESTDIR)/usr/share/man/man8/mount.smb.8
- ln -s smbmount.8 $(DESTDIR)/usr/share/man/man8/mount.smbfs.8
+ifeq ($(mount_cifs),yes)
+ install -m 0755 debian/mount.smbfs $(DESTDIR)/sbin/mount.smbfs
endif
# For CUPS to support printing to samba printers, it's necessary
@@ -164,10 +154,10 @@
# Erich Schubert <debian at vitavonni.de> in #109509):
ln -s ../../../bin/smbspool $(DESTDIR)/usr/lib/cups/backend/smb
+ cp debian/smb.conf* $(DESTDIR)/usr/share/samba/
+ install -m755 debian/panic-action $(DESTDIR)/usr/share/samba/
# 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
@@ -209,7 +199,7 @@
DH_OPTIONS= dh_installinit -psamba -- "defaults 20 19"
DH_OPTIONS= dh_installinit -pwinbind
dh_installcron
- for pkg in samba smbfs winbind; do \
+ for pkg in samba samba-common smbfs winbind; do \
install -m 0644 -D debian/$$pkg.lintian debian/$$pkg/usr/share/lintian/overrides/$$pkg || exit; \
done
dh_installchangelogs -Nlibpam-smbpass
@@ -224,14 +214,6 @@
# it becomes executable
chmod a-x debian/libsmbclient-dev/usr/include/libsmbclient.h
-ifeq ($(smbfs),yes)
- # The smbmnt and smbumount binaries should be setuid-root. This
- # has security implications because these programs haven't had
- # a thorough security audit. smbmount _does not_ have to have
- # the setuid bit set. In fact, it is a security hole.
- chmod u+s debian/smbfs/usr/bin/smbmnt
- chmod ug+s debian/smbfs/usr/bin/smbumount
-endif
ifeq ($(mount_cifs),yes)
chmod u+s debian/smbfs/sbin/mount.cifs
chmod u+s debian/smbfs/sbin/umount.cifs
@@ -250,4 +232,9 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
+
+update-archs:
+ sed -i -e "s/libacl1-dev \(([^)]\+)\) \[[^]]\+\]/libacl1-dev \1 [`type-handling any linux-gnu`]/g" \
+ debian/control
+
+.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch update-archs
Modified: branches/samba/experimental/debian/samba-common.config
===================================================================
--- branches/samba/experimental/debian/samba-common.config 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/samba-common.config 2008-03-24 09:02:49 UTC (rev 1784)
@@ -48,15 +48,6 @@
# User wants to use debconf, let's continue...
-# Adjust priority of the question about the workgroup name depending
-# on whether a workgroup name has already being specified.
-db_get samba-common/workgroup || true
-if [ "${RET}" ]; then
- WGPRIORITY=medium
-else
- WGPRIORITY=high
-fi
-
# Preload any values from the existing smb.conf file
if [ -f $FILE ]; then
WORKGROUP=`smbconf_retr workgroup`
@@ -78,7 +69,7 @@
fi
# Get workgroup name
-db_input $WGPRIORITY samba-common/workgroup || true
+db_input high samba-common/workgroup || true
db_go
# Use encrypted passwords?
@@ -97,16 +88,20 @@
# DHCPPRIORITY=high
fi
-if [ ! -f $FILE ] || grep -q -i 'wins server' $FILE
+FOUND=false
+if [ -f $FILE ]; then
+ if grep -q 'include[[:space:]]*=[[:space:]]*/etc/samba/dhcp.conf' $FILE
+ then
+ FOUND=true
+ fi
+ db_set samba-common/dhcp $FOUND
+fi
+
+# we only prompt in one of three cases: the file doesn't exist yet, it
+# has the context we need to add our include line, or the include line
+# is already present.
+if [ ! -f $FILE ] || grep -q -i 'wins server' $FILE || [ "$FOUND" = "true" ];
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
Modified: branches/samba/experimental/debian/samba-common.files
===================================================================
--- branches/samba/experimental/debian/samba-common.files 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/samba-common.files 2008-03-24 09:02:49 UTC (rev 1784)
@@ -15,6 +15,6 @@
usr/share/man/man8/smbpasswd.8
usr/share/samba/lowcase.dat
usr/share/samba/panic-action
-usr/share/samba/smb.conf
+usr/share/samba/smb.conf*
usr/share/samba/upcase.dat
usr/share/samba/valid.dat
Added: branches/samba/experimental/debian/samba-common.lintian
===================================================================
--- branches/samba/experimental/debian/samba-common.lintian (rev 0)
+++ branches/samba/experimental/debian/samba-common.lintian 2008-03-24 09:02:49 UTC (rev 1784)
@@ -0,0 +1,2 @@
+# This is on purpose to hide sensitive information
+samba-common: non-standard-dir-perm var/log/samba/ 0750 != 0755
Modified: branches/samba/experimental/debian/samba-common.postinst
===================================================================
--- branches/samba/experimental/debian/samba-common.postinst 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/samba-common.postinst 2008-03-24 09:02:49 UTC (rev 1784)
@@ -7,21 +7,23 @@
# Do debconf stuff here
. /usr/share/debconf/confmodule
-# We need a default smb.conf file. If one doesn't exist we put in place
-# one that has some basic defaults.
-if [ ! -e /etc/samba/smb.conf ]; then
- cp -a /usr/share/samba/smb.conf /etc/samba/
-fi
+TEMPDIR=/var/run/samba/upgrades
+NEWFILE=$TEMPDIR/smb.conf
+CONFIG=/etc/samba/smb.conf
-# 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
-# config?
-db_get samba-common/do_debconf || true
-if [ "${RET}" = "true" ]; then
+configure_smb_conf() {
+ local CONFIG
+ CONFIG="$1"
+
+ # Is the user configuring with debconf, or he/she prefers
+ # swat/manual config?
+ db_get samba-common/do_debconf || true
+ if [ "${RET}" != "true" ]; then
+ return 0
+ fi
+
# Get workgroup name
db_get samba-common/workgroup || true
WORKGROUP="${RET}"
@@ -34,69 +36,97 @@
s/&/\\\&/g
s/\\\$/\\\\\\\$/g'`
- sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
+ sed -i -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
/^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ \
s/^\([[:space:]]*\)workgroup[[:space:]]*=.*/\1workgroup = ${WORKGROUP}/i" \
- < /etc/samba/smb.conf >${TMPFILE}
- mv -f ${TMPFILE} /etc/samba/smb.conf
+ "$CONFIG"
# Encrypt passwords?
db_get samba-common/encrypt_passwords || true
ENCRYPT_PASSWORDS="${RET}"
- sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
+ sed -i -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
/^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ \
s/^\([[:space:]]*\)encrypt passwords[[:space:]]*=.*/\1encrypt passwords = ${ENCRYPT_PASSWORDS}/i" \
- < /etc/samba/smb.conf >${TMPFILE}
- mv -f ${TMPFILE} /etc/samba/smb.conf
+ "$CONFIG"
# 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
+ db_get samba-common/dhcp
+ if [ "$RET" = true ] && \
+ ! grep -q dhcp.conf "$CONFIG"
then
- sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
+ sed -i -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?
+}" "$CONFIG"
+ elif [ "$RET" != true ]; then
+ sed -i -e '
+ /^#[[:space:]]*If we receive WINS server info from DHCP, override the options above/d
+ /^#*[[:space:]]*include[[:space:]]*=[[:space:]]*\/etc\/samba\/dhcp.conf/,/[^[:space:]]/ {
+ /^#*[[:space:]]*include[[:space:]]*=[[:space:]]*\/etc\/samba\/dhcp.conf/d
+ /^[[:space:]]*$/d
+ }' "$CONFIG"
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
- 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 [ -n "$2" ] && dpkg --compare-versions "$2" lt 3.0.23b-2 \
- && grep -qi "^[[:space:]]*passdb backend[[:space:]]*=.*guest" /etc/samba/smb.conf
+ && grep -qi "^[[:space:]]*passdb backend[[:space:]]*=.*guest" "$CONFIG"
then
- sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
+ sed -i -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
/^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ \
s/^\([[:space:]]*passdb backend[[:space:]]*=[^,]*\),\?[[:space:]]*guest[[:space:]]*$/\1/i" \
- < /etc/samba/smb.conf >${TMPFILE}
- mv -f ${TMPFILE} /etc/samba/smb.conf
+ "$CONFIG"
fi
+}
+
+
+if [ -e "$CONFIG" ]; then
+ configure_smb_conf "$CONFIG"
fi
-chmod a+r /etc/samba/smb.conf
+mkdir -p "$TEMPDIR"
+if [ -n "$2" ] && dpkg --compare-versions "$2" lt 3.0.28-3; then
+ if dpkg --compare-versions "$2" lt 3.0.26a-1 && [ "$2" != "${2%ubuntu*}" ]
+ then
+ base=dapper
+ elif [ "$2" != "${2%ubuntu*}" ]
+ then
+ base=gutsy
+ else
+ base=etch
+ fi
+
+ TEMPLATE=/usr/share/samba/smb.conf.${base}
+
+ cp "$TEMPLATE" "$NEWFILE"
+ configure_smb_conf "$NEWFILE"
+
+ if [ -e "$CONFIG" ]; then
+ sed -e '1,/^[;#[:space:]]*\[cdrom\]/ { d }
+ 1,/^[[:space:]]*\[/ { /^[^[]/d; /^$/d }
+ ' "$CONFIG" >> "$NEWFILE"
+ fi
+
+ ucf --three-way --debconf-ok "$NEWFILE" "$CONFIG"
+fi
+
+cp /usr/share/samba/smb.conf "$NEWFILE"
+configure_smb_conf "$NEWFILE"
+
+if [ -e "$CONFIG" ]; then
+ sed -e '1,/^[;#[:space:]]*\[cdrom\]/ { d }
+ 1,/^[[:space:]]*\[/ { /^[^[]/d; /^$/d }
+ ' "$CONFIG" >> "$NEWFILE"
+fi
+
+ucf --three-way --debconf-ok "$NEWFILE" "$CONFIG"
+ucfr samba-common "$CONFIG"
+
+chmod a+r "$CONFIG"
+
# ------------------------- Debconf questions end ---------------------
db_stop
Modified: branches/samba/experimental/debian/samba-common.postrm
===================================================================
--- branches/samba/experimental/debian/samba-common.postrm 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/samba-common.postrm 2008-03-24 09:02:49 UTC (rev 1784)
@@ -2,6 +2,12 @@
if [ "$1" = purge ]; then
rm -rf /etc/samba/ /var/cache/samba/ /var/lib/samba/ /var/run/samba/
+ if [ -x "`which ucf 2>/dev/null`" ]; then
+ ucf --purge /etc/samba/smb.conf
+ fi
+ if [ -x "`which ucfr 2>/dev/null`" ]; then
+ ucfr --purge samba-common /etc/samba/smb.conf
+ fi
fi
#DEBHELPER#
Modified: branches/samba/experimental/debian/samba-common.templates
===================================================================
--- branches/samba/experimental/debian/samba-common.templates 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/samba-common.templates 2008-03-24 09:02:49 UTC (rev 1784)
@@ -28,6 +28,7 @@
Template: samba-common/workgroup
Type: string
+Default: WORKGROUP
_Description: Workgroup/Domain Name:
Please specify the workgroup you want this server to appear to be in
when queried by clients. Note that this parameter also controls the
Modified: branches/samba/experimental/debian/samba-doc.doc-base.samba-by-example
===================================================================
--- branches/samba/experimental/debian/samba-doc.doc-base.samba-by-example 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/samba-doc.doc-base.samba-by-example 2008-03-24 09:02:49 UTC (rev 1784)
@@ -2,7 +2,7 @@
Title: Samba-3 by Example
Author: John H. Terpstra
Abstract: Practical Exercises in Successful Samba Deployment
-Section: Apps/Net
+Section: Network/File Transfer
Format: HTML
Index: /usr/share/doc/samba-doc/htmldocs/Samba3-ByExample/index.html
Modified: branches/samba/experimental/debian/samba-doc.doc-base.samba-developers-guide
===================================================================
--- branches/samba/experimental/debian/samba-doc.doc-base.samba-developers-guide 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/samba-doc.doc-base.samba-developers-guide 2008-03-24 09:02:49 UTC (rev 1784)
@@ -7,7 +7,7 @@
about the internals of various parts of Samba and the SMB protocol.
It's still (and will always be) incomplete. The most recent version of
this document can be found at http://devel.samba.org/.
-Section: Apps/Net
+Section: Network/File Transfer
Format: HTML
Index: /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/index.html
Modified: branches/samba/experimental/debian/samba-doc.doc-base.samba-howto
===================================================================
--- branches/samba/experimental/debian/samba-doc.doc-base.samba-howto 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/samba-doc.doc-base.samba-howto 2008-03-24 09:02:49 UTC (rev 1784)
@@ -1,7 +1,7 @@
Document: samba-howto
Title: The Official Samba-3 HOWTO and Reference Guide
Author: Jelmer R. Vernooij, John H. Terpstra, Gerald (Jerry) Carter
-Section: Apps/Net
+Section: Network/File Transfer
Format: HTML
Index: /usr/share/doc/samba-doc/htmldocs/Samba3-HOWTO/index.html
Modified: branches/samba/experimental/debian/samba-doc.doc-base.samba-using
===================================================================
--- branches/samba/experimental/debian/samba-doc.doc-base.samba-using 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/samba-doc.doc-base.samba-using 2008-03-24 09:02:49 UTC (rev 1784)
@@ -8,7 +8,7 @@
of Unix to those of Windows. Samba acts as a bridge between the two
systems, connecting the corresponding parts of their architectures and
providing a translation wherever necessary.
-Section: Apps/Net
+Section: Network/File Transfer
Format: HTML
Index: /usr/share/doc/samba-doc/htmldocs/using_samba/toc.html
Modified: branches/samba/experimental/debian/samba.files
===================================================================
--- branches/samba/experimental/debian/samba.files 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/samba.files 2008-03-24 09:02:49 UTC (rev 1784)
@@ -16,3 +16,4 @@
usr/share/man/man8/smbd.8
usr/share/man/man8/mksmbpasswd.8
usr/share/man/man8/tdbbackup.8
+usr/share/man/man8/eventlogadm.8
Modified: branches/samba/experimental/debian/samba.init
===================================================================
--- branches/samba/experimental/debian/samba.init 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/samba.init 2008-03-24 09:02:49 UTC (rev 1784)
@@ -55,7 +55,8 @@
log_end_msg 0
;;
stop)
- log_daemon_msg "Stopping Samba daemons" "nmbd"
+ log_daemon_msg "Stopping Samba daemons"
+ log_progress_msg "nmbd"
start-stop-daemon --stop --quiet --pidfile $NMBDPID
# Wait a little and remove stale PID file
Modified: branches/samba/experimental/debian/samba.lintian
===================================================================
--- branches/samba/experimental/debian/samba.lintian 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/samba.lintian 2008-03-24 09:02:49 UTC (rev 1784)
@@ -1,4 +1 @@
-# This is on purpose to hide sensitive information
-samba: non-standard-dir-perm var/log/samba/ 0750 != 0755
-
samba: non-standard-dir-perm var/spool/samba/ 1777 != 0755
Modified: branches/samba/experimental/debian/samba.postinst
===================================================================
--- branches/samba/experimental/debian/samba.postinst 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/samba.postinst 2008-03-24 09:02:49 UTC (rev 1784)
@@ -105,25 +105,6 @@
update-inetd --enable netbios-ssn
fi
-# This check is a safety net: the /etc/samba/smbpasswd file must have
-# permissions 600.
-if [ -f /etc/samba/smbpasswd ]; then
- chmod 600 /etc/samba/smbpasswd
-fi
-
-# Do the same check for /var/backup/smbpasswd.bak, just in case.
-if [ -f /var/backups/smbpasswd.bak ]; then
- chmod 600 /var/backups/smbpasswd.bak
-fi
-
-# Delete old /etc/samba/debian_config file, which is not used anymore
-# now that we are using debconf.
-rm -f /etc/samba/debian_config
-
-# Move old log files to the new location of Samba's log files
-mv -f /var/log/nmb* /var/log/samba/ 2> /dev/null || true
-mv -f /var/log/smb* /var/log/samba/ 2> /dev/null || true
-
# add the sambashare group
if ! getent group sambashare > /dev/null 2>&1
then
Modified: branches/samba/experimental/debian/smb.conf
===================================================================
--- branches/samba/experimental/debian/smb.conf 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/smb.conf 2008-03-24 09:02:49 UTC (rev 1784)
@@ -66,7 +66,7 @@
# that connects
log file = /var/log/samba/log.%m
-# Put a capping on the size of the log files (in Kb).
+# Cap the size of the individual log files (in KiB).
max log size = 1000
# If you want Samba to only log through syslog then set the following
@@ -106,18 +106,18 @@
# 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
+ unix password sync = yes
# For Unix password sync to work on a Debian GNU/Linux system, the following
# parameters must be set (thanks to Ian Kahan <<kahan at informatik.tu-muenchen.de> for
# sending the correct chat script for the passwd program in Debian Sarge).
passwd program = /usr/bin/passwd %u
- passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n *password\supdated\ssuccessfully* .
+ passwd chat = *Enter\snew\s*\spassword:* %n\n *Retype\snew\s*\spassword:* %n\n *password\supdated\ssuccessfully* .
# 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
+ pam password change = yes
########## Domains ###########
@@ -198,13 +198,12 @@
; idmap uid = 10000-20000
; idmap gid = 10000-20000
; template shell = /bin/bash
-;
-; The following was the default behaviour in sarge
-; but samba upstream reverted the default because it might induce
-; performance issues in large organizations
-; See #368251 for some of the consequences of *not* having
-; this setting and smb.conf(5) for all details
-;
+
+# The following was the default behaviour in sarge,
+# but samba upstream reverted the default because it might induce
+# performance issues in large organizations.
+# See Debian bug #368251 for some of the consequences of *not*
+# having this setting and smb.conf(5) for details.
; winbind enum groups = yes
; winbind enum users = yes
@@ -220,9 +219,9 @@
comment = Home Directories
browseable = no
-# By default, the home directories are exported read-only. Change next
-# parameter to 'yes' if you want to be able to write to them.
- writable = no
+# By default, the home directories are exported read-only. Change the
+# next parameter to 'no' if you want to be able to write to them.
+ read only = yes
# File creation mask is set to 0700 for security reasons. If you want to
# create files with group=rw permissions, set next parameter to 0775.
@@ -234,7 +233,7 @@
# By default, \\server\username shares can be connected to by anyone
# with access to the samba server.
-# The following parameter makes sure that only "username" can connect
+# The following parameter makes sure that only "username" can connect
# to \\server\username
# This might need tweaking when using external authentication schemes
valid users = %S
@@ -245,7 +244,7 @@
; comment = Network Logon Service
; path = /home/samba/netlogon
; guest ok = yes
-; writable = no
+; read only = yes
; share modes = no
# Un-comment the following and create the profiles directory to store
@@ -266,9 +265,9 @@
browseable = no
path = /var/spool/samba
printable = yes
- public = no
- writable = no
- create mode = 0700
+ guest ok = no
+ read only = yes
+ create mask = 0700
# Windows clients look for this share name as a source of downloadable
# printer drivers
@@ -286,10 +285,10 @@
# A sample share for sharing your CD-ROM with others.
;[cdrom]
; comment = Samba server's CD-ROM
-; writable = no
+; read only = yes
; locking = no
; path = /cdrom
-; public = yes
+; guest ok = yes
# The next two parameters show how to auto-mount a CD-ROM when the
# cdrom share is accesed. For this to work /etc/fstab must contain
Added: branches/samba/experimental/debian/smb.conf.dapper
===================================================================
--- branches/samba/experimental/debian/smb.conf.dapper (rev 0)
+++ branches/samba/experimental/debian/smb.conf.dapper 2008-03-24 09:02:49 UTC (rev 1784)
@@ -0,0 +1,299 @@
+#
+# Sample configuration file for the Samba suite for Debian GNU/Linux.
+#
+#
+# This is the main Samba configuration file. You should read the
+# smb.conf(5) manual page in order to understand the options listed
+# here. Samba has a huge number of configurable options most of which
+# are not shown in this example
+#
+# Any line which starts with a ; (semi-colon) or a # (hash)
+# is a comment and is ignored. In this example we will use a #
+# for commentary and a ; for parts of the config file that you
+# may wish to enable
+#
+# NOTE: Whenever you modify this file you should run the command
+# "testparm" to check that you have not made any basic syntactic
+# errors.
+#
+
+#======================= Global Settings =======================
+
+[global]
+
+## Browsing/Identification ###
+
+# Change this to the workgroup/NT-domain name your Samba server will part of
+ workgroup = DEBIAN_FANS
+
+# server string is the equivalent of the NT Description field
+ server string = %h server (Samba, Ubuntu)
+
+# 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
+
+# What naming service and in what order should we use to resolve host names
+# to IP addresses
+; name resolve order = lmhosts host wins bcast
+
+#### Networking ####
+
+# The specific set of interfaces / networks to bind to
+# This can be either the interface name or an IP address/netmask;
+# interface names are normally preferred
+; interfaces = 127.0.0.0/8 eth0
+
+# Only bind to the named interfaces and/or networks; you must use the
+# 'interfaces' option above to use this.
+# It is recommended that you enable this feature if your Samba machine is
+# not protected by a firewall or is a firewall itself. However, this
+# option cannot handle dynamic or non-broadcast interfaces correctly.
+; bind interfaces only = true
+
+
+
+#### Debugging/Accounting ####
+
+# This tells Samba to use a separate log file for each machine
+# that connects
+ log file = /var/log/samba/log.%m
+
+# Put a capping on the size of the log files (in Kb).
+ max log size = 1000
+
+# If you want Samba to only log through syslog then set the following
+# parameter to 'yes'.
+; syslog only = no
+
+# We want Samba to log a minimum amount of information to syslog. Everything
+# should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log
+# through syslog you should set the following parameter to something higher.
+ syslog = 0
+
+# Do something sensible when Samba crashes: mail the admin a backtrace
+ panic action = /usr/share/samba/panic-action %d
+
+
+####### Authentication #######
+
+# "security = user" is always a good idea. This will require a Unix account
+# in this server for every user accessing the server. See
+# /usr/share/doc/samba-doc/htmldocs/Samba-HOWTO-Collection/ServerType.html
+# in the samba-doc package 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.
+ encrypt passwords = no
+
+# If you are using encrypted passwords, Samba will need to know what
+# password database type you are using.
+ passdb backend = tdbsam
+
+ obey pam restrictions = yes
+
+; guest account = nobody
+ invalid users = root
+
+# 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
+
+# For Unix password sync to work on a Debian GNU/Linux system, the following
+# parameters must be set (thanks to Ian Kahan <<kahan at informatik.tu-muenchen.de> for
+# sending the correct chat script for the passwd program in Debian Sarge).
+ passwd program = /usr/bin/passwd %u
+ passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n *password\supdated\ssuccessfully* .
+
+# 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
+
+########## Domains ###########
+
+# Is this machine able to authenticate users. Both PDC and BDC
+# must have this setting enabled. If you are the BDC you must
+# change the 'domain master' setting to no
+#
+; domain logons = yes
+#
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the location of the user's profile directory
+# from the client point of view)
+# The following required a [profiles] share to be setup on the
+# samba server (see below)
+; logon path = \\%N\profiles\%U
+# Another common choice is storing the profile in the user's home directory
+; logon path = \\%N\%U\profile
+
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the location of a user's home directory (from the client
+# point of view)
+; logon drive = H:
+; logon home = \\%N\%U
+
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the script to run during logon. The script must be stored
+# in the [netlogon] share
+# NOTE: Must be store in 'DOS' file format convention
+; logon script = logon.cmd
+
+# This allows Unix users to be created on the domain controller via the SAMR
+# RPC pipe. The example command creates a user account with a disabled Unix
+# password; please adapt to your needs
+; add user script = /usr/sbin/adduser --quiet --disabled-password --gecos "" %u
+
+########## Printing ##########
+
+# If you want to automatically load your printer list rather
+# than setting them up individually then you'll need this
+; load printers = yes
+
+# lpr(ng) printing. You may wish to override the location of the
+# printcap file
+; printing = bsd
+; printcap name = /etc/printcap
+
+# CUPS printing. See also the cupsaddsmb(8) manpage in the
+# cupsys-client package.
+; printing = cups
+; printcap name = cups
+
+# 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 = @lpadmin
+
+
+############ 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
+
+# Most people will find that this option gives better performance.
+# See smb.conf(5) and /usr/share/doc/samba-doc/htmldocs/speed.html
+# for details
+# You may want to add the following on a Linux system:
+# SO_RCVBUF=8192 SO_SNDBUF=8192
+ socket options = TCP_NODELAY
+
+# The following parameter is useful only if you have the linpopup package
+# installed. The samba maintainer and the linpopup maintainer are
+# working to ease installation and configuration of linpopup and samba.
+; message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' &
+
+# Domain Master specifies Samba to be the Domain Master Browser. If this
+# machine will be configured as a BDC (a secondary logon server), you
+# must set this to 'no'; otherwise, the default behavior is recommended.
+; domain master = auto
+
+# Some defaults for winbind (make sure you're not using the ranges
+# for something else.)
+; idmap uid = 10000-20000
+; idmap gid = 10000-20000
+; template shell = /bin/bash
+
+#======================= Share Definitions =======================
+
+# Un-comment the following (and tweak the other settings below to suit)
+# to enable the default home directory shares. This will share each
+# user's home directory as \\server\username
+;[homes]
+; comment = Home Directories
+; browseable = no
+
+# By default, \\server\username shares can be connected to by anyone
+# with access to the samba server. Un-comment the following parameter
+# to make sure that only "username" can connect to \\server\username
+; valid users = %S
+
+# By default, the home directories are exported read-only. Change next
+# parameter to 'yes' if you want to be able to write to them.
+; writable = no
+
+# File creation mask is set to 0600 for security reasons. If you want to
+# create files with group=rw permissions, set next parameter to 0664.
+; create mask = 0600
+
+# Directory creation mask is set to 0700 for security reasons. If you want to
+# create dirs. with group=rw permissions, set next parameter to 0775.
+; directory mask = 0700
+
+# Un-comment the following and create the netlogon directory for Domain Logons
+# (you need to configure Samba to act as a domain controller too.)
+;[netlogon]
+; comment = Network Logon Service
+; path = /home/samba/netlogon
+; guest ok = yes
+; writable = no
+; share modes = no
+
+# Un-comment the following and create the profiles directory to store
+# users profiles (see the "logon path" option above)
+# (you need to configure Samba to act as a domain controller too.)
+# The path below should be writable by all users so that their
+# profile directory may be created the first time they log on
+;[profiles]
+; comment = Users profiles
+; path = /home/samba/profiles
+; guest ok = no
+; browseable = no
+; create mask = 0600
+; directory mask = 0700
+
+[printers]
+ comment = All Printers
+ browseable = no
+ path = /tmp
+ printable = yes
+ public = no
+ 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
+; writable = no
+; locking = no
+; path = /cdrom
+; public = yes
+
+# The next two parameters show how to auto-mount a CD-ROM when the
+# cdrom share is accesed. For this to work /etc/fstab must contain
+# an entry like this:
+#
+# /dev/scd0 /cdrom iso9660 defaults,noauto,ro,user 0 0
+#
+# The CD-ROM gets unmounted automatically after the connection to the
+#
+# If you don't want to use auto-mounting/unmounting make sure the CD
+# is mounted on /cdrom
+#
+; preexec = /bin/mount /cdrom
+; postexec = /bin/umount /cdrom
+
Added: branches/samba/experimental/debian/smb.conf.etch
===================================================================
--- branches/samba/experimental/debian/smb.conf.etch (rev 0)
+++ branches/samba/experimental/debian/smb.conf.etch 2008-03-24 09:02:49 UTC (rev 1784)
@@ -0,0 +1,305 @@
+#
+# Sample configuration file for the Samba suite for Debian GNU/Linux.
+#
+#
+# This is the main Samba configuration file. You should read the
+# smb.conf(5) manual page in order to understand the options listed
+# here. Samba has a huge number of configurable options most of which
+# are not shown in this example
+#
+# Any line which starts with a ; (semi-colon) or a # (hash)
+# is a comment and is ignored. In this example we will use a #
+# for commentary and a ; for parts of the config file that you
+# may wish to enable
+#
+# NOTE: Whenever you modify this file you should run the command
+# "testparm" to check that you have not made any basic syntactic
+# errors.
+#
+
+#======================= Global Settings =======================
+
+[global]
+
+## Browsing/Identification ###
+
+# Change this to the workgroup/NT-domain name your Samba server will part of
+ workgroup = WORKGROUP
+
+# server string is the equivalent of the NT Description field
+ server string = %h server
+
+# 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
+
+# What naming service and in what order should we use to resolve host names
+# to IP addresses
+; name resolve order = lmhosts host wins bcast
+
+#### Networking ####
+
+# The specific set of interfaces / networks to bind to
+# This can be either the interface name or an IP address/netmask;
+# interface names are normally preferred
+; interfaces = 127.0.0.0/8 eth0
+
+# Only bind to the named interfaces and/or networks; you must use the
+# 'interfaces' option above to use this.
+# It is recommended that you enable this feature if your Samba machine is
+# not protected by a firewall or is a firewall itself. However, this
+# option cannot handle dynamic or non-broadcast interfaces correctly.
+; bind interfaces only = true
+
+
+
+#### Debugging/Accounting ####
+
+# This tells Samba to use a separate log file for each machine
+# that connects
+ log file = /var/log/samba/log.%m
+
+# Put a capping on the size of the log files (in Kb).
+ max log size = 1000
+
+# If you want Samba to only log through syslog then set the following
+# parameter to 'yes'.
+; syslog only = no
+
+# We want Samba to log a minimum amount of information to syslog. Everything
+# should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log
+# through syslog you should set the following parameter to something higher.
+ syslog = 0
+
+# Do something sensible when Samba crashes: mail the admin a backtrace
+ panic action = /usr/share/samba/panic-action %d
+
+
+####### Authentication #######
+
+# "security = user" is always a good idea. This will require a Unix account
+# in this server for every user accessing the server. See
+# /usr/share/doc/samba-doc/htmldocs/Samba3-HOWTO/ServerType.html
+# in the samba-doc package 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.
+ encrypt passwords = no
+
+# If you are using encrypted passwords, Samba will need to know what
+# password database type you are using.
+ passdb backend = tdbsam
+
+ obey pam restrictions = yes
+
+; guest account = nobody
+ invalid users = root
+
+# 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
+
+# For Unix password sync to work on a Debian GNU/Linux system, the following
+# parameters must be set (thanks to Ian Kahan <<kahan at informatik.tu-muenchen.de> for
+# sending the correct chat script for the passwd program in Debian Sarge).
+ passwd program = /usr/bin/passwd %u
+ passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n *password\supdated\ssuccessfully* .
+
+# 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
+
+########## Domains ###########
+
+# Is this machine able to authenticate users. Both PDC and BDC
+# must have this setting enabled. If you are the BDC you must
+# change the 'domain master' setting to no
+#
+; domain logons = yes
+#
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the location of the user's profile directory
+# from the client point of view)
+# The following required a [profiles] share to be setup on the
+# samba server (see below)
+; logon path = \\%N\profiles\%U
+# Another common choice is storing the profile in the user's home directory
+; logon path = \\%N\%U\profile
+
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the location of a user's home directory (from the client
+# point of view)
+; logon drive = H:
+; logon home = \\%N\%U
+
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the script to run during logon. The script must be stored
+# in the [netlogon] share
+# NOTE: Must be store in 'DOS' file format convention
+; logon script = logon.cmd
+
+# This allows Unix users to be created on the domain controller via the SAMR
+# RPC pipe. The example command creates a user account with a disabled Unix
+# password; please adapt to your needs
+; add user script = /usr/sbin/adduser --quiet --disabled-password --gecos "" %u
+
+########## Printing ##########
+
+# If you want to automatically load your printer list rather
+# than setting them up individually then you'll need this
+; load printers = yes
+
+# lpr(ng) printing. You may wish to override the location of the
+# printcap file
+; printing = bsd
+; printcap name = /etc/printcap
+
+# CUPS printing. See also the cupsaddsmb(8) manpage in the
+# cupsys-client package.
+; printing = cups
+; printcap name = cups
+
+# 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
+
+
+############ 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
+
+# Most people will find that this option gives better performance.
+# See smb.conf(5) and /usr/share/doc/samba-doc/htmldocs/Samba3-HOWTO/speed.html
+# for details
+# You may want to add the following on a Linux system:
+# SO_RCVBUF=8192 SO_SNDBUF=8192
+ socket options = TCP_NODELAY
+
+# The following parameter is useful only if you have the linpopup package
+# installed. The samba maintainer and the linpopup maintainer are
+# working to ease installation and configuration of linpopup and samba.
+; message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' &
+
+# Domain Master specifies Samba to be the Domain Master Browser. If this
+# machine will be configured as a BDC (a secondary logon server), you
+# must set this to 'no'; otherwise, the default behavior is recommended.
+; domain master = auto
+
+# Some defaults for winbind (make sure you're not using the ranges
+# for something else.)
+; idmap uid = 10000-20000
+; idmap gid = 10000-20000
+; template shell = /bin/bash
+;
+; The following was the default behaviour in sarge
+; but samba upstream reverted the default because it might induce
+; performance issues in large organizations
+; See #368251 for some of the consequences of *not* having
+; this setting and smb.conf(5) for all details
+;
+; winbind enum groups = yes
+; winbind enum users = yes
+
+#======================= Share Definitions =======================
+
+[homes]
+ comment = Home Directories
+ browseable = no
+
+# By default, the home directories are exported read-only. Change next
+# parameter to 'yes' if you want to be able to write to them.
+ writable = no
+
+# File creation mask is set to 0700 for security reasons. If you want to
+# create files with group=rw permissions, set next parameter to 0775.
+ create mask = 0700
+
+# Directory creation mask is set to 0700 for security reasons. If you want to
+# create dirs. with group=rw permissions, set next parameter to 0775.
+ directory mask = 0700
+
+# Restrict access to home directories
+# to the one of the authenticated user
+# This might need tweaking when using external authentication schemes
+ valid users = %S
+
+# Un-comment the following and create the netlogon directory for Domain Logons
+# (you need to configure Samba to act as a domain controller too.)
+;[netlogon]
+; comment = Network Logon Service
+; path = /home/samba/netlogon
+; guest ok = yes
+; writable = no
+; share modes = no
+
+# Un-comment the following and create the profiles directory to store
+# users profiles (see the "logon path" option above)
+# (you need to configure Samba to act as a domain controller too.)
+# The path below should be writable by all users so that their
+# profile directory may be created the first time they log on
+;[profiles]
+; comment = Users profiles
+; path = /home/samba/profiles
+; guest ok = no
+; browseable = no
+; create mask = 0600
+; directory mask = 0700
+
+[printers]
+ comment = All Printers
+ browseable = no
+ path = /var/spool/samba
+ printable = yes
+ public = no
+ 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
+; writable = no
+; locking = no
+; path = /cdrom
+; public = yes
+
+# The next two parameters show how to auto-mount a CD-ROM when the
+# cdrom share is accesed. For this to work /etc/fstab must contain
+# an entry like this:
+#
+# /dev/scd0 /cdrom iso9660 defaults,noauto,ro,user 0 0
+#
+# The CD-ROM gets unmounted automatically after the connection to the
+#
+# If you don't want to use auto-mounting/unmounting make sure the CD
+# is mounted on /cdrom
+#
+; preexec = /bin/mount /cdrom
+; postexec = /bin/umount /cdrom
+
Added: branches/samba/experimental/debian/smb.conf.gutsy
===================================================================
--- branches/samba/experimental/debian/smb.conf.gutsy (rev 0)
+++ branches/samba/experimental/debian/smb.conf.gutsy 2008-03-24 09:02:49 UTC (rev 1784)
@@ -0,0 +1,309 @@
+#
+# Sample configuration file for the Samba suite for Debian GNU/Linux.
+#
+#
+# This is the main Samba configuration file. You should read the
+# smb.conf(5) manual page in order to understand the options listed
+# here. Samba has a huge number of configurable options most of which
+# are not shown in this example
+#
+# Any line which starts with a ; (semi-colon) or a # (hash)
+# is a comment and is ignored. In this example we will use a #
+# for commentary and a ; for parts of the config file that you
+# may wish to enable
+#
+# NOTE: Whenever you modify this file you should run the command
+# "testparm" to check that you have not made any basic syntactic
+# errors.
+#
+
+#======================= Global Settings =======================
+
+[global]
+
+## Browsing/Identification ###
+
+# Change this to the workgroup/NT-domain name your Samba server will part of
+ workgroup = WORKGROUP
+
+# server string is the equivalent of the NT Description field
+ server string = %h server (Samba, Ubuntu)
+
+# 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
+
+# What naming service and in what order should we use to resolve host names
+# to IP addresses
+; name resolve order = lmhosts host wins bcast
+
+#### Networking ####
+
+# The specific set of interfaces / networks to bind to
+# This can be either the interface name or an IP address/netmask;
+# interface names are normally preferred
+; interfaces = 127.0.0.0/8 eth0
+
+# Only bind to the named interfaces and/or networks; you must use the
+# 'interfaces' option above to use this.
+# It is recommended that you enable this feature if your Samba machine is
+# not protected by a firewall or is a firewall itself. However, this
+# option cannot handle dynamic or non-broadcast interfaces correctly.
+; bind interfaces only = true
+
+
+
+#### Debugging/Accounting ####
+
+# This tells Samba to use a separate log file for each machine
+# that connects
+ log file = /var/log/samba/log.%m
+
+# Put a capping on the size of the log files (in Kb).
+ max log size = 1000
+
+# If you want Samba to only log through syslog then set the following
+# parameter to 'yes'.
+; syslog only = no
+
+# We want Samba to log a minimum amount of information to syslog. Everything
+# should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log
+# through syslog you should set the following parameter to something higher.
+ syslog = 0
+
+# Do something sensible when Samba crashes: mail the admin a backtrace
+ panic action = /usr/share/samba/panic-action %d
+
+
+####### Authentication #######
+
+# "security = user" is always a good idea. This will require a Unix account
+# in this server for every user accessing the server. See
+# /usr/share/doc/samba-doc/htmldocs/Samba3-HOWTO/ServerType.html
+# in the samba-doc package 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.
+ encrypt passwords = no
+
+# If you are using encrypted passwords, Samba will need to know what
+# password database type you are using.
+ passdb backend = tdbsam
+
+ obey pam restrictions = yes
+
+; guest account = nobody
+ invalid users = root
+
+# 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
+
+# For Unix password sync to work on a Debian GNU/Linux system, the following
+# parameters must be set (thanks to Ian Kahan <<kahan at informatik.tu-muenchen.de> for
+# sending the correct chat script for the passwd program in Debian Sarge).
+ passwd program = /usr/bin/passwd %u
+ passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n *passwd:*password\supdated\ssuccessfully* .
+
+# 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
+
+########## Domains ###########
+
+# Is this machine able to authenticate users. Both PDC and BDC
+# must have this setting enabled. If you are the BDC you must
+# change the 'domain master' setting to no
+#
+; domain logons = yes
+#
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the location of the user's profile directory
+# from the client point of view)
+# The following required a [profiles] share to be setup on the
+# samba server (see below)
+; logon path = \\%N\profiles\%U
+# Another common choice is storing the profile in the user's home directory
+; logon path = \\%N\%U\profile
+
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the location of a user's home directory (from the client
+# point of view)
+; logon drive = H:
+; logon home = \\%N\%U
+
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the script to run during logon. The script must be stored
+# in the [netlogon] share
+# NOTE: Must be store in 'DOS' file format convention
+; logon script = logon.cmd
+
+# This allows Unix users to be created on the domain controller via the SAMR
+# RPC pipe. The example command creates a user account with a disabled Unix
+# password; please adapt to your needs
+; add user script = /usr/sbin/adduser --quiet --disabled-password --gecos "" %u
+
+########## Printing ##########
+
+# If you want to automatically load your printer list rather
+# than setting them up individually then you'll need this
+; load printers = yes
+
+# lpr(ng) printing. You may wish to override the location of the
+# printcap file
+; printing = bsd
+; printcap name = /etc/printcap
+
+# CUPS printing. See also the cupsaddsmb(8) manpage in the
+# cupsys-client package.
+; printing = cups
+; printcap name = cups
+
+# 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 = @lpadmin
+
+
+############ 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
+
+# Most people will find that this option gives better performance.
+# See smb.conf(5) and /usr/share/doc/samba-doc/htmldocs/Samba3-HOWTO/speed.html
+# for details
+# You may want to add the following on a Linux system:
+# SO_RCVBUF=8192 SO_SNDBUF=8192
+ socket options = TCP_NODELAY
+
+# The following parameter is useful only if you have the linpopup package
+# installed. The samba maintainer and the linpopup maintainer are
+# working to ease installation and configuration of linpopup and samba.
+; message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' &
+
+# Domain Master specifies Samba to be the Domain Master Browser. If this
+# machine will be configured as a BDC (a secondary logon server), you
+# must set this to 'no'; otherwise, the default behavior is recommended.
+; domain master = auto
+
+# Some defaults for winbind (make sure you're not using the ranges
+# for something else.)
+; idmap uid = 10000-20000
+; idmap gid = 10000-20000
+; template shell = /bin/bash
+;
+; The following was the default behaviour in sarge
+; but samba upstream reverted the default because it might induce
+; performance issues in large organizations
+; See #368251 for some of the consequences of *not* having
+; this setting and smb.conf(5) for all details
+;
+; winbind enum groups = yes
+; winbind enum users = yes
+
+#======================= Share Definitions =======================
+
+# Un-comment the following (and tweak the other settings below to suit)
+# to enable the default home directory shares. This will share each
+# user's home directory as \\server\username
+;[homes]
+; comment = Home Directories
+; browseable = no
+
+# By default, \\server\username shares can be connected to by anyone
+# with access to the samba server. Un-comment the following parameter
+# to make sure that only "username" can connect to \\server\username
+# This might need tweaking when using external authentication schemes
+; valid users = %S
+
+# By default, the home directories are exported read-only. Change next
+# parameter to 'yes' if you want to be able to write to them.
+; writable = no
+
+# File creation mask is set to 0700 for security reasons. If you want to
+# create files with group=rw permissions, set next parameter to 0775.
+; create mask = 0700
+
+# Directory creation mask is set to 0700 for security reasons. If you want to
+# create dirs. with group=rw permissions, set next parameter to 0775.
+; directory mask = 0700
+
+# Un-comment the following and create the netlogon directory for Domain Logons
+# (you need to configure Samba to act as a domain controller too.)
+;[netlogon]
+; comment = Network Logon Service
+; path = /home/samba/netlogon
+; guest ok = yes
+; writable = no
+; share modes = no
+
+# Un-comment the following and create the profiles directory to store
+# users profiles (see the "logon path" option above)
+# (you need to configure Samba to act as a domain controller too.)
+# The path below should be writable by all users so that their
+# profile directory may be created the first time they log on
+;[profiles]
+; comment = Users profiles
+; path = /home/samba/profiles
+; guest ok = no
+; browseable = no
+; create mask = 0600
+; directory mask = 0700
+
+[printers]
+ comment = All Printers
+ browseable = no
+ path = /var/spool/samba
+ printable = yes
+ public = no
+ 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
+; writable = no
+; locking = no
+; path = /cdrom
+; public = yes
+
+# The next two parameters show how to auto-mount a CD-ROM when the
+# cdrom share is accesed. For this to work /etc/fstab must contain
+# an entry like this:
+#
+# /dev/scd0 /cdrom iso9660 defaults,noauto,ro,user 0 0
+#
+# The CD-ROM gets unmounted automatically after the connection to the
+#
+# If you don't want to use auto-mounting/unmounting make sure the CD
+# is mounted on /cdrom
+#
+; preexec = /bin/mount /cdrom
+; postexec = /bin/umount /cdrom
+
Added: branches/samba/experimental/debian/smbfs.dirs
===================================================================
--- branches/samba/experimental/debian/smbfs.dirs (rev 0)
+++ branches/samba/experimental/debian/smbfs.dirs 2008-03-24 09:02:49 UTC (rev 1784)
@@ -0,0 +1 @@
+sbin
Modified: branches/samba/experimental/debian/smbfs.files
===================================================================
--- branches/samba/experimental/debian/smbfs.files 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/smbfs.files 2008-03-24 09:02:49 UTC (rev 1784)
@@ -1,14 +1,5 @@
sbin/mount.smbfs
-sbin/mount.smb
sbin/mount.cifs
sbin/umount.cifs
-usr/bin/smbmount
-usr/bin/smbumount
-usr/bin/smbmnt
-usr/share/man/man8/smbmount.8
-usr/share/man/man8/smbumount.8
-usr/share/man/man8/smbmnt.8
-usr/share/man/man8/mount.smb.8
-usr/share/man/man8/mount.smbfs.8
usr/share/man/man8/mount.cifs.8
usr/share/man/man8/umount.cifs.8
Added: branches/samba/experimental/debian/smbfs.links
===================================================================
--- branches/samba/experimental/debian/smbfs.links (rev 0)
+++ branches/samba/experimental/debian/smbfs.links 2008-03-24 09:02:49 UTC (rev 1784)
@@ -0,0 +1,5 @@
+sbin/mount.smbfs usr/bin/smbmount
+sbin/umount.cifs usr/bin/smbumount
+usr/share/man/man8/umount.cifs.8 usr/share/man/man8/smbumount.8
+usr/share/man/man8/mount.cifs.8 usr/share/man/man8/smbmount.8
+usr/share/man/man8/mount.cifs.8 usr/share/man/man8/mount.smbfs.8
Modified: branches/samba/experimental/debian/smbfs.lintian
===================================================================
--- branches/samba/experimental/debian/smbfs.lintian 2008-03-24 08:37:35 UTC (rev 1783)
+++ branches/samba/experimental/debian/smbfs.lintian 2008-03-24 09:02:49 UTC (rev 1784)
@@ -1,4 +1,2 @@
smbfs: setuid-binary sbin/mount.cifs 4755 root/root
smbfs: setuid-binary sbin/umount.cifs 4755 root/root
-smbfs: setuid-gid-binary usr/bin/smbumount 6755 root/root
-smbfs: setuid-binary usr/bin/smbmnt 4755 root/root
More information about the Pkg-samba-maint
mailing list