diff options
author | Simon Rettberg | 2014-11-18 18:40:49 +0100 |
---|---|---|
committer | Simon Rettberg | 2014-11-18 18:40:49 +0100 |
commit | ecb072b02e1a70555db0fdf4ed47375d3080a074 (patch) | |
tree | 75db05621458eee14a96ff2d825a30072eb06e40 /src/main/java/org/openslx/taskmanager/tasks/LdapSearch.java | |
parent | Added class ProxyHandler for for configuring proxy settings system wide once ... (diff) | |
download | tmlite-bwlp-ecb072b02e1a70555db0fdf4ed47375d3080a074.tar.gz tmlite-bwlp-ecb072b02e1a70555db0fdf4ed47375d3080a074.tar.xz tmlite-bwlp-ecb072b02e1a70555db0fdf4ed47375d3080a074.zip |
Many improvements and additions:
- Added task+script for lighttpd https config
- Added task for reloading proxy config
- ldapsearch now supports searching for specific user
- DownloadFile now supports checking file integrity through optional gpg signature
Diffstat (limited to 'src/main/java/org/openslx/taskmanager/tasks/LdapSearch.java')
-rw-r--r-- | src/main/java/org/openslx/taskmanager/tasks/LdapSearch.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/taskmanager/tasks/LdapSearch.java b/src/main/java/org/openslx/taskmanager/tasks/LdapSearch.java index 157b5e1..dbb76b1 100644 --- a/src/main/java/org/openslx/taskmanager/tasks/LdapSearch.java +++ b/src/main/java/org/openslx/taskmanager/tasks/LdapSearch.java @@ -93,9 +93,9 @@ public class LdapSearch extends SystemCommandTask exitCode = 0; if ( exitCode != 0 ) status.addMessage( "Exit code is " + exitCode ); - if ( exitCode == 0 && this.userCount < 4 ) + if ( exitCode == 0 && this.userCount < 4 && !this.getDn ) status.addMessage( "Found less than 4 users. Are you sure you got the right credentials." ); - return this.userCount >= 4; + return this.userCount >= 4 || (this.getDn && status.dn != null); } @Override @@ -105,6 +105,10 @@ public class LdapSearch extends SystemCommandTask status.addMessage( "Found AD user " + line.substring( 16 ) + " :-)" ); this.userCount++; } + if ( line.startsWith( "sAMAccountName:: " ) ) { + status.addMessage( "Found AD user " + line.substring( 17 ) + " :-)" ); + this.userCount++; + } if ( this.getDn && line.startsWith( "dn: " ) ) { status.dn = line.substring( 4 ); } |