From: venaas Date: Thu, 12 Mar 2009 12:30:47 +0000 (+0000) Subject: adjusted some log levels, log level 2 default, preparing for 1.3 release X-Git-Tag: radsecproxy-1.4-beta1~65 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=radsecproxy.git;a=commitdiff_plain;h=1c0f3de1cb959d66f20cd77390d06f58baf0eef0 adjusted some log levels, log level 2 default, preparing for 1.3 release git-svn-id: https://svn.testnett.uninett.no/radsecproxy/trunk@490 e88ac4ed-0b26-0410-9574-a7f39faa03bf --- diff --git a/ChangeLog b/ChangeLog index a97885b..bffff88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,3 +55,6 @@ Client and Server blocks may contain multiple host options. Configure (Makefile) options for specifying which transports should be supported in a build. +2009-03-12 1.3 + Fixed some very minor bugs + Changed log levels for some messages, made loglevel 2 default diff --git a/gconfig.c b/gconfig.c index ce0ce01..fae3943 100644 --- a/gconfig.c +++ b/gconfig.c @@ -148,7 +148,7 @@ FILE *pushgconfpaths(struct gconffile **cf, const char *cfgpath) { } memset(&globbuf, 0, sizeof(glob_t)); if (glob(path, 0, NULL, &globbuf)) { - debug(DBG_INFO, "could not glob %s", path); + debug(DBG_WARN, "could not glob %s", path); goto exit; } diff --git a/radsecproxy.1 b/radsecproxy.1 index 8fc21af..7f52ef7 100644 --- a/radsecproxy.1 +++ b/radsecproxy.1 @@ -1,4 +1,4 @@ -.TH radsecproxy 1 "17 February 2009" +.TH radsecproxy 1 "12 March 2009" .SH "NAME" radsecproxy - a generic RADIUS proxy that provides both RADIUS UDP and TCP/TLS (RadSec) transport. @@ -47,8 +47,8 @@ is, it won't detach. Also all logging will be done to stderr. \fIDebug level\fR .sp This specifies the debug level. It must be set to 1, 2, 3 or 4, where 1 -logs only serious errors, and 4 logs everything. The default is 3 which -logs errors, warnings and some informational messages. +logs only serious errors, and 4 logs everything. The default is 2 which +logs errors, warnings and a few informational messages. .TP .B -p diff --git a/radsecproxy.c b/radsecproxy.c index 97bd560..09edb74 100644 --- a/radsecproxy.c +++ b/radsecproxy.c @@ -461,7 +461,7 @@ void sendrq(struct request *rq) { pthread_mutex_lock(to->requests[0].lock); if (to->requests[0].rq) { pthread_mutex_unlock(to->requests[0].lock); - debug(DBG_WARN, "sendrq: status server already in queue, dropping request"); + debug(DBG_INFO, "sendrq: status server already in queue, dropping request"); goto errexit; } i = 0; @@ -487,7 +487,7 @@ void sendrq(struct request *rq) { } } if (i == to->nextid) { - debug(DBG_WARN, "sendrq: no room in queue, dropping request"); + debug(DBG_INFO, "sendrq: no room in queue, dropping request"); goto errexit; } } @@ -859,18 +859,18 @@ void removeserversubrealms(struct list *realmlist, struct clsrvconf *srv) { int attrvalidate(unsigned char *attrs, int length) { while (length > 1) { if (ATTRLEN(attrs) < 2) { - debug(DBG_WARN, "attrvalidate: invalid attribute length %d", ATTRLEN(attrs)); + debug(DBG_INFO, "attrvalidate: invalid attribute length %d", ATTRLEN(attrs)); return 0; } length -= ATTRLEN(attrs); if (length < 0) { - debug(DBG_WARN, "attrvalidate: attribute length %d exceeds packet length", ATTRLEN(attrs)); + debug(DBG_INFO, "attrvalidate: attribute length %d exceeds packet length", ATTRLEN(attrs)); return 0; } attrs += ATTRLEN(attrs); } if (length) - debug(DBG_WARN, "attrvalidate: malformed packet? remaining byte after last attribute"); + debug(DBG_INFO, "attrvalidate: malformed packet? remaining byte after last attribute"); return 1; } @@ -953,7 +953,7 @@ int dovendorrewriterm(struct tlv *attr, uint32_t *removevendorattrs) { subattrs = attr->v + 4; if (!attrvalidate(subattrs, sublen)) { - debug(DBG_WARN, "dovendorrewrite: vendor attribute validation failed, no rewrite"); + debug(DBG_INFO, "dovendorrewrite: vendor attribute validation failed, no rewrite"); return 0; } @@ -1046,7 +1046,7 @@ int dorewritemodattr(struct tlv *attr, struct modattr *modattr) { } reslen += i - start; if (reslen > 253) { - debug(DBG_WARN, "rewritten attribute length would be %d, max possible is 253, discarding message", reslen); + debug(DBG_INFO, "rewritten attribute length would be %d, max possible is 253, discarding message", reslen); free(in); return 0; } @@ -1416,7 +1416,7 @@ int radsrv(struct request *rq) { rq->buf = NULL; if (!msg) { - debug(DBG_WARN, "radsrv: message validation failed, ignoring packet"); + debug(DBG_INFO, "radsrv: message validation failed, ignoring packet"); freerq(rq); return 0; } @@ -1446,7 +1446,7 @@ int radsrv(struct request *rq) { ttlres = checkttl(msg, options.ttlattrtype); if (!ttlres) { - debug(DBG_WARN, "radsrv: ignoring request from client %s (%s), ttl exceeded", from->conf->name, addr2string(from->addr)); + debug(DBG_INFO, "radsrv: ignoring request from client %s (%s), ttl exceeded", from->conf->name, addr2string(from->addr)); goto exit; } @@ -1456,7 +1456,7 @@ int radsrv(struct request *rq) { acclog(msg, from); respond(rq, RAD_Accounting_Response, NULL); } else - debug(DBG_WARN, "radsrv: ignoring access request, no username attribute"); + debug(DBG_INFO, "radsrv: ignoring access request, no username attribute"); goto exit; } @@ -1570,7 +1570,7 @@ void replyh(struct server *server, unsigned char *buf) { free(buf); buf = NULL; if (!msg) { - debug(DBG_WARN, "replyh: message validation failed, ignoring packet"); + debug(DBG_INFO, "replyh: message validation failed, ignoring packet"); goto errunlock; } if (msg->code != RAD_Access_Accept && msg->code != RAD_Access_Reject && msg->code != RAD_Access_Challenge @@ -1592,13 +1592,13 @@ void replyh(struct server *server, unsigned char *buf) { from = rqout->rq->from; if (server->conf->rewritein && !dorewrite(msg, from->conf->rewritein)) { - debug(DBG_WARN, "replyh: rewritein failed"); + debug(DBG_INFO, "replyh: rewritein failed"); goto errunlock; } ttlres = checkttl(msg, options.ttlattrtype); if (!ttlres) { - debug(DBG_WARN, "replyh: ignoring reply from server %s, ttl exceeded", server->conf->name); + debug(DBG_INFO, "replyh: ignoring reply from server %s, ttl exceeded", server->conf->name); goto errunlock; } @@ -1633,20 +1633,20 @@ void replyh(struct server *server, unsigned char *buf) { replymsg = radattr2ascii(radmsg_gettype(msg, RAD_Attr_Reply_Message)); if (stationid) { if (replymsg) { - debug(DBG_INFO, "%s for user %s stationid %s from %s (%s)", + debug(DBG_WARN, "%s for user %s stationid %s from %s (%s)", radmsgtype2string(msg->code), username, stationid, server->conf->name, replymsg); free(replymsg); } else - debug(DBG_INFO, "%s for user %s stationid %s from %s", + debug(DBG_WARN, "%s for user %s stationid %s from %s", radmsgtype2string(msg->code), username, stationid, server->conf->name); free(stationid); } else { if (replymsg) { - debug(DBG_INFO, "%s for user %s from %s (%s)", + debug(DBG_WARN, "%s for user %s from %s (%s)", radmsgtype2string(msg->code), username, server->conf->name, replymsg); free(replymsg); } else - debug(DBG_INFO, "%s for user %s from %s", + debug(DBG_WARN, "%s for user %s from %s", radmsgtype2string(msg->code), username, server->conf->name); } free(username); diff --git a/radsecproxy.conf.5 b/radsecproxy.conf.5 index aaeb9b3..a22576e 100644 --- a/radsecproxy.conf.5 +++ b/radsecproxy.conf.5 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH "radsecproxy.conf " 5 2009-02-18 "radsecproxy devel 2009-02-18" "" +.TH "radsecproxy.conf " 5 2009-03-12 "radsecproxy devel 2009-03-12" "" .SH NAME radsecproxy.conf \- Radsec proxy configuration file @@ -97,8 +97,8 @@ occurences is undefined. .TP \*(T This option specifies the debug level. It must be set to 1, 2, 3 or 4, where 1 -logs only serious errors, and 4 logs everything. The default is 3 which logs -errors, warnings and some informational messages. Note that the command line +logs only serious errors, and 4 logs everything. The default is 2 which logs +errors, warnings and a few informational messages. Note that the command line option \*(T<\fB\-d\fR\*(T> overrides this. .TP \*(T diff --git a/radsecproxy.conf.5.xml b/radsecproxy.conf.5.xml index 16ce483..a7f50c5 100644 --- a/radsecproxy.conf.5.xml +++ b/radsecproxy.conf.5.xml @@ -2,14 +2,14 @@ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> - 2009-02-18 + 2009-03-12 radsecproxy.conf 5 - radsecproxy devel 2009-02-18 + radsecproxy devel 2009-03-12 @@ -129,8 +129,8 @@ occurences is undefined. This option specifies the debug level. It must be set to 1, 2, 3 or 4, where 1 -logs only serious errors, and 4 logs everything. The default is 3 which logs -errors, warnings and some informational messages. Note that the command line +logs only serious errors, and 4 logs everything. The default is 2 which logs +errors, warnings and a few informational messages. Note that the command line option overrides this. diff --git a/radsecproxy.h b/radsecproxy.h index c06ec07..314c000 100644 --- a/radsecproxy.h +++ b/radsecproxy.h @@ -10,7 +10,7 @@ #include "radmsg.h" #include "gconfig.h" -#define DEBUG_LEVEL 3 +#define DEBUG_LEVEL 2 #define CONFIG_MAIN "/etc/radsecproxy.conf"