From 3a3009c1116d96a757d351c0f81e29a9887f6c60 Mon Sep 17 00:00:00 2001
From: James Valleroy <jvalleroy@mailbox.org>
Date: Fri, 29 May 2015 20:48:03 -0400
Subject: [PATCH] ldap: Switch to SASL authentication. Assume that root is able
 to modify user directory entries.

---
 actions/change-ldap-user-password | 2 +-
 actions/check-ldap-user-exists    | 2 +-
 actions/create-ldap-user          | 2 +-
 actions/delete-ldap-user          | 2 +-
 actions/rename-ldap-user          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/actions/change-ldap-user-password b/actions/change-ldap-user-password
index 1fc3b5f6e..27f8c467e 100755
--- a/actions/change-ldap-user-password
+++ b/actions/change-ldap-user-password
@@ -21,7 +21,7 @@
 username="$1"
 password="$2"
 
-cat <<EOF |ldapmodify -x -D 'cn=admin,dc=thisbox' -w $(cat /var/lib/plinth/ldap-admin)
+cat <<EOF |ldapmodify -Y EXTERNAL -H ldapi:///
 dn: uid=$username,ou=users,dc=thisbox
 changetype: modify
 replace: userPassword
diff --git a/actions/check-ldap-user-exists b/actions/check-ldap-user-exists
index 6a65522d5..930b12085 100755
--- a/actions/check-ldap-user-exists
+++ b/actions/check-ldap-user-exists
@@ -20,7 +20,7 @@
 
 username="$1"
 
-results=$(ldapsearch -x -D 'cn=admin,dc=thisbox' -w $(cat /var/lib/plinth/ldap-admin) -b 'ou=users,dc=thisbox' -LLL "(uid=$username)" uid)
+results=$(ldapsearch -Y EXTERNAL -H ldapi:/// -b 'ou=users,dc=thisbox' -LLL "(uid=$username)" uid)
 
 if [ -z "$results" ]; then
     echo "User does not exist"
diff --git a/actions/create-ldap-user b/actions/create-ldap-user
index 24e708277..19d02534d 100755
--- a/actions/create-ldap-user
+++ b/actions/create-ldap-user
@@ -21,7 +21,7 @@
 username="$1"
 password="$2"
 
-cat <<EOF |ldapadd -x -D 'cn=admin,dc=thisbox' -w $(cat /var/lib/plinth/ldap-admin)
+cat <<EOF |ldapadd -Y EXTERNAL -H ldapi:///
 dn: uid=$username,ou=users,dc=thisbox
 objectClass: inetOrgPerson
 uid: $username
diff --git a/actions/delete-ldap-user b/actions/delete-ldap-user
index 8bc3a7cf3..8671560b3 100755
--- a/actions/delete-ldap-user
+++ b/actions/delete-ldap-user
@@ -20,7 +20,7 @@
 
 username="$1"
 
-ldapdelete -x -D 'cn=admin,dc=thisbox' -w $(cat /var/lib/plinth/ldap-admin) "uid=$username,ou=users,dc=thisbox"
+ldapdelete -Y EXTERNAL -H ldapi:/// "uid=$username,ou=users,dc=thisbox"
 
 if [ $? -eq 0 ]; then
     echo "Success: user deleted"
diff --git a/actions/rename-ldap-user b/actions/rename-ldap-user
index 62da3bcfd..8c299a230 100755
--- a/actions/rename-ldap-user
+++ b/actions/rename-ldap-user
@@ -21,7 +21,7 @@
 old_username="$1"
 new_username="$2"
 
-cat <<EOF |ldapmodify -x -D 'cn=admin,dc=thisbox' -w $(cat /var/lib/plinth/ldap-admin)
+cat <<EOF |ldapmodify -Y EXTERNAL -H ldapi:///
 dn: uid=$old_username,ou=users,dc=thisbox
 changetype: modrdn
 newrdn: uid=$new_username