[debian-edu-commits] debian-edu/ 01/01: Use temporary smb.conf file in /usr/bin/ldap-debian-edu-install to get the SAMBASID value and make Samba/LDAP/Kerberos bootstrap complete.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit 4515e02a828a54f02c7c1e2d01c1385ec4bdbdb1
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Tue Aug 26 18:11:43 2014 +0200

    Use temporary smb.conf file in /usr/bin/ldap-debian-edu-install to get
    the SAMBASID value and make Samba/LDAP/Kerberos bootstrap complete.
---
 debian/changelog                   | 2 ++
 ldap-tools/ldap-debian-edu-install | 8 +++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fb6e0d1..f5c15a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ debian-edu-config (1.722) UNRELEASED; urgency=low
     - /etc/apache2/sites-available/debian-edu-ssl-default.conf:
       + remove deprecated 'NameVirtualHost' statement.
       + treat all options the same way (leading +/-).
+  * Use temporary smb.conf file in /usr/bin/ldap-debian-edu-install to get
+    SAMBASID value and make Samba/LDAP/Kerberos bootstrap complete.
 
   [ Petter Reinholdtsen ]
   * Mention possible cause of the failing webcache test in the error
diff --git a/ldap-tools/ldap-debian-edu-install b/ldap-tools/ldap-debian-edu-install
index 06771a1..5195ebe 100755
--- a/ldap-tools/ldap-debian-edu-install
+++ b/ldap-tools/ldap-debian-edu-install
@@ -32,6 +32,7 @@ set -e
 #  $ rm /var/lib/ldap/*
 #  $ rm -r /var/lib/samba/*
 #  $ mkdir /var/lib/samba/private
+#  $ chmod 755 /var/lib/samba/private
 #  $ /etc/init.d/slapd start
 #  $ /etc/init.d/samba start
 #  $ rm /etc/krb5kdc/stash
@@ -467,7 +468,7 @@ EOF
     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 getdomainsid | awk '/SKOLELINUX/ { print $6 }'`
+    SAMBASID=`net -s /etc/samba/smb-debian-edu-ldapbootstrap.conf getdomainsid | awk '/SKOLELINUX/ { print $6 }'`
 
     # start from scratch with secrets.tdb...
     rm -f /var/lib/samba/private/secrets.tdb
@@ -487,10 +488,7 @@ EOF
 
     if [ -z "$SAMBASID" ] ; then
       echo "error: unable to fetch Samba SID.  Continuing anyway."
-      # FIXME: dont exit to workaround fetching SAMBASID
-      #dns_stop
-      #exit 1
-      SAMBASID=bogus-sid
+      exit 1
     fi
     # the next line is unknowingly dirty, but it fixes a ,,Can't fetch
     # domain SID for name: TJENER'' error if running ,,net

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git