Bump version to 1.1.0

[yazproxy-moved-to-github.git] / src / yaz-proxy-main.cpp

diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index 70d8eeb..f40c64a 100644 (file)
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -1,4 +1,4 @@
-/* $Id: yaz-proxy-main.cpp,v 1.8 2005-01-11 20:50:28 adam Exp $
+/* $Id: yaz-proxy-main.cpp,v 1.12 2005-02-21 14:27:32 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -29,13 +29,18 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
+#if HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
 #if HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
-
+#if HAVE_PWD_H
 #include <pwd.h>
+#endif
 
 #include <stdarg.h>
+#include <stdlib.h>
 
 #include <yaz/log.h>
 #include <yaz/options.h>
@@ -71,7 +76,7 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
     char *prog = argv[0];
     int ret;
 
-    while ((ret = options("o:a:t:v:c:u:i:m:l:T:p:U:n:X",
+    while ((ret = options("o:a:t:v:c:u:i:m:l:T:p:n:X",
                          argv, argc, &arg)) != -2)
     {
        int err;
@@ -89,7 +94,7 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
            err = proxy->set_config(arg);
            if (err == -2)
            {
-               fprintf(stderr, "Config file support not enabled (proxy not compiled with libxml2 support)\n");
+               fprintf(stderr, "Config file support not enabled (not using libxslt & libxml2)\n");
                exit(1);
            }
            else if (err == -1)
@@ -104,9 +109,6 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
         case 't':
            proxy->set_default_target(arg);
            break;
-        case 'U':
-            proxy->set_proxy_authentication(arg);
-            break;
         case 'o':
            proxy->option("optimize", arg);
            break;
@@ -130,6 +132,7 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
            no_limit_files = atoi(arg);
            break;
        case 'X':
+           proxy->set_debug_mode(1);
            debug = 1;
            break;
        case 'p':