X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fproxyp.h;h=0296b87c75e908b6e1b73ae0ea5247613c1f8f6c;hb=243e40729c4ac5cbed92a22dd18182d7692dd6e8;hp=06e46bde54aaa2b8ffe32152b2fc7ab250711cb8;hpb=9f38fa901bed3a1bcc18581520aeb5a7e29ff630;p=yazproxy-moved-to-github.git

diff --git a/src/proxyp.h b/src/proxyp.h
index 06e46bd..0296b87 100644
--- a/src/proxyp.h
+++ b/src/proxyp.h
@@ -1,4 +1,4 @@
-/* $Id: proxyp.h,v 1.17 2006-06-09 09:35:13 adam Exp $
+/* $Id: proxyp.h,v 1.19 2006-07-06 11:50:26 adam Exp $
    Copyright (c) 1998-2006, Index Data.
 
 This file is part of the yazproxy.
@@ -19,7 +19,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
  */
 
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/xinclude.h>
@@ -28,7 +28,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 +46,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 +93,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 +116,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 +142,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);