diff options
| author | awnuk <awnuk@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-01-21 01:26:14 +0000 |
|---|---|---|
| committer | awnuk <awnuk@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-01-21 01:26:14 +0000 |
| commit | 5badec2480c5b160945d01371fb74cc8d01216cc (patch) | |
| tree | fb345261da10ae3aedb7be2591d32f4a798011c0 /pki/base | |
| parent | 7d7f59b3df6e92636c3575f798d9a97937af9eaa (diff) | |
| download | pki-5badec2480c5b160945d01371fb74cc8d01216cc.tar.gz pki-5badec2480c5b160945d01371fb74cc8d01216cc.tar.xz pki-5badec2480c5b160945d01371fb74cc8d01216cc.zip | |
Fixed bugzilla bug #564207.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1761 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base')
| -rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java b/pki/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java index 3631ac63..9ec9bdad 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java +++ b/pki/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java @@ -256,14 +256,19 @@ public class SearchReqs extends CMSServlet { String owner = req.getParameter("owner"); String requestowner_filter = ""; - if (owner.equals("self")) { - String self_uid = token.getInString(IAuthToken.USER_ID); - requestowner_filter = "(requestowner="+self_uid+")"; + String newfilter = ""; + if (owner.length() == 0) { + newfilter = filter; } else { - String uid = req.getParameter("uid"); - requestowner_filter = "(requestowner="+uid+")"; + if (owner.equals("self")) { + String self_uid = token.getInString(IAuthToken.USER_ID); + requestowner_filter = "(requestowner="+self_uid+")"; + } else { + String uid = req.getParameter("uid"); + requestowner_filter = "(requestowner="+uid+")"; + } + newfilter = "(&"+requestowner_filter+filter.substring(2); } - String newfilter = "(&"+requestowner_filter+filter.substring(2); // xxx the filter includes serial number range??? if (maxResults == -1 || maxResults > mMaxReturns) { CMS.debug("Resetting maximum of returned results from " + maxResults + " to " + mMaxReturns); |