[debian-edu-commits] debian-edu/ 02/12: Replace smbldap-tools fork with customized ldapscripts. (Closes: #718865).

[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 9b71c0b54cad6601215413da177bca0ceaf58cd8
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Fri Feb 9 15:25:59 2018 +0100

    Replace smbldap-tools fork with customized ldapscripts. (Closes: #718865).
---
 etc/samba/smbaddclient.sh | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/etc/samba/smbaddclient.sh b/etc/samba/smbaddclient.sh
index 9c2f74c..0cd84b1 100755
--- a/etc/samba/smbaddclient.sh
+++ b/etc/samba/smbaddclient.sh
@@ -3,18 +3,17 @@
 #
 # A wrapper script for adding Samba machines to LDAP
 #
-# Authors: Mike Gabriel <mike.gabriel at das-netzwerkteam.de> 
-#     
-# Date:   2011-09-02
+# Authors: Mike Gabriel <mike.gabriel at das-netzwerkteam.de> 2011-09-02
+#          Wolfgang Schweer <wschweer at arcor.de> 2018-02-07
+# License: GPL v2+
+#
+# This version uses ldapaddmachine (package ldapscripts) with customized config
+# and a machine template suited for GOsa; see files in /etc/ldapscripts.
 
 set +e
 
-# This script shall always succeed in order not to irritate Samba...
-# Most common failure of smbldap-machineadd-gosa is: ,,already exists''
-# which may well happen and should be ignored.
-
-/etc/samba/smbldap-machineadd-gosa -t0 -w "$1"
-nscd -i passwd
+/usr/sbin/ldapaddmachine "$1" 50553
+/usr/sbin/nscd -i passwd
 sleep 1
 exit 0
 

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