[debian-edu-commits] r82148 - in branches/wheezy/debian-edu-config: debian ldap-tools

[pere at alioth.debian.org]

Author: pere
Date: 2013-08-20 05:14:55 +0000 (Tue, 20 Aug 2013)
New Revision: 82148

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/ldap-tools/ldap-debian-edu-install
Log:
Get samba working again by changing ldap-debian-edu-install to
make sure the SID stored in LDAP is the SID generated by samba
when samba is first set up with the temporary configuration.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-08-20 05:14:01 UTC (rev 82147)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-08-20 05:14:55 UTC (rev 82148)
@@ -2,6 +2,9 @@
 
   [ Petter Reinholdtsen ]
   * Wrap long comment lines in ldap-debian-edu-install.
+  * Get samba working again by changing ldap-debian-edu-install to
+    make sure the SID stored in LDAP is the SID generated by samba
+    when samba is first set up with the temporary configuration.
 
  -- Petter Reinholdtsen <pere at debian.org>  Mon, 19 Aug 2013 23:45:27 +0200
 

Modified: branches/wheezy/debian-edu-config/ldap-tools/ldap-debian-edu-install
===================================================================
--- branches/wheezy/debian-edu-config/ldap-tools/ldap-debian-edu-install	2013-08-20 05:14:01 UTC (rev 82147)
+++ branches/wheezy/debian-edu-config/ldap-tools/ldap-debian-edu-install	2013-08-20 05:14:55 UTC (rev 82148)
@@ -454,6 +454,9 @@
     # and generate a sambaSID for <DOMAIN>.
     net -s /etc/samba/smb-debian-edu-ldapbootstrap.conf getlocalsid &> /dev/null
 
+    echo "info: Fetching SMB domain SID."
+    SAMBASID=`net -s /etc/samba/smb.conf getlocalsid SKOLELINUX 2>/dev/null | awk '{ print $6 }'`
+
     # start from scratch with secrets.tdb...
     rm -f /var/lib/samba/secrets.tdb
 
@@ -469,8 +472,6 @@
     chmod 0600 /etc/smbldap-tools/smbldap_bind.conf
     sed -i "s:\$SAMBAPWD:$SAMBAPWD:g" /etc/smbldap-tools/smbldap_bind.conf
 
-    echo "info: Fetching SMB domain SID."
-    SAMBASID=`net -s /etc/samba/smb.conf getlocalsid SKOLELINUX 2>/dev/null | awk '{ print $6 }'`
     if [ -z "$SAMBASID" ] ; then
       echo "error: unable to fetch Samba SID"
       exit 1