X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fproxyp.h;h=203bf7a82e08c0f953065f066f590efe5959b986;hb=2bf4929fe90ac9500d8345f5ccf1e1e306ab27d6;hp=06e46bde54aaa2b8ffe32152b2fc7ab250711cb8;hpb=9f38fa901bed3a1bcc18581520aeb5a7e29ff630;p=yazproxy-moved-to-github.git

diff --git a/src/proxyp.h b/src/proxyp.h
index 06e46bd..203bf7a 100644
--- a/src/proxyp.h
+++ b/src/proxyp.h
@@ -1,7 +1,5 @@
-/* $Id: proxyp.h,v 1.17 2006-06-09 09:35:13 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data
 
 YAZ proxy 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
@@ -14,12 +12,11 @@ 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 YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/xinclude.h>
@@ -28,7 +25,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #endif
 
 #if HAVE_USEMARCON
-#include <objectlist.h>
+#include <usemarconlib.h>
 #endif
 
 #include <yazpp/record-cache.h>
@@ -46,8 +43,8 @@ class Yaz_usemarcon {
                 const char *input, int input_len,
                 char **output, int *output_len);
 #if HAVE_USEMARCON
-    CDetails *m_stage1;
-    CDetails *m_stage2;
+    Usemarcon *m_stage1;
+    Usemarcon *m_stage2;
 #else
     int dummy;
 #endif
@@ -93,6 +90,7 @@ public:
                       int *limit_search,
                       int *target_idletime,
                       int *client_idletime,
+                      int *max_sockets,
                       int *max_clients,
                       int *keepalive_limit_bw,
                       int *keepalive_limit_pdu,
@@ -115,6 +113,7 @@ public:
                          int *limit_bw, int *limit_pdu, int *limit_req,
                          int *limit_search,
                          int *target_idletime, int *client_idletime,
+                         int *max_sockets,
                          int *max_clients,
                          int *keepalive_limit_bw, int *keepalive_limit_pdu,
                          int *pre_init,
@@ -140,6 +139,9 @@ public:
                               const char *user, const char *group,
                               const char *password,
                               const char *peer_IP);
+    int global_client_authentication(const char *user, const char *group,
+                                     const char *password,
+                                     const char *peer_IP);
     char *get_explain_doc(ODR odr, const char *name, const char *db,
                           int *len);
     const char *get_explain_name(const char *db, const char **backend_db);