From 7327a6b8038d9e55984085dd07021971122ceb8f Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Fri, 3 Nov 2017 17:18:25 +0530 Subject: [PATCH] users: After setup, enable and restart slapd and nslcd Apply the patch present in Debian packaging: James Valleroy: When testing new image builds, I found users created through plinth could not login through console or SSH. The reason is that slapd and nslcd services were not enabled and not running. I don't know what is causing this situation, so this is just a workaround. Signed-off-by: James Valleroy Reviewed-by: Sunil Mohan Adapa --- actions/users | 6 +++++ .../patches/0004-enable-login-services.patch | 22 ------------------- 2 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 debian/patches/0004-enable-login-services.patch diff --git a/actions/users b/actions/users index d5059a4b1..3d96c0f08 100755 --- a/actions/users +++ b/actions/users @@ -113,6 +113,12 @@ def configure_slapd(): {'nsswitch': 'group, passwd, shadow'}) action_utils.service_restart('nscd') + # XXX: Workaround for login issue + action_utils.service_enable('slapd') + action_utils.service_start('slapd') + action_utils.service_enable('nslcd') + action_utils.service_start('nslcd') + def configure_ldap_structure(): """Configure LDAP basic structure.""" diff --git a/debian/patches/0004-enable-login-services.patch b/debian/patches/0004-enable-login-services.patch deleted file mode 100644 index 119896088..000000000 --- a/debian/patches/0004-enable-login-services.patch +++ /dev/null @@ -1,22 +0,0 @@ -Subject: workaround for login issue - -When testing new image builds, I found users created through plinth -could not login through console or SSH. The reason is that slapd and -nslcd services were not enabled and not running. I don't know what is -causing this situation, so this is just a workaround. - ---- a/actions/users -+++ b/actions/users -@@ -113,6 +113,12 @@ - {'nsswitch': 'group, passwd, shadow'}) - action_utils.service_restart('nscd') - -+ # XXX: Workaround for login issue -+ action_utils.service_enable('slapd') -+ action_utils.service_start('slapd') -+ action_utils.service_enable('nslcd') -+ action_utils.service_start('nslcd') -+ - - def configure_ldap_structure(): - """Configure LDAP basic structure."""