Docs: Copyright updates for 2018 (#114)

[thirdparty/squid.git] / src / acl / UserData.h

diff --git a/src/acl/UserData.h b/src/acl/UserData.h
index 5dab1dcb18820d6c26466670f7d141be189e10b7..057fa7a4506a6fe27e0f9bfd6532a8af2bac76a2 100644 (file)
--- a/src/acl/UserData.h
+++ b/src/acl/UserData.h
@@ -1,63 +1,44 @@
-
 /*
+ * Copyright (C) 1996-2018 The Squid Software Foundation and contributors
  *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
- *
- * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
 #ifndef SQUID_ACLUSERDATA_H
 #define SQUID_ACLUSERDATA_H
+
 #include "acl/Acl.h"
 #include "acl/Data.h"
-#include "splay.h"
+#include "sbuf/SBuf.h"
+
+#include <set>
 
 class ACLUserData : public ACLData<char const *>
 {
-
-public:
     MEMPROXY_CLASS(ACLUserData);
 
-    virtual ~ACLUserData();
+public:
+    virtual ~ACLUserData() {}
+    ACLUserData();
     bool match(char const *user);
     virtual SBufList dump() const;
     void parse();
     bool empty() const;
     virtual ACLData<char const *> *clone() const;
 
-    SplayNode<char *> *names;
+private:
+
+    typedef std::set<SBuf,bool(*)(const SBuf&, const SBuf&)> UserDataNames_t;
+    UserDataNames_t userDataNames;
 
     struct {
         bool case_insensitive;
         bool required;
     } flags;
-};
 
-MEMPROXY_CLASS_INLINE(ACLUserData);
+};
 
 #endif /* SQUID_ACLUSERDATA_H */
+