[Pkg-samba-maint] r3447 - in branches/samba/backports.org/lenny/debian: . patches po
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Tue May 4 08:25:43 UTC 2010
tags 575958 pending
tags 573323 pending
tags 546874 pending
tags 576415 pending
tags 462169 pending
thanks
Author: bubulle
Date: 2010-05-04 08:25:40 +0000 (Tue, 04 May 2010)
New Revision: 3447
Added:
branches/samba/backports.org/lenny/debian/samba.if-up
branches/samba/backports.org/lenny/debian/winbind.prerm
Removed:
branches/samba/backports.org/lenny/debian/mount.smbfs
branches/samba/backports.org/lenny/debian/smbfs.NEWS
branches/samba/backports.org/lenny/debian/smbfs.dirs
branches/samba/backports.org/lenny/debian/smbfs.files
branches/samba/backports.org/lenny/debian/smbfs.links
Modified:
branches/samba/backports.org/lenny/debian/README.debian
branches/samba/backports.org/lenny/debian/changelog
branches/samba/backports.org/lenny/debian/control
branches/samba/backports.org/lenny/debian/patches/fix-manpages-warnings.patch
branches/samba/backports.org/lenny/debian/po/pt.po
branches/samba/backports.org/lenny/debian/rules
branches/samba/backports.org/lenny/debian/samba.files
branches/samba/backports.org/lenny/debian/winbind.pam-config
branches/samba/backports.org/lenny/debian/winbind.postinst
Log:
Merge changes from 2:3.4.7~dfsg-1 to 2:3.4.7~dfsg-2
Modified: branches/samba/backports.org/lenny/debian/README.debian
===================================================================
--- branches/samba/backports.org/lenny/debian/README.debian 2010-04-25 16:48:05 UTC (rev 3446)
+++ branches/samba/backports.org/lenny/debian/README.debian 2010-05-04 08:25:40 UTC (rev 3447)
@@ -28,7 +28,6 @@
swat: Samba Web Administration Tool
samba-doc: Samba documentation.
samba-doc-pdf: Samba documentation (PDF format).
-smbfs: Mount and umount commands for cifs (smbfs is removed)
samba-tools: Tools provided by the Samba suite
libpam-smbpass: pluggable authentication module for SMB password database.
libsmbclient: Shared library that allows applications to talk to SMB servers.
Modified: branches/samba/backports.org/lenny/debian/changelog
===================================================================
--- branches/samba/backports.org/lenny/debian/changelog 2010-04-25 16:48:05 UTC (rev 3446)
+++ branches/samba/backports.org/lenny/debian/changelog 2010-05-04 08:25:40 UTC (rev 3447)
@@ -1,11 +1,34 @@
-samba (2:3.4.7~dfsg-1~bpo50+1) UNRELEASED; urgency=low
+samba (2:3.4.7~dfsg-2~bpo50+1) lenny-backports-UNRELEASED; urgency=low
- * Backport to lenny. Do our best to resync all packaging changes
- with what we have in squeeze
+ * Backport to lenny.
+ * Use 1.0 source format
* Drop PAM profile for winbind (not supported in lenny)
- -- Christian Perrier <bubulle at debian.org> Sat, 13 Mar 2010 12:02:20 +0100
+ -- Christian Perrier <bubulle at debian.org> Tue, 04 May 2010 10:21:16 +0200
+samba (2:3.4.7~dfsg-2) unstable; urgency=low
+
+ [ Christian Perrier ]
+ * Drop smbfs package (now provided by cifs-utils as a dummy transition
+ package)
+
+ [ Debconf translations ]
+ * Portuguese (Miguel Figueiredo). Closes: #575958
+
+ [ Steve Langasek ]
+ * winbind.prerm: don't forget to remove the PAM profile on package
+ removal :/
+ * Fix winbind.pam-config to not interfere with password changes for
+ non-winbind accounts. Closes: #573323, LP: #546874.
+ * debian/samba.if-up, debian/rules: add an if-up.d script for samba to
+ try to start nmbd, if it's not running because /etc/init.d/samba ran
+ before the network was up at boot time. Closes: #576415, LP: #462169.
+ * debian/samba.if-up: allow "NetworkManager" as a recognized address
+ family... it's obviously /not/ an address family, but it's what gets
+ sent when using NM, so we'll cope for now.
+
+ -- Christian Perrier <bubulle at debian.org> Sat, 17 Apr 2010 07:49:49 +0200
+
samba (2:3.4.7~dfsg-1) unstable; urgency=low
[ Steve Langasek ]
Modified: branches/samba/backports.org/lenny/debian/control
===================================================================
--- branches/samba/backports.org/lenny/debian/control 2010-04-25 16:48:05 UTC (rev 3446)
+++ branches/samba/backports.org/lenny/debian/control 2010-05-04 08:25:40 UTC (rev 3447)
@@ -37,7 +37,7 @@
Directory realm, you will also need the winbind package.
.
This package is not required for connecting to existing SMB/CIFS servers
- (see smbclient) or for mounting remote filesystems (see smbfs).
+ (see smbclient) or for mounting remote filesystems (see cifs-utils).
Package: samba-common-bin
Architecture: any
@@ -81,7 +81,7 @@
Depends: samba-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: samba (<< 2.999+3.0.alpha21-4), smbget
Provides: samba-client
-Suggests: smbfs
+Suggests: cifs-utils
Conflicts: samba4-clients
Description: command-line SMB/CIFS clients for Unix
Samba is an implementation of the SMB/CIFS protocol for Unix systems,
@@ -90,7 +90,8 @@
.
This package contains command-line utilities for accessing Microsoft
Windows and Samba servers, including smbclient, smbtar, and smbspool.
- Utilities for mounting shares locally are found in the package smbfs.
+ Utilities for mounting shares locally are found in the package
+ cifs-utils.
Package: swat
Architecture: any
@@ -134,22 +135,6 @@
.
This package contains all the PDF documentation for the Samba suite.
-Package: smbfs
-Section: otherosfs
-Priority: optional
-Architecture: any
-Depends: netbase (>= 2.02), samba-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: smbclient
-Replaces: smbfsx
-Description: Samba file system utilities
- Samba is an implementation of the SMB/CIFS protocol for Unix systems,
- providing support for cross-platform file and printer sharing with
- Microsoft Windows, OS X, and other Unix systems.
- .
- This package provides utilities for mounting and unmounting cifs network
- file systems. Other command-line utilities such as smbclient, smbtar
- and smbspool are in the package smbclient.
-
Package: libpam-smbpass
Section: admin
Priority: extra
Deleted: branches/samba/backports.org/lenny/debian/mount.smbfs
===================================================================
--- branches/samba/backports.org/lenny/debian/mount.smbfs 2010-04-25 16:48:05 UTC (rev 3446)
+++ branches/samba/backports.org/lenny/debian/mount.smbfs 2010-05-04 08:25:40 UTC (rev 3447)
@@ -1,115 +0,0 @@
-#!/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[@]}"
Modified: branches/samba/backports.org/lenny/debian/patches/fix-manpages-warnings.patch
===================================================================
--- branches/samba/backports.org/lenny/debian/patches/fix-manpages-warnings.patch 2010-04-25 16:48:05 UTC (rev 3446)
+++ branches/samba/backports.org/lenny/debian/patches/fix-manpages-warnings.patch 2010-05-04 08:25:40 UTC (rev 3447)
@@ -2,34 +2,6 @@
Lintian report non-existing macros in manpages.
Author: Christian Perrier <bubulle at debian.org>
-Index: b/docs/manpages/cifs.upcall.8
-===================================================================
---- a/docs/manpages/cifs.upcall.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/cifs.upcall.8 2009-11-08 15:55:36.000000000 +0100
-@@ -33,7 +33,6 @@
- .\" SH - level-one heading that works better for non-TTY output
- .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- .de1 SH
--.\" put an extra blank line of space above the head in non-TTY output
- .if t \{\
- .sp 1
- .\}
-@@ -48,7 +47,6 @@
- .it 1 an-trap
- .nr an-no-space-flag 1
- .nr an-break-flag 1
--\." make the size of the head bigger
- .ps +3
- .ft B
- .ne (2v + 1u)
-@@ -82,7 +80,6 @@
- .nr an-no-space-flag 1
- .nr an-break-flag 1
- .ps \\n[PS-SS]u
--\." make the size of the head bigger
- .ps +2
- .ft B
- .ne (2v + 1u)
Index: b/docs/manpages/eventlogadm.8
===================================================================
--- a/docs/manpages/eventlogadm.8 2009-11-08 15:54:26.000000000 +0100
@@ -562,34 +534,6 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/mount.cifs.8
-===================================================================
---- a/docs/manpages/mount.cifs.8 2009-11-08 15:54:27.000000000 +0100
-+++ b/docs/manpages/mount.cifs.8 2009-11-08 15:55:36.000000000 +0100
-@@ -33,7 +33,6 @@
- .\" SH - level-one heading that works better for non-TTY output
- .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- .de1 SH
--.\" put an extra blank line of space above the head in non-TTY output
- .if t \{\
- .sp 1
- .\}
-@@ -48,7 +47,6 @@
- .it 1 an-trap
- .nr an-no-space-flag 1
- .nr an-break-flag 1
--\." make the size of the head bigger
- .ps +3
- .ft B
- .ne (2v + 1u)
-@@ -82,7 +80,6 @@
- .nr an-no-space-flag 1
- .nr an-break-flag 1
- .ps \\n[PS-SS]u
--\." make the size of the head bigger
- .ps +2
- .ft B
- .ne (2v + 1u)
Index: b/docs/manpages/net.8
===================================================================
--- a/docs/manpages/net.8 2009-11-08 15:55:35.000000000 +0100
@@ -1374,34 +1318,6 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/umount.cifs.8
-===================================================================
---- a/docs/manpages/umount.cifs.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/umount.cifs.8 2009-11-08 15:55:36.000000000 +0100
-@@ -33,7 +33,6 @@
- .\" SH - level-one heading that works better for non-TTY output
- .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- .de1 SH
--.\" put an extra blank line of space above the head in non-TTY output
- .if t \{\
- .sp 1
- .\}
-@@ -48,7 +47,6 @@
- .it 1 an-trap
- .nr an-no-space-flag 1
- .nr an-break-flag 1
--\." make the size of the head bigger
- .ps +3
- .ft B
- .ne (2v + 1u)
-@@ -82,7 +80,6 @@
- .nr an-no-space-flag 1
- .nr an-break-flag 1
- .ps \\n[PS-SS]u
--\." make the size of the head bigger
- .ps +2
- .ft B
- .ne (2v + 1u)
Index: b/docs/manpages/vfs_audit.8
===================================================================
--- a/docs/manpages/vfs_audit.8 2009-11-08 15:54:26.000000000 +0100
Modified: branches/samba/backports.org/lenny/debian/po/pt.po
===================================================================
--- branches/samba/backports.org/lenny/debian/po/pt.po 2010-04-25 16:48:05 UTC (rev 3446)
+++ branches/samba/backports.org/lenny/debian/po/pt.po 2010-05-04 08:25:40 UTC (rev 3447)
@@ -1,13 +1,13 @@
# translation of pt.po to Portuguese
# translation of samba Debian debconf template to Portuguese
-# Miguel Figueiredo <elmig at debianpt.org>, 2004, 2007
+# Miguel Figueiredo <elmig at debianpt.org>, 2004, 2007, 2010
#
msgid ""
msgstr ""
-"Project-Id-Version: samba 3.0.9-1\n"
+"Project-Id-Version: samba\n"
"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
"POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2006-08-14 07:42-0000\n"
+"PO-Revision-Date: 2010-03-30 21:36+0100\n"
"Last-Translator: Miguel Figueiredo <elmig at debian.org>\n"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
"MIME-Version: 1.0\n"
@@ -67,9 +67,9 @@
"O resto da configuração do Samba trata de questões que afectam parâmetros "
"em /etc/samba/smb.conf, que é o ficheiro utilizado para configurar os "
"programas do Samba (nmbd e smbd). O seu actual smb.conf contém uma linha "
-"'include' ou uma opção que se espalha por várias linhas, a qual pode "
+"\"include\" ou uma opção que se espalha por várias linhas, a qual pode "
"confundir o processo de configuração automática e necessitar que você edite "
-"à mão o smb.conf par o ter novamente operacional."
+"à mão o smb.conf para o ter novamente operacional."
#. Type: boolean
#. Description
@@ -92,67 +92,57 @@
#. Type: string
#. Description
#: ../samba-common.templates:3001
-#, fuzzy
-#| 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."
msgid ""
"Please specify the workgroup for this system. This setting controls which "
"workgroup the system will appear in when used as a server, the default "
"workgroup to be used when browsing with various frontends, and the domain "
"name used with the \"security=domain\" setting."
msgstr ""
-"Por favor especifique o grupo de trabalho em que quer que este servidor "
-"apareça quando questionado pelos clientes. Note que este parâmetro também "
-"controla o nome de Domínio utilizado com a configuração security=domain."
+"Por favor especifique o grupo de trabalho para este sistema. Esta "
+"configuração controla qual o grupo de trabalho que irá aparecer quando for "
+"utilizado como servidor, o grupo de trabalho predefinido a ser utilizado ao "
+"navegar com vários frontends, e o nome de domínio utilizado com a "
+"configuração \"security=domain\"."
#. Type: boolean
#. Description
#: ../samba-common.templates:4001
msgid "Use password encryption?"
-msgstr "Utilizar encriptação de passwords?"
+msgstr "Utilizar encriptação de palavras-passe?"
#. Type: boolean
#. Description
#: ../samba-common.templates:4001
-#, fuzzy
-#| 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."
msgid ""
"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
"passwords. If you want to use clear text passwords you will need to change a "
"parameter in your Windows registry."
msgstr ""
-"Todos os clientes Windows recentes comunicam com servidores SMB utilizando "
-"passwords encriptadas. Se deseja utilizar passwords de texto puro você vai "
-"ter de alterar um parâmetro no registo do seu Windows."
+"Todos os clientes Windows recentes comunicam com servidores SMB/CIFS "
+"utilizando palavras-passe encriptadas. Se deseja utilizar palavras-passe de "
+"texto visível irá ter de alterar um parâmetro no registo do seu Windows."
#. Type: boolean
#. Description
#: ../samba-common.templates:4001
-#, fuzzy
-#| 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."
msgid ""
"Enabling this option is highly recommended as support for plain text "
"passwords is no longer maintained in Microsoft Windows products. 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 ""
-"É altamente recomendado que escolha esta opção. Se o fizer, assegure-se que "
-"tem um ficheiro /etc/samba/smbpasswd válido e que define as passwords para "
-"cada utilizador utilizando o comando smbpasswd."
+"É altamente recomendado que escolha esta opção porque o suporte para "
+"palavras-passe com texto visível já não é mantido nos produtos Microsoft "
+"Windows. Se o fizer, assegure-se que tem um ficheiro /etc/samba/smbpasswd "
+"válido e que define as palavras-passe para cada utilizador utilizando o "
+"comando smbpasswd."
#. Type: boolean
#. Description
#: ../samba.templates:1001
msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Criar base de dados de passwords samba, /var/lib/samba/passdb.tdb?"
+msgstr ""
+"Criar base de dados de palavras-passe samba, /var/lib/samba/passdb.tdb?"
#. Type: boolean
#. Description
@@ -164,12 +154,12 @@
"automatically, but the passwords must be added manually by running smbpasswd "
"and be kept up-to-date in the future."
msgstr ""
-"Para ser compatível com as omissões na maioria das versões do Windows, o "
-"Samba tem de ser configurado para utilizar passwords encriptadas. Isto faz "
-"com que as passwords dos utilizadores sejam guardadas noutro ficheiro "
-"separado do /etc/passwd. Este ficheiro pode ser criado automaticamente, mas "
-"as passwords têm de ser manualmente adicionadas correndo o smbpasswd e "
-"mantidas actualizadas no futuro."
+"Para ser compatível com as predefinições na maioria das versões do Windows, "
+"o Samba tem de ser configurado para utilizar palavras-passe encriptadas. "
+"Isto faz com que as passwords dos utilizadores sejam guardadas noutro "
+"ficheiro separado do /etc/passwd. Este ficheiro pode ser criado "
+"automaticamente, mas as palavras-passe têm de ser manualmente adicionadas "
+"correndo o smbpasswd e mantidas actualizadas no futuro."
#. Type: boolean
#. Description
@@ -178,8 +168,8 @@
"If you do not create it, you will have to reconfigure Samba (and probably "
"your client machines) to use plaintext passwords."
msgstr ""
-"Se não o criar, terá de reconfigurar o samba (e provavelmente as suas "
-"máquinas clientes) para utilizar passwords de texto puro."
+"Se não o criar, terá de reconfigurar o Samba (e provavelmente as suas "
+"máquinas clientes) para utilizar palavras-passe de texto visível."
#. Type: boolean
#. Description
Modified: branches/samba/backports.org/lenny/debian/rules
===================================================================
--- branches/samba/backports.org/lenny/debian/rules 2010-04-25 16:48:05 UTC (rev 3446)
+++ branches/samba/backports.org/lenny/debian/rules 2010-05-04 08:25:40 UTC (rev 3447)
@@ -68,16 +68,12 @@
ifeq ($(DEB_HOST_ARCH_OS),linux)
conf_args += \
--with-ctdb --with-cluster-support=yes \
- --with-cifsmount \
- --with-cifsupcall \
--with-acl-support \
- --with-quotas
- mount_cifs = yes
- smbfs = yes
-else
+ --with-quotas \
+ --without-cifsmount \
+ --without-cifsupcall
+ else
conf_args += --without-quotas --without-cifsmount
- mount_cifs = no
- smbfs = no
endif
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -118,7 +114,7 @@
[ ! -f source3/Makefile ] || $(MAKE) -C source3 distclean
# Delete stuff left after a build that is not deleted by 'make clean'
- rm -f source3/bin/cifs.upcall source3/pkgconfig/*.pc \
+ rm -f source3/pkgconfig/*.pc \
source3/exports/libsmbclient.syms \
source3/exports/libsmbsharemodes.syms
@@ -126,10 +122,6 @@
dh_clean
-ifeq ($(smbfs),no)
- DH_EXTRAS=-Nsmbfs
-endif
-
install: DH_OPTIONS=$(DH_EXTRAS)
install: build
dh_testdir
@@ -178,10 +170,6 @@
install -m 0755 source3/bin/tdbtorture $(DESTDIR)/usr/bin/tdbtorture
install -m 0755 source3/bin/smbconftort $(DESTDIR)/usr/bin/smbconftort
-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
# to make the following symlink (according to
# Erich Schubert <debian at vitavonni.de> in #109509):
@@ -193,6 +181,8 @@
# correct place by dh_movefiles.
cp debian/gdbcommands $(DESTDIR)/etc/samba/
install -m755 debian/samba-common.dhcp $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d/samba
+ mkdir -p $(DESTDIR)/etc/network/if-up.d
+ install -o root -g root debian/samba.if-up $(DESTDIR)/etc/network/if-up.d/samba
dh_movefiles
dh_installpam --name=samba
Modified: branches/samba/backports.org/lenny/debian/samba.files
===================================================================
--- branches/samba/backports.org/lenny/debian/samba.files 2010-04-25 16:48:05 UTC (rev 3446)
+++ branches/samba/backports.org/lenny/debian/samba.files 2010-05-04 08:25:40 UTC (rev 3447)
@@ -17,3 +17,4 @@
usr/share/man/man8/mksmbpasswd.8
usr/share/man/man8/tdbbackup.8
usr/share/man/man8/eventlogadm.8
+etc/network/if-up.d/samba
Copied: branches/samba/backports.org/lenny/debian/samba.if-up (from rev 3446, tags/samba/2:3.4.7~dfsg-2/debian/samba.if-up)
===================================================================
--- branches/samba/backports.org/lenny/debian/samba.if-up (rev 0)
+++ branches/samba/backports.org/lenny/debian/samba.if-up 2010-05-04 08:25:40 UTC (rev 3447)
@@ -0,0 +1,33 @@
+#!/bin/sh
+# Try to bring nmbd up when an interface comes up, if smbd is already running.
+
+# Don't bother to do anything for lo.
+if [ "$IFACE" = lo ]; then
+ exit 0
+fi
+
+# Only run from ifup.
+if [ "$MODE" != start ]; then
+ exit 0
+fi
+
+# Samba only cares about inet and inet6. Get thee gone, strange people
+# still using ipx.
+case $ADDRFAM in
+ inet|inet6|NetworkManager)
+ ;;
+ *)
+ exit 0
+ ;;
+esac
+
+status=$(/etc/init.d/samba status)
+
+# Really only necessary to do anything if nmbd is not already running
+if echo "$status" | grep -q 'smbd is running' \
+ && ! echo "$status" | grep -q 'nmbd is running'
+then
+ /etc/init.d/samba start
+fi
+
+exit 0
Deleted: branches/samba/backports.org/lenny/debian/smbfs.NEWS
===================================================================
--- branches/samba/backports.org/lenny/debian/smbfs.NEWS 2010-04-25 16:48:05 UTC (rev 3446)
+++ branches/samba/backports.org/lenny/debian/smbfs.NEWS 2010-05-04 08:25:40 UTC (rev 3447)
@@ -1,10 +0,0 @@
-smbfs (2:3.4.5~dfsg-2) unstable; urgency=low
-
- * As of this version, the mount.cifs binary is no longer setuid.
- Upstream has always been increasingly unsupportive of this
- configuration over time. For instance, in bugs like
- https://bugzilla.samba.org/show_bug.cgi?id=6853, it is clearly
- mentioned that having it setuid root is discouraged.
-
- -- Christian Perrier <bubulle at debian.org> Sat, 06 Feb 2010 15:09:00 +0100
-
\ No newline at end of file
Deleted: branches/samba/backports.org/lenny/debian/smbfs.dirs
===================================================================
--- branches/samba/backports.org/lenny/debian/smbfs.dirs 2010-04-25 16:48:05 UTC (rev 3446)
+++ branches/samba/backports.org/lenny/debian/smbfs.dirs 2010-05-04 08:25:40 UTC (rev 3447)
@@ -1 +0,0 @@
-sbin
Deleted: branches/samba/backports.org/lenny/debian/smbfs.files
===================================================================
--- branches/samba/backports.org/lenny/debian/smbfs.files 2010-04-25 16:48:05 UTC (rev 3446)
+++ branches/samba/backports.org/lenny/debian/smbfs.files 2010-05-04 08:25:40 UTC (rev 3447)
@@ -1,7 +0,0 @@
-sbin/mount.smbfs
-sbin/mount.cifs
-sbin/umount.cifs
-usr/sbin/cifs.upcall
-usr/share/man/man8/mount.cifs.8
-usr/share/man/man8/umount.cifs.8
-usr/share/man/man8/cifs.upcall.8
Deleted: branches/samba/backports.org/lenny/debian/smbfs.links
===================================================================
--- branches/samba/backports.org/lenny/debian/smbfs.links 2010-04-25 16:48:05 UTC (rev 3446)
+++ branches/samba/backports.org/lenny/debian/smbfs.links 2010-05-04 08:25:40 UTC (rev 3447)
@@ -1,5 +0,0 @@
-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/backports.org/lenny/debian/winbind.pam-config
===================================================================
--- branches/samba/backports.org/lenny/debian/winbind.pam-config 2010-04-25 16:48:05 UTC (rev 3446)
+++ branches/samba/backports.org/lenny/debian/winbind.pam-config 2010-05-04 08:25:40 UTC (rev 3447)
@@ -9,11 +9,11 @@
Account-Type: Primary
Account:
[success=end new_authtok_reqd=done default=ignore] pam_winbind.so
-Password-Type: Additional
+Password-Type: Primary
Password:
- requisite pam_winbind.so use_authtok try_first_pass
+ [success=end default=ignore] pam_winbind.so use_authtok try_first_pass
Password-Initial:
- requisite pam_winbind.so
+ [success=end default=ignore] pam_winbind.so
Session-Type: Additional
Session:
optional pam_winbind.so
Modified: branches/samba/backports.org/lenny/debian/winbind.postinst
===================================================================
--- branches/samba/backports.org/lenny/debian/winbind.postinst 2010-04-25 16:48:05 UTC (rev 3446)
+++ branches/samba/backports.org/lenny/debian/winbind.postinst 2010-05-04 08:25:40 UTC (rev 3447)
@@ -13,4 +13,6 @@
mv /var/run/samba/idmap_cache.tdb /var/cache/samba/idmap_cache.tdb
fi
+pam-auth-update --package
+
#DEBHELPER#
Copied: branches/samba/backports.org/lenny/debian/winbind.prerm (from rev 3446, tags/samba/2:3.4.7~dfsg-2/debian/winbind.prerm)
===================================================================
--- branches/samba/backports.org/lenny/debian/winbind.prerm (rev 0)
+++ branches/samba/backports.org/lenny/debian/winbind.prerm 2010-05-04 08:25:40 UTC (rev 3447)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = remove ]; then
+ pam-auth-update --package --remove winbind
+fi
+
+#DEBHELPER#
More information about the Pkg-samba-maint
mailing list