[debian-edu-commits] r80470 - in trunk/src/debian-edu-config: debian etc/samba share/ltsp/ltsp_config.d

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-09 21:27:40 +0000 (Sun, 09 Jun 2013)
New Revision: 80470

Modified:
   trunk/src/debian-edu-config/debian/changelog
   trunk/src/debian-edu-config/debian/control
   trunk/src/debian-edu-config/etc/samba/smb-debian-edu.conf
   trunk/src/debian-edu-config/share/ltsp/ltsp_config.d/debian-edu-config-rwbind
Log:
Revert to version 1.455, the current version in squeeze.  Non-critical fixes should go to Wheezy, and all these are already in Wheezy.

Modified: trunk/src/debian-edu-config/debian/changelog
===================================================================
--- trunk/src/debian-edu-config/debian/changelog	2013-06-09 17:10:13 UTC (rev 80469)
+++ trunk/src/debian-edu-config/debian/changelog	2013-06-09 21:27:40 UTC (rev 80470)
@@ -1,12 +1,3 @@
-debian-edu-config (1.456) UNRELEASED; urgency=low
-
-  * Fix passwd sync in Samba. (Closes: #656296).
-  * Mount /var/lib/udisks rw on diskless workstations. (Closes: #629054,
-    #629055).
-  * Use my @debian.org mail address in Uploaders: field.
-
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 01 Apr 2013 14:52:07 +0200
-
 debian-edu-config (1.455) squeeze; urgency=low
 
   [ Wolfgang Schweer ]

Modified: trunk/src/debian-edu-config/debian/control
===================================================================
--- trunk/src/debian-edu-config/debian/control	2013-06-09 17:10:13 UTC (rev 80469)
+++ trunk/src/debian-edu-config/debian/control	2013-06-09 21:27:40 UTC (rev 80470)
@@ -2,7 +2,7 @@
 Section: misc
 Priority: extra
 Maintainer: Debian Edu Developers <debian-edu at lists.debian.org>
-Uploaders: Petter Reinholdtsen <pere at debian.org>, Holger Levsen <holger at debian.org>, Patrick Winnertz <winnie at debian.org>, Vagrant Cascadian <vagrant at debian.org>, Andreas B. Mundt <andi.mundt at web.de>, Mike Gabriel <sunweaver at debian.org>
+Uploaders: Petter Reinholdtsen <pere at debian.org>, Holger Levsen <holger at debian.org>, Patrick Winnertz <winnie at debian.org>, Vagrant Cascadian <vagrant at debian.org>, Andreas B. Mundt <andi.mundt at web.de>, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 Standards-Version: 3.9.1
 Build-Depends: debhelper (>= 7), python-support
 Build-Depends-Indep: po-debconf, po4a

Modified: trunk/src/debian-edu-config/etc/samba/smb-debian-edu.conf
===================================================================
--- trunk/src/debian-edu-config/etc/samba/smb-debian-edu.conf	2013-06-09 17:10:13 UTC (rev 80469)
+++ trunk/src/debian-edu-config/etc/samba/smb-debian-edu.conf	2013-06-09 21:27:40 UTC (rev 80470)
@@ -95,18 +95,6 @@
 # PAM setup
    obey pam restrictions = no 
 
-# passwd sync
-
-   # sync LDAP password
-   ldap passwd sync = yes 
-
-   # sync Kerberos password via kadmin.local
-   unix password sync = yes
-   passwd program = /usr/sbin/kadmin.local -q 'cpw %u'
-   passwd chat = "Authenticating as principal*"\n"Enter password for principal *"%u"*:*" %n\n \n"Re-enter password for principal *"%u"*:*" %n\n \n"Password for *"%u"@* changed."\n
-   # dangerous: if you set the below parameter 'passwd chat debug' to yes, Samba will reveal clear text password in Samba log files...
-   passwd chat debug = no
-
 # Printer settings
 
    load printers = yes
@@ -194,6 +182,10 @@
    read raw = yes
    write raw = yes
 
+   # make sure samba password changes reach NT+LM hashes, userPassword and Kerberos 
+   pam password change = yes
+   unix password sync = no
+
    # no offline cache of shares
    csc policy = disable
 

Modified: trunk/src/debian-edu-config/share/ltsp/ltsp_config.d/debian-edu-config-rwbind
===================================================================
--- trunk/src/debian-edu-config/share/ltsp/ltsp_config.d/debian-edu-config-rwbind	2013-06-09 17:10:13 UTC (rev 80469)
+++ trunk/src/debian-edu-config/share/ltsp/ltsp_config.d/debian-edu-config-rwbind	2013-06-09 21:27:40 UTC (rev 80470)
@@ -25,9 +25,6 @@
         # Make sure udev can write to the directories it is using
 	rw_dirs="$rw_dirs /var/lib/dbus /media"
 
-	# Make sure udisks can write its mtab file
-	rw_dirs="$rw_dirs /var/lib/udisks"
-
 	# ntpd requires rw access to /var/log/ntpstats
 	# WARNING: this is currently disabled as ntpd will constantly write to /var/log/ntpstats
         #          and consume diskless workstation RAM... investigating on a solution for that