3 files changed, 13 insertions, 13 deletions
diff --git a/test/OP.cc b/test/OP.cc
index 851d831..6012b2e 100644
--- a/test/OP.cc
+++ b/test/OP.cc
@@ -54,18 +54,18 @@ class opdb_t : public sqlite3_t {
 class example_op_t : public opkele::verify_OP {
    public:
        kingate::cgi_gateway& gw;
        opdb_t db;
        kingate::cookie htc;
-        example_op_t(kingate::cgi_gateway& gw)
+        example_op_t(kingate::cgi_gateway& g)
-        : gw(gw) {
+        : gw(g) {
            try {
                htc = gw.cookies.get_cookie("htop_session");
                sqlite3_mem_t<char*> S = sqlite3_mprintf(
                        "SELECT 1 FROM ht_sessions WHERE hts_id=%Q",
                        htc.get_value().c_str());
                sqlite3_table_t T; int nr,nc;
                db.get_table(S,T,&nr,&nc);
                if(nr<1)
@@ -195,17 +195,17 @@ class example_op_t : public opkele::verify_OP {
        }
        const string get_op_endpoint() const {
            return get_self_url(gw);
        }
 };
-int main(int argc,char *argv[]) {
+int main(int,char **) {
    try {
        kingate::plaincgi_interface ci;
        kingate::cgi_gateway gw(ci);
        string op;
        try { op = gw.get_param("op"); }catch(kingate::exception_notfound&) { }
        string message;
        if(op=="set_password") {
            example_op_t OP(gw);
@@ -239,18 +239,18 @@ int main(int argc,char *argv[]) {
            message = "logged in";
            OP.cookie_header(cout);
        }else if(op=="logout") {
            example_op_t OP(gw);
            OP.set_authorized(false);
            op.clear();
            message = "logged out";
        }
-        string om;
+        string omode;
-        try { om = gw.get_param("openid.mode"); }catch(kingate::exception_notfound&) { }
+        try { omode = gw.get_param("openid.mode"); }catch(kingate::exception_notfound&) { }
        if(op=="xrds") {
            cout <<
                "Content-type: application/xrds+xml\n\n"
                "<?xml version='1.0' encoding='utf-8'?>"
                "<xrds:XRDS xmlns:xrds='xri://$xrds' xmlns='xri://$xrd*($v*2.0)'>"
                 "<XRD>"
                  "<Service>"
                   "<Type>" STURI_OPENID20 "</Type>"
@@ -290,24 +290,24 @@ int main(int argc,char *argv[]) {
                    << "\n\n";
            }else{
                cout <<
                    "Status: 302 Going back to RP with cancel\n"
                    "Location: " << OP.cancel(om).append_query(OP.get_return_to())
                    << "\n\n";
            }
            om.to_keyvalues(clog);
-        }else if(om=="associate") {
+        }else if(omode=="associate") {
            kingate_openid_message_t inm(gw);
            opkele::openid_message_t oum;
            example_op_t OP(gw);
            OP.associate(oum,inm);
            cout << "Content-type: text/plain\n\n";
            oum.to_keyvalues(cout);
-        }else if(om=="checkid_setup") {
+        }else if(omode=="checkid_setup") {
            kingate_openid_message_t inm(gw);
            example_op_t OP(gw);
            OP.checkid_(inm,0);
            OP.cookie_header(cout) <<
                "Content-type: text/html\n"
                "\n"
                "<html>"
@@ -331,17 +331,17 @@ int main(int argc,char *argv[]) {
            cout <<
                  "<input type='hidden' name='hts_id'"
                   " value='" << opkele::util::attr_escape(OP.htc.get_value()) << "'/>"
                  "<input type='submit' name='op' value='id_res'/>"
                  "<input type='submit' name='op' value='cancel'/>"
                  "</form>"
                 "</body>"
                "</html>";
-        }else if(om=="check_authentication") {
+        }else if(omode=="check_authentication") {
            kingate_openid_message_t inm(gw);
            example_op_t OP(gw);
            opkele::openid_message_t oum;
            OP.check_authentication(oum,inm);
            cout << "Content-type: text/plain\n\n";
            oum.to_keyvalues(cout);
            oum.to_keyvalues(clog);
        }else{
diff --git a/test/RP.cc b/test/RP.cc
index e9744a4..99a792c 100644
--- a/test/RP.cc
+++ b/test/RP.cc
@@ -53,18 +53,18 @@ class rpdb_t : public sqlite3_t {
 class example_rp_t : public opkele::prequeue_RP {
    public:
        mutable rpdb_t db;
        kingate::cookie htc;
        long as_id;
        int ordinal;
        kingate::cgi_gateway& gw;
-        example_rp_t(kingate::cgi_gateway& gw)
+        example_rp_t(kingate::cgi_gateway& g)
-        : ordinal(0), have_eqtop(false), gw(gw), as_id(-1) {
+        : as_id(-1), ordinal(0), gw(g), have_eqtop(false)  {
            try {
                htc = gw.cookies.get_cookie("ht_session");
                as_id = opkele::util::string_to_long(gw.get_param("asid"));
            }catch(kingate::exception_notfound& kenf) {
                uuid_t uuid; uuid_generate(uuid);
                htc = kingate::cookie("ht_session",util::encode_base64(uuid,sizeof(uuid)));
                sqlite3_mem_t<char*> S = sqlite3_mprintf(
                        "INSERT INTO ht_sessions (hts_id) VALUES (%Q)",
@@ -346,17 +346,17 @@ class example_rp_t : public opkele::prequeue_RP {
 #ifdef DUMB_RP
        virtual assoc_t associate(const string& OP) {
            DUMBTHROW;
        }
 #endif
 };
-int main(int argc,char *argv[]) {
+int main(int,char **) {
    try {
        kingate::plaincgi_interface ci;
        kingate::cgi_gateway gw(ci);
        string op;
        try { op = gw.get_param("op"); }catch(kingate::exception_notfound&) { }
        if(op=="initiate") {
            example_rp_t rp(gw);
            string usi = gw.get_param("openid_identity");
diff --git a/test/kingate_openid_message.h b/test/kingate_openid_message.h
index 37dcdfa..7029ff7 100644
--- a/test/kingate_openid_message.h
+++ b/test/kingate_openid_message.h
@@ -52,18 +52,18 @@ class join_iterator : public iterator<
 template<typename IT>
 class cut_prefix_filterator : public opkele::util::basic_filterator<IT> {
    public:
        string pfx;
        mutable string tmp;
        cut_prefix_filterator() { }
-        cut_prefix_filterator(const IT& bi,const IT&ei,const string& pfx)
+        cut_prefix_filterator(const IT& _bi,const IT&_ei,const string& p)
-            : opkele::util::basic_filterator<IT>(bi,ei), pfx(pfx) {
+            : opkele::util::basic_filterator<IT>(_bi,_ei), pfx(p) {
                this->prepare();
            }
        bool is_interesting() const {
            return pfx.length()==0 || !strncmp(this->it->c_str(),pfx.c_str(),pfx.length());
        }
        typename IT::reference operator*() const {

diff --git a/test/OP.cc b/test/OP.cc index 851d831..6012b2e 100644 --- a/test/OP.cc +++ b/test/OP.cc
@@ -54,18 +54,18 @@ class opdb_t : public sqlite3_t {
54		54
55	class example_op_t : public opkele::verify_OP {	55	class example_op_t : public opkele::verify_OP {
56	public:	56	public:
57	kingate::cgi_gateway& gw;	57	kingate::cgi_gateway& gw;
58	opdb_t db;	58	opdb_t db;
59	kingate::cookie htc;	59	kingate::cookie htc;
60		60
61		61
62	example_op_t(kingate::cgi_gateway& gw)	62	example_op_t(kingate::cgi_gateway& g)
63	: gw(gw) {	63	: gw(g) {
64	try {	64	try {
65	htc = gw.cookies.get_cookie("htop_session");	65	htc = gw.cookies.get_cookie("htop_session");
66	sqlite3_mem_t<char*> S = sqlite3_mprintf(	66	sqlite3_mem_t<char*> S = sqlite3_mprintf(
67	"SELECT 1 FROM ht_sessions WHERE hts_id=%Q",	67	"SELECT 1 FROM ht_sessions WHERE hts_id=%Q",
68	htc.get_value().c_str());	68	htc.get_value().c_str());
69	sqlite3_table_t T; int nr,nc;	69	sqlite3_table_t T; int nr,nc;
70	db.get_table(S,T,&nr,&nc);	70	db.get_table(S,T,&nr,&nc);
71	if(nr<1)	71	if(nr<1)
@@ -195,17 +195,17 @@ class example_op_t : public opkele::verify_OP {
195	}	195	}
196		196
197	const string get_op_endpoint() const {	197	const string get_op_endpoint() const {
198	return get_self_url(gw);	198	return get_self_url(gw);
199	}	199	}
200		200
201	};	201	};
202		202
203	int main(int argc,char *argv[]) {	203	int main(int,char **) {
204	try {	204	try {
205	kingate::plaincgi_interface ci;	205	kingate::plaincgi_interface ci;
206	kingate::cgi_gateway gw(ci);	206	kingate::cgi_gateway gw(ci);
207	string op;	207	string op;
208	try { op = gw.get_param("op"); }catch(kingate::exception_notfound&) { }	208	try { op = gw.get_param("op"); }catch(kingate::exception_notfound&) { }
209	string message;	209	string message;
210	if(op=="set_password") {	210	if(op=="set_password") {
211	example_op_t OP(gw);	211	example_op_t OP(gw);
@@ -239,18 +239,18 @@ int main(int argc,char *argv[]) {
239	message = "logged in";	239	message = "logged in";
240	OP.cookie_header(cout);	240	OP.cookie_header(cout);
241	}else if(op=="logout") {	241	}else if(op=="logout") {
242	example_op_t OP(gw);	242	example_op_t OP(gw);
243	OP.set_authorized(false);	243	OP.set_authorized(false);
244	op.clear();	244	op.clear();
245	message = "logged out";	245	message = "logged out";
246	}	246	}
247	string om;	247	string omode;
248	try { om = gw.get_param("openid.mode"); }catch(kingate::exception_notfound&) { }	248	try { omode = gw.get_param("openid.mode"); }catch(kingate::exception_notfound&) { }
249	if(op=="xrds") {	249	if(op=="xrds") {
250	cout <<	250	cout <<
251	"Content-type: application/xrds+xml\n\n"	251	"Content-type: application/xrds+xml\n\n"
252	"<?xml version='1.0' encoding='utf-8'?>"	252	"<?xml version='1.0' encoding='utf-8'?>"
253	"<xrds:XRDS xmlns:xrds='xri://$xrds' xmlns='xri://$xrd($v2.0)'>"	253	"<xrds:XRDS xmlns:xrds='xri://$xrds' xmlns='xri://$xrd($v2.0)'>"
254	"<XRD>"	254	"<XRD>"
255	"<Service>"	255	"<Service>"
256	"<Type>" STURI_OPENID20 "</Type>"	256	"<Type>" STURI_OPENID20 "</Type>"
@@ -290,24 +290,24 @@ int main(int argc,char *argv[]) {
290	<< "\n\n";	290	<< "\n\n";
291	}else{	291	}else{
292	cout <<	292	cout <<
293	"Status: 302 Going back to RP with cancel\n"	293	"Status: 302 Going back to RP with cancel\n"
294	"Location: " << OP.cancel(om).append_query(OP.get_return_to())	294	"Location: " << OP.cancel(om).append_query(OP.get_return_to())
295	<< "\n\n";	295	<< "\n\n";
296	}	296	}
297	om.to_keyvalues(clog);	297	om.to_keyvalues(clog);
298	}else if(om=="associate") {	298	}else if(omode=="associate") {
299	kingate_openid_message_t inm(gw);	299	kingate_openid_message_t inm(gw);
300	opkele::openid_message_t oum;	300	opkele::openid_message_t oum;
301	example_op_t OP(gw);	301	example_op_t OP(gw);
302	OP.associate(oum,inm);	302	OP.associate(oum,inm);
303	cout << "Content-type: text/plain\n\n";	303	cout << "Content-type: text/plain\n\n";
304	oum.to_keyvalues(cout);	304	oum.to_keyvalues(cout);
305	}else if(om=="checkid_setup") {	305	}else if(omode=="checkid_setup") {
306	kingate_openid_message_t inm(gw);	306	kingate_openid_message_t inm(gw);
307	example_op_t OP(gw);	307	example_op_t OP(gw);
308	OP.checkid_(inm,0);	308	OP.checkid_(inm,0);
309	OP.cookie_header(cout) <<	309	OP.cookie_header(cout) <<
310	"Content-type: text/html\n"	310	"Content-type: text/html\n"
311	"\n"	311	"\n"
312		312
313	"<html>"	313	"<html>"
@@ -331,17 +331,17 @@ int main(int argc,char *argv[]) {
331	cout <<	331	cout <<
332	"<input type='hidden' name='hts_id'"	332	"<input type='hidden' name='hts_id'"
333	" value='" << opkele::util::attr_escape(OP.htc.get_value()) << "'/>"	333	" value='" << opkele::util::attr_escape(OP.htc.get_value()) << "'/>"
334	"<input type='submit' name='op' value='id_res'/>"	334	"<input type='submit' name='op' value='id_res'/>"
335	"<input type='submit' name='op' value='cancel'/>"	335	"<input type='submit' name='op' value='cancel'/>"
336	"</form>"	336	"</form>"
337	"</body>"	337	"</body>"
338	"</html>";	338	"</html>";
339	}else if(om=="check_authentication") {	339	}else if(omode=="check_authentication") {
340	kingate_openid_message_t inm(gw);	340	kingate_openid_message_t inm(gw);
341	example_op_t OP(gw);	341	example_op_t OP(gw);
342	opkele::openid_message_t oum;	342	opkele::openid_message_t oum;
343	OP.check_authentication(oum,inm);	343	OP.check_authentication(oum,inm);
344	cout << "Content-type: text/plain\n\n";	344	cout << "Content-type: text/plain\n\n";
345	oum.to_keyvalues(cout);	345	oum.to_keyvalues(cout);
346	oum.to_keyvalues(clog);	346	oum.to_keyvalues(clog);
347	}else{	347	}else{


diff --git a/test/RP.cc b/test/RP.cc index e9744a4..99a792c 100644 --- a/test/RP.cc +++ b/test/RP.cc
@@ -53,18 +53,18 @@ class rpdb_t : public sqlite3_t {
53	class example_rp_t : public opkele::prequeue_RP {	53	class example_rp_t : public opkele::prequeue_RP {
54	public:	54	public:
55	mutable rpdb_t db;	55	mutable rpdb_t db;
56	kingate::cookie htc;	56	kingate::cookie htc;
57	long as_id;	57	long as_id;
58	int ordinal;	58	int ordinal;
59	kingate::cgi_gateway& gw;	59	kingate::cgi_gateway& gw;
60		60
61	example_rp_t(kingate::cgi_gateway& gw)	61	example_rp_t(kingate::cgi_gateway& g)
62	: ordinal(0), have_eqtop(false), gw(gw), as_id(-1) {	62	: as_id(-1), ordinal(0), gw(g), have_eqtop(false) {
63	try {	63	try {
64	htc = gw.cookies.get_cookie("ht_session");	64	htc = gw.cookies.get_cookie("ht_session");
65	as_id = opkele::util::string_to_long(gw.get_param("asid"));	65	as_id = opkele::util::string_to_long(gw.get_param("asid"));
66	}catch(kingate::exception_notfound& kenf) {	66	}catch(kingate::exception_notfound& kenf) {
67	uuid_t uuid; uuid_generate(uuid);	67	uuid_t uuid; uuid_generate(uuid);
68	htc = kingate::cookie("ht_session",util::encode_base64(uuid,sizeof(uuid)));	68	htc = kingate::cookie("ht_session",util::encode_base64(uuid,sizeof(uuid)));
69	sqlite3_mem_t<char*> S = sqlite3_mprintf(	69	sqlite3_mem_t<char*> S = sqlite3_mprintf(
70	"INSERT INTO ht_sessions (hts_id) VALUES (%Q)",	70	"INSERT INTO ht_sessions (hts_id) VALUES (%Q)",
@@ -346,17 +346,17 @@ class example_rp_t : public opkele::prequeue_RP {
346		346
347	#ifdef DUMB_RP	347	#ifdef DUMB_RP
348	virtual assoc_t associate(const string& OP) {	348	virtual assoc_t associate(const string& OP) {
349	DUMBTHROW;	349	DUMBTHROW;
350	}	350	}
351	#endif	351	#endif
352	};	352	};
353		353
354	int main(int argc,char *argv[]) {	354	int main(int,char **) {
355	try {	355	try {
356	kingate::plaincgi_interface ci;	356	kingate::plaincgi_interface ci;
357	kingate::cgi_gateway gw(ci);	357	kingate::cgi_gateway gw(ci);
358	string op;	358	string op;
359	try { op = gw.get_param("op"); }catch(kingate::exception_notfound&) { }	359	try { op = gw.get_param("op"); }catch(kingate::exception_notfound&) { }
360	if(op=="initiate") {	360	if(op=="initiate") {
361	example_rp_t rp(gw);	361	example_rp_t rp(gw);
362	string usi = gw.get_param("openid_identity");	362	string usi = gw.get_param("openid_identity");


diff --git a/test/kingate_openid_message.h b/test/kingate_openid_message.h index 37dcdfa..7029ff7 100644 --- a/test/kingate_openid_message.h +++ b/test/kingate_openid_message.h
@@ -52,18 +52,18 @@ class join_iterator : public iterator<
52		52
53	template<typename IT>	53	template<typename IT>
54	class cut_prefix_filterator : public opkele::util::basic_filterator<IT> {	54	class cut_prefix_filterator : public opkele::util::basic_filterator<IT> {
55	public:	55	public:
56	string pfx;	56	string pfx;
57	mutable string tmp;	57	mutable string tmp;
58		58
59	cut_prefix_filterator() { }	59	cut_prefix_filterator() { }
60	cut_prefix_filterator(const IT& bi,const IT&ei,const string& pfx)	60	cut_prefix_filterator(const IT& _bi,const IT&_ei,const string& p)
61	: opkele::util::basic_filterator<IT>(bi,ei), pfx(pfx) {	61	: opkele::util::basic_filterator<IT>(_bi,_ei), pfx(p) {
62	this->prepare();	62	this->prepare();
63	}	63	}
64		64
65	bool is_interesting() const {	65	bool is_interesting() const {
66	return pfx.length()==0 \|\| !strncmp(this->it->c_str(),pfx.c_str(),pfx.length());	66	return pfx.length()==0 \|\| !strncmp(this->it->c_str(),pfx.c_str(),pfx.length());
67	}	67	}
68		68
69	typename IT::reference operator*() const {	69	typename IT::reference operator*() const {