[debian-edu-commits] debian-edu/ 01/01: Adjust ldap-debian-edu-install to log the error when failing to get the samba sid.
Petter Reinholdtsen
pere at moszumanska.debian.org
Fri Aug 22 13:01:49 UTC 2014
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 366f97e4301df775e25d20b019a1c1690ea585fc
Author: Petter Reinholdtsen <pere at hungry.com>
Date: Fri Aug 22 15:01:45 2014 +0200
Adjust ldap-debian-edu-install to log the error when failing to get the samba sid.
---
debian/changelog | 2 ++
ldap-tools/ldap-debian-edu-install | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index e29c230..f7d2292 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ debian-edu-config (1.721) UNRELEASED; urgency=low
* Update from debhelper version 7 to 9 to get the support needed for
the Apache 2.4 migration.
* Extend nagios test to detect if nagsio3 is completely missing.
+ * Adjust ldap-debian-edu-install to log the error when failing to get
+ the samba sid.
[ Alexander Alemayhu ]
* debian/control:
diff --git a/ldap-tools/ldap-debian-edu-install b/ldap-tools/ldap-debian-edu-install
index 10365dd..21c4787 100755
--- a/ldap-tools/ldap-debian-edu-install
+++ b/ldap-tools/ldap-debian-edu-install
@@ -465,7 +465,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 2>/dev/null | awk '/SKOLELINUX/ { print $6 }'`
+ SAMBASID=`net -s /etc/samba/smb.conf getdomainsid | awk '/SKOLELINUX/ { print $6 }'`
# start from scratch with secrets.tdb...
rm -f /var/lib/samba/private/secrets.tdb
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git
More information about the debian-edu-commits
mailing list