projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into graceful_stop
[metaproxy-moved-to-github.git]
/
src
/
filter_auth_simple.cpp
diff --git
a/src/filter_auth_simple.cpp
b/src/filter_auth_simple.cpp
index
16eeaf5
..
b8b3548
100644
(file)
--- a/
src/filter_auth_simple.cpp
+++ b/
src/filter_auth_simple.cpp
@@
-1,5
+1,5
@@
/* This file is part of Metaproxy.
/* This file is part of Metaproxy.
- Copyright (C) 2005-2008 Index Data
+ Copyright (C) 2005-2012 Index Data
Metaproxy 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
Metaproxy 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
@@
-18,13
+18,13
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "config.hpp"
#include "config.hpp"
-#include "filter.hpp"
-#include "package.hpp"
+#include <metaproxy/filter.hpp>
+#include <metaproxy/package.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/algorithm/string.hpp>
-#include "util.hpp"
+#include <metaproxy/util.hpp>
#include "filter_auth_simple.hpp"
#include <yaz/zgdu.h>
#include "filter_auth_simple.hpp"
#include <yaz/zgdu.h>
@@
-73,7
+73,8
@@
static void die(std::string s) { throw mp::filter::FilterException(s); }
// Read XML config.. Put config info in m_p.
// Read XML config.. Put config info in m_p.
-void mp::filter::AuthSimple::configure(const xmlNode * ptr, bool test_only)
+void mp::filter::AuthSimple::configure(const xmlNode * ptr, bool test_only,
+ const char *path)
{
std::string userRegisterName;
std::string targetRegisterName;
{
std::string userRegisterName;
std::string targetRegisterName;
@@
-115,7
+116,8
@@
void mp::filter::AuthSimple::config_userRegister(std::string filename)
strerror(errno));
char buf[1000];
strerror(errno));
char buf[1000];
- while (fgets(buf, sizeof buf, fp)) {
+ while (fgets(buf, sizeof buf, fp))
+ {
if (*buf == '\n' || *buf == '#')
continue;
buf[strlen(buf)-1] = 0;
if (*buf == '\n' || *buf == '#')
continue;
buf[strlen(buf)-1] = 0;
@@
-133,14
+135,15
@@
void mp::filter::AuthSimple::config_userRegister(std::string filename)
boost::split(tmp.dbs, databasesp, boost::is_any_of(","));
m_p->userRegister[buf] = tmp;
boost::split(tmp.dbs, databasesp, boost::is_any_of(","));
m_p->userRegister[buf] = tmp;
- if (0) { // debugging
+ if (0)
+ { // debugging
printf("Added user '%s' -> password '%s'\n", buf, passwdp);
std::list<std::string>::const_iterator i;
printf("Added user '%s' -> password '%s'\n", buf, passwdp);
std::list<std::string>::const_iterator i;
- for (i = tmp.dbs.begin(); i != tmp.dbs.end(); i++) {
+ for (i = tmp.dbs.begin(); i != tmp.dbs.end(); i++)
printf("db '%s'\n", (*i).c_str());
printf("db '%s'\n", (*i).c_str());
- }
}
}
}
}
+ fclose(fp);
}
}
@@
-333,7
+336,6
@@
static void reject_init(mp::Package &package, int err, const char *addinfo) {
Z_GDU *gdu = package.request().get();
mp::odr odr;
Z_APDU *apdu = odr.create_initResponse(gdu->u.z3950, err, addinfo);
Z_GDU *gdu = package.request().get();
mp::odr odr;
Z_APDU *apdu = odr.create_initResponse(gdu->u.z3950, err, addinfo);
- apdu->u.initResponse->implementationName = "YP2/YAZ";
*apdu->u.initResponse->result = 0; // reject
package.response() = apdu;
package.session().close();
*apdu->u.initResponse->result = 0; // reject
package.response() = apdu;
package.session().close();
@@
-401,8
+403,9
@@
extern "C" {
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* indent-tabs-mode: nil
- * c-file-style: "stroustrup"
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+