* /etc/samba.conf: deactivate 'printer admin' and 'passdb ...'

    lines so current samba works without any problems.
  * debian/preinst: remove /etc/samba/smb.conf from diversions...

diff --git a/debian/changelog b/debian/changelog
index 81be36d..626752f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+grml-etc (0.8-32) unstable; urgency=low
+
+  * /etc/samba.conf: deactivate 'printer admin' and 'passdb ...'
+    lines so current samba works without any problems.
+  * debian/preinst: remove /etc/samba/smb.conf from diversions...
+
+ -- Michael Prokop <mika@grml.org>  Thu,  2 Nov 2006 21:02:22 +0100
+
 grml-etc (0.8-31) unstable; urgency=low
 
   * Activate mdadm[-raid] in /etc/runlevel.conf.hdinstall*.

diff --git a/debian/preinst b/debian/preinst
index 6fc8ab4..c3eacbf 100755 (executable)
--- a/debian/preinst
+++ b/debian/preinst
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Don Okt 12 17:39:16 CEST 2006 [mika]
+# Latest change: Don Nov 02 20:58:57 CET 2006 [mika]
 ################################################################################
 
 set -e
@@ -13,8 +13,7 @@ TO_DIVERT1="login.config mgetty.config"
 TO_DIVERT2="ssh"
 TO_DIVERT3="kismet.conf"
 TO_DIVERT4="wlan-ng.conf"
-TO_DIVERT5="smb.conf"
-TO_DIVERT6="windowlab.menurc"
+TO_DIVERT5="windowlab.menurc"
 
 divert_gen() {
     DEXT=${3:-original}
@@ -52,9 +51,6 @@ case "$1" in
                 divert_gen $cmd /etc/pcmcia
         done
         for cmd in $TO_DIVERT5; do
-                divert_gen $cmd /etc/samba
-        done
-        for cmd in $TO_DIVERT6; do
                 divert_gen $cmd /etc/X11/windowlab
         done
 

diff --git a/etc/samba/smb.conf b/etc/samba/smb.conf
index 98b857c..6165deb 100644 (file)
--- a/etc/samba/smb.conf
+++ b/etc/samba/smb.conf
@@ -3,7 +3,7 @@
 ; Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 ; Bug-Reports:   see http://grml.org/bugs/
 ; License:       This file is licensed under the GPL v2.
-; Latest change: Sun Sep 11 12:40:30 CEST 2005 [mika]
+; Latest change: Don Nov 02 21:02:08 CET 2006 [mika]
 ;###############################################################################
 ; Please see the manual page for smb.conf for detailed description of
 ;      every parameter.
@@ -51,7 +51,7 @@
 ; Passwords are encrypted by default. This way the latest Windows 95 and NT
 ;      clients can connect to the Samba server with no problems.
    encrypt passwords = true
-   passdb backend = smbpasswd guest
+;   passdb backend = smbpasswd
 
 ; It's always a good idea to use a WINS server. If you want this server
 ;      to be the WINS server for your network change the following parameter
@@ -156,7 +156,6 @@
    write list = grml
 
 [printers]
-   printer admin = grml
    comment = All Printers
    browseable = no
    path = /tmp