X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fldap%2FSearch.cpp;h=b068f70d3d2c12ba923a236fed9975f3ba7b81fc;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=350a4e25dd69bd959bb306ec4fc85a60ee18b268;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git

diff --git a/source/ldap/Search.cpp b/source/ldap/Search.cpp
index 350a4e2..b068f70 100644
--- a/source/ldap/Search.cpp
+++ b/source/ldap/Search.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// https://bitbucket.org/testillano/anna
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Authors: eduardo.ramos.testillano@gmail.com
-//          cisco.tierra@gmail.com
+// ANNA - Anna is Not Nothingness Anymore                                                         //
+//                                                                                                //
+// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo                         //
+//                                                                                                //
+// See project site at http://redmine.teslayout.com/projects/anna-suite                           //
+// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE //
 
 
 #include <time.h>
@@ -52,7 +24,7 @@ using namespace anna::ldap;
 Search::attribute_pool Search::st_attributes;
 
 void Search::clear()
-throw() {
+{
   a_base.clear();
   a_scope = Scope::Base;
   clearFilter();
@@ -62,7 +34,7 @@ throw() {
 }
 
 void Search::clearAttributes()
-throw() {
+{
   for(attribute_iterator ii = attribute_begin(), maxii = attribute_end(); ii != maxii; ii ++)
     st_attributes.release(&attribute(ii));
 
@@ -70,7 +42,7 @@ throw() {
 }
 
 IdMessage Search::send(Session& session) const
-throw() {
+{
   IdMessage result(-1);
   LDAP* ldap = (LDAP*) session.getLDAP();
   int scope = -1;
@@ -79,6 +51,7 @@ throw() {
   case Scope::Base: scope = LDAP_SCOPE_BASE; break;
   case Scope::OneLevel: scope = LDAP_SCOPE_ONELEVEL; break;
   case Scope::SubTree: scope = LDAP_SCOPE_SUBTREE; break;
+  case Scope::None: return result; break;
   }
 
   int maxi = attribute_size() + 1;
@@ -117,7 +90,7 @@ throw() {
 }
 
 string Search::asString() const
-throw() {
+{
   string result("ldap::Search { ");
   result += Request::asString();
   result += " | Base: ";
@@ -132,7 +105,7 @@ throw() {
 }
 
 xml::Node* Search::asXML(xml::Node* parent) const
-throw() {
+{
   parent = Request::asXML(parent);
   parent->createAttribute("Base", a_base);
   parent->createAttribute("Scope", Scope::asText(a_scope));