[debian-edu-commits] debian-edu/ 01/01: ldap-debian-edu-install: adjust error message if getting SAMBASID fails; improve changelog.

[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 ec86a18e291e5d5fd8f9eb9f7ff622de955148a3
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Wed Aug 27 10:44:27 2014 +0200

    ldap-debian-edu-install: adjust error message if getting SAMBASID fails; improve changelog.
---
 debian/changelog                   | 8 ++++++--
 ldap-tools/ldap-debian-edu-install | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b45262..19541d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,12 @@ 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.
+  * /usr/bin/ldap-debian-edu-install:
+    - Use temporary smb.conf file to get SAMBASID value and make
+      Samba/LDAP/Kerberos bootstrap complete.
+    - Remove setting bogus sid.
+    - Make failed fetching of SAMBASID fatal again.
+    - Adjust error message if bootstrapping fails.
   * Fix cups issue (not listening on www:631) by adding this listen statement
     to /etc/cups/cupsd-debian-edu.conf.
 
diff --git a/ldap-tools/ldap-debian-edu-install b/ldap-tools/ldap-debian-edu-install
index 5195ebe..77cdd7e 100755
--- a/ldap-tools/ldap-debian-edu-install
+++ b/ldap-tools/ldap-debian-edu-install
@@ -487,7 +487,7 @@ EOF
     sed -i "s:\$SAMBAPWD:$SAMBAPWD:g" /etc/smbldap-tools/smbldap_bind.conf
 
     if [ -z "$SAMBASID" ] ; then
-      echo "error: unable to fetch Samba SID.  Continuing anyway."
+      echo "error: unable to fetch Samba SID. Bootstrapping failed, exiting."
       exit 1
     fi
     # the next line is unknowingly dirty, but it fixes a ,,Can't fetch

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