[debian-edu-commits] debian-edu/ 01/01: Make failing SAMBASID fetch non-fatal.

[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 4d0bd8b9448d486c128bbab37e0fc4397febf0b8
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Fri Aug 22 15:34:14 2014 +0200

    Make failing SAMBASID fetch non-fatal.
---
 debian/changelog                   | 1 +
 ldap-tools/ldap-debian-edu-install | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f7d2292..603e65b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ debian-edu-config (1.721) UNRELEASED; urgency=low
   * Update setup instructions in ldap-debian-edu-install to enable password
     storage in secrets.tdb (new location: /var/lib/samba/private/).
   * Fix path to secrets.tdb in ldap-debian-edu-install.
+  * Make failing SAMBASID fetch non-fatal.
 
  -- Alexander Alemayhu <alexander at bitraf.no>  Thu, 21 Aug 2014 22:51:52 +0200
 
diff --git a/ldap-tools/ldap-debian-edu-install b/ldap-tools/ldap-debian-edu-install
index 21c4787..f540818 100755
--- a/ldap-tools/ldap-debian-edu-install
+++ b/ldap-tools/ldap-debian-edu-install
@@ -486,7 +486,8 @@ EOF
     if [ -z "$SAMBASID" ] ; then
       echo "error: unable to fetch Samba SID, terminating LDAP and Kerberos configuration."
       dns_stop
-      exit 1
+      # FIXME: dont exit to workaround fetching SAMBASID
+      #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