[debian-edu-commits] debian-edu/ 01/01: Do not stop bind when failing to set samba sid, as this is no longer fatal. Update log message to reflect the non-fatal state. Update changelog to reflect these changes.

[Petter Reinholdtsen]

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

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

commit b5da531bbfffc26a8ee0163ef0a83a46add33c90
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Aug 22 17:14:25 2014 +0200

    Do not stop bind when failing to set samba sid, as this is no longer fatal.  Update log message to reflect the non-fatal state.  Update changelog to reflect these changes.
---
 debian/changelog                   | 6 +++++-
 ldap-tools/ldap-debian-edu-install | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3444526..650d31f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,9 +29,13 @@ 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.
+  * Make failing SAMBASID fetch non-fatal in ldap-debian-edu-install.
   * Adjust testsuite/cups; the daemon is now called cups-browsed.
 
+  [ Petter Reinholdtse ]
+  * Set samba sid to 'bogus-sid' when continuing the ldap-debian-edu-install
+    script.
+
  -- Alexander Alemayhu <alexander at bitraf.no>  Thu, 21 Aug 2014 22:51:52 +0200
 
 debian-edu-config (1.719) unstable; urgency=high
diff --git a/ldap-tools/ldap-debian-edu-install b/ldap-tools/ldap-debian-edu-install
index f540818..800f9d9 100755
--- a/ldap-tools/ldap-debian-edu-install
+++ b/ldap-tools/ldap-debian-edu-install
@@ -484,10 +484,11 @@ EOF
     sed -i "s:\$SAMBAPWD:$SAMBAPWD:g" /etc/smbldap-tools/smbldap_bind.conf
 
     if [ -z "$SAMBASID" ] ; then
-      echo "error: unable to fetch Samba SID, terminating LDAP and Kerberos configuration."
-      dns_stop
+      echo "error: unable to fetch Samba SID.  Continuing anyway."
       # FIXME: dont exit to workaround fetching SAMBASID
+      #dns_stop
       #exit 1
+      SAMBASID=bogus-sid
     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