summaryrefslogtreecommitdiffstats
path: root/search.go
diff options
context:
space:
mode:
authorSamuel Stauffer <samuel@descolada.com>2014-03-19 22:22:55 +0100
committerSamuel Stauffer <samuel@descolada.com>2014-03-19 22:22:55 +0100
commit2eea0c0a703e32b904741d52c9e2c9ae836c14b0 (patch)
tree10820142494033c3d3297249ab31efe0176aec77 /search.go
parentShort writes don't happen without an error so don't loop (diff)
downloadldap-2eea0c0a703e32b904741d52c9e2c9ae836c14b0.tar
ldap-2eea0c0a703e32b904741d52c9e2c9ae836c14b0.tar.gz
ldap-2eea0c0a703e32b904741d52c9e2c9ae836c14b0.tar.bz2
ldap-2eea0c0a703e32b904741d52c9e2c9ae836c14b0.tar.lz
ldap-2eea0c0a703e32b904741d52c9e2c9ae836c14b0.tar.xz
ldap-2eea0c0a703e32b904741d52c9e2c9ae836c14b0.tar.zst
ldap-2eea0c0a703e32b904741d52c9e2c9ae836c14b0.zip
Diffstat (limited to '')
-rw-r--r--search.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/search.go b/search.go
index 372e5b5..01757ce 100644
--- a/search.go
+++ b/search.go
@@ -172,7 +172,7 @@ type SearchRequest struct {
Controls []Control
}
-func (s *SearchRequest) encode() (*ber.Packet, *Error) {
+func (s *SearchRequest) encode() (*ber.Packet, error) {
request := ber.Encode(ber.ClassApplication, ber.TypeConstructed, ApplicationSearchRequest, nil, "Search Request")
request.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimative, ber.TagOctetString, s.BaseDN, "Base DN"))
request.AppendChild(ber.NewInteger(ber.ClassUniversal, ber.TypePrimative, ber.TagEnumerated, uint64(s.Scope), "Scope"))
@@ -216,7 +216,7 @@ func NewSearchRequest(
}
}
-func (l *Conn) SearchWithPaging(searchRequest *SearchRequest, pagingSize uint32) (*SearchResult, *Error) {
+func (l *Conn) SearchWithPaging(searchRequest *SearchRequest, pagingSize uint32) (*SearchResult, error) {
if searchRequest.Controls == nil {
searchRequest.Controls = make([]Control, 0)
}
@@ -270,7 +270,7 @@ func (l *Conn) SearchWithPaging(searchRequest *SearchRequest, pagingSize uint32)
return searchResult, nil
}
-func (l *Conn) Search(searchRequest *SearchRequest) (*SearchResult, *Error) {
+func (l *Conn) Search(searchRequest *SearchRequest) (*SearchResult, error) {
messageID := l.nextMessageID()
packet := ber.Encode(ber.ClassUniversal, ber.TypeConstructed, ber.TagSequence, nil, "LDAP Request")
packet.AppendChild(ber.NewInteger(ber.ClassUniversal, ber.TypePrimative, ber.TagInteger, messageID, "MessageID"))
@@ -312,7 +312,7 @@ func (l *Conn) Search(searchRequest *SearchRequest) (*SearchResult, *Error) {
if l.Debug {
if err := addLDAPDescriptions(packet); err != nil {
- return nil, NewError(ErrorDebugging, err.Err)
+ return nil, err
}
ber.PrintPacket(packet)
}