[Pkg-samba-maint] r1157 - trunk
Peter Eisentraut
petere at costa.debian.org
Fri Sep 15 21:09:58 UTC 2006
Author: petere
Date: 2006-09-15 21:09:58 +0000 (Fri, 15 Sep 2006)
New Revision: 1157
Added:
trunk/winbind.postrm
Removed:
trunk/winbind.dirs
Modified:
trunk/changelog
trunk/rules
trunk/samba-common.dirs
trunk/samba-common.postrm
trunk/samba.dirs
trunk/samba.postrm
Log:
* Make samba-common owner of /var/{cache,log,run}/samba, let samba and
winbind only delete files they know they're exclusive owners of.
Closes: #370718.
Modified: trunk/changelog
===================================================================
--- trunk/changelog 2006-09-15 13:56:01 UTC (rev 1156)
+++ trunk/changelog 2006-09-15 21:09:58 UTC (rev 1157)
@@ -13,8 +13,11 @@
[ Peter Eisentraut ]
* Make swat binNMU-safe by using ${source:Version} for dependency on
samba-doc
+ * Make samba-common owner of /var/{cache,log,run}/samba, let samba and
+ winbind only delete files they know they're exclusive owners of.
+ Closes: #370718.
- -- Peter Eisentraut <petere at debian.org> Fri, 15 Sep 2006 15:53:26 +0200
+ -- Peter Eisentraut <petere at debian.org> Fri, 15 Sep 2006 15:53:26 +0200
samba (3.0.23c-1) unstable; urgency=low
Modified: trunk/rules
===================================================================
--- trunk/rules 2006-09-15 13:56:01 UTC (rev 1156)
+++ trunk/rules 2006-09-15 21:09:58 UTC (rev 1157)
@@ -241,8 +241,8 @@
endif
# Set some reasonable default perms for the samba logdir.
- chmod 0750 debian/samba/var/log/samba/
- chown root.adm debian/samba/var/log/samba/
+ chmod 0750 debian/samba-common/var/log/samba/
+ chown root:adm debian/samba-common/var/log/samba/
chmod 1777 debian/samba/var/spool/samba/
DH_OPTIONS= dh_makeshlibs -plibsmbclient -V'libsmbclient (>= 3.0.2a-1)'
Modified: trunk/samba-common.dirs
===================================================================
--- trunk/samba-common.dirs 2006-09-15 13:56:01 UTC (rev 1156)
+++ trunk/samba-common.dirs 2006-09-15 21:09:58 UTC (rev 1157)
@@ -1,2 +1,5 @@
etc/samba
etc/dhcp3/dhclient-enter-hooks.d
+var/cache/samba
+var/log/samba
+var/run/samba
Modified: trunk/samba-common.postrm
===================================================================
--- trunk/samba-common.postrm 2006-09-15 13:56:01 UTC (rev 1156)
+++ trunk/samba-common.postrm 2006-09-15 21:09:58 UTC (rev 1157)
@@ -1,10 +1,7 @@
-#!/bin/sh
-#
-#
+#!/bin/sh -e
if [ "$1" = purge ]; then
- # Remove any files left in /etc/samba/
- rm -Rf /etc/samba/
+ rm -rf /etc/samba/ /var/cache/samba/ /var/lib/samba/ /var/run/samba/
fi
#DEBHELPER#
Modified: trunk/samba.dirs
===================================================================
--- trunk/samba.dirs 2006-09-15 13:56:01 UTC (rev 1156)
+++ trunk/samba.dirs 2006-09-15 21:09:58 UTC (rev 1157)
@@ -1,8 +1,5 @@
usr/bin
usr/sbin
-var/log/samba
var/lib/samba/printers/W32X86
var/lib/samba/printers/WIN40
-var/run/samba
-var/cache/samba
var/spool/samba
Modified: trunk/samba.postrm
===================================================================
--- trunk/samba.postrm 2006-09-15 13:56:01 UTC (rev 1156)
+++ trunk/samba.postrm 2006-09-15 21:09:58 UTC (rev 1157)
@@ -1,15 +1,11 @@
#!/bin/sh -e
-#
-#
if [ "$1" = purge ]; then
+ rm -rf /var/cache/samba/browse.dat
+ rm -rf /var/lib/samba/
+ rm -rf /var/log/samba/log.nmbd* /var/log/samba/log.smbd* /var/log/samba/cores/
+ rm -rf /var/run/samba/nmbd.pid /var/run/samba/smbd.pid /var/run/samba/*.tdb
- # Remove Samba's state files, both volatile and non-volatile
- rm -Rf /var/run/samba/ /var/cache/samba/ /var/lib/samba
-
- # Remove log files
- rm -Rf /var/log/samba/
-
# Remove init.d configuration file
echo Removing configuration file /etc/default/samba... >&2
rm -f /etc/default/samba
Deleted: trunk/winbind.dirs
===================================================================
--- trunk/winbind.dirs 2006-09-15 13:56:01 UTC (rev 1156)
+++ trunk/winbind.dirs 2006-09-15 21:09:58 UTC (rev 1157)
@@ -1,2 +0,0 @@
-var/log/samba
-var/run/samba
Added: trunk/winbind.postrm
===================================================================
--- trunk/winbind.postrm (rev 0)
+++ trunk/winbind.postrm 2006-09-15 21:09:58 UTC (rev 1157)
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+if [ "$1" = purge ]; then
+ rm -rf /var/cache/samba/netsamlogon_cache.tdb /var/cache/samba/winbindd_cache.tdb
+ rm -rf /var/log/samba/log.winbind* /var/log/samba/log.wb*
+ rm -rf /var/run/samba/winbindd.pid /var/run/samba/winbindd_privileged/
+fi
+
+#DEBHELPER#
More information about the Pkg-samba-maint
mailing list