[whimsy] branch master updated: Allow for Ubuntu-style nologin (not actually used yet)

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git

The following commit(s) were added to refs/heads/master by this push:
       new  105c752   Allow for Ubuntu-style nologin (not actually used yet)
105c752 is described below

commit 105c752e04571f3a457abc68ce70dd3bd0925aaf
Author: Sebb <se...@apache.org>
AuthorDate: Fri Mar 10 20:33:05 2017 +0000

    Allow for Ubuntu-style nologin (not actually used yet)
---
 lib/whimsy/asf/ldap.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/whimsy/asf/ldap.rb b/lib/whimsy/asf/ldap.rb
index 94b930f..70db65e 100644
--- a/lib/whimsy/asf/ldap.rb
+++ b/lib/whimsy/asf/ldap.rb
@@ -521,7 +521,8 @@ module ASF
     end
 
     def banned?
-      not attrs['loginShell'] or %w(/usr/bin/false bin/nologin bin/no-cla).any? {|a| attrs['loginShell'].first.include? a}
+      # FreeBSD uses /usr/bin/false; Ubuntu uses /bin/false
+      not attrs['loginShell'] or %w(/bin/false bin/nologin bin/no-cla).any? {|a| attrs['loginShell'].first.include? a}
     end
 
     def mail

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].