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

[pere at alioth.debian.org]

Author: pere
Date: 2013-08-20 12:15:44 +0000 (Tue, 20 Aug 2013)
New Revision: 82155

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/ldap-tools/ldap-debian-edu-install
Log:
Rewrite ldap-debian-edu-install to use 'net getdomainsid' instead of
'net getlocalsid' to get the domain SID, based on feedback from Mike
Gabriel.  It should give separate SIDs for tjener and the domain.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-08-20 06:18:06 UTC (rev 82154)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-08-20 12:15:44 UTC (rev 82155)
@@ -1,3 +1,12 @@
+debian-edu-config (1.713~svn82150) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Rewrite ldap-debian-edu-install to use 'net getdomainsid' instead of
+    'net getlocalsid' to get the domain SID, based on feedback from Mike
+    Gabriel.  It should give separate SIDs for tjener and the domain.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Tue, 20 Aug 2013 14:15:18 +0200
+
 debian-edu-config (1.713~svn82149) unstable; urgency=low
 
   [ Petter Reinholdtsen ]

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 06:18:06 UTC (rev 82154)
+++ branches/wheezy/debian-edu-config/ldap-tools/ldap-debian-edu-install	2013-08-20 12:15:44 UTC (rev 82155)
@@ -455,11 +455,12 @@
     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 }'`
+    SAMBASID=`net -s /etc/samba/smb.conf getdomainsid 2>/dev/null | awk '/SKOLELINUX/ { print $6 }'`
 
     # start from scratch with secrets.tdb...
     rm -f /var/lib/samba/secrets.tdb
 
+
     # remove the bootstrap smb.conf again... this file was really temporary...
     rm -f /etc/samba/smb-debian-edu-ldapbootstrap.conf