summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal Luçi <ermal.luci@gmail.com>2012-11-18 12:32:49 -0800
committerErmal Luçi <ermal.luci@gmail.com>2012-11-18 12:32:49 -0800
commit3d999ea72f7e9e3916055f4007e71349c31d29fc (patch)
tree85bf4ecf24e24aafa1b6bf99cc23f73a1d83bf5d /etc
parent969ac0e964004d6ee2273af5f6d86398bb2e2b5f (diff)
parent1198abf91461d2dbeb2527aae89fd52f4af01670 (diff)
downloadpfsense-3d999ea72f7e9e3916055f4007e71349c31d29fc.zip
pfsense-3d999ea72f7e9e3916055f4007e71349c31d29fc.tar.gz
Merge pull request #257 from PiBa-NL/auth
authentication, don't log 'errors' on normal procedure
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/auth.inc6
-rw-r--r--etc/inc/util.inc2
2 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc
index dc9e8aa..02f38ab 100644
--- a/etc/inc/auth.inc
+++ b/etc/inc/auth.inc
@@ -1081,11 +1081,11 @@ function ldap_backed($username, $passwd, $authcfg) {
/* Person. To later be used by ldap_get_groups. */
/* that way we don't have to search twice. */
/*****************************************************************/
- log_error(sprintf(gettext("Now Searching for %s in directory."), $username));
+ log_auth(sprintf(gettext("Now Searching for %s in directory."), $username));
/* Iterate through the user containers for search */
foreach ($ldac_splits as $i => $ldac_split) {
/* Make sure we just use the first user we find */
- log_error(sprintf(gettext('Now Searching in server %1$s, container %2$s with filter %3$s.'), $ldapname, $ldac_split, $ldapfilter));
+ log_auth(sprintf(gettext('Now Searching in server %1$s, container %2$s with filter %3$s.'), $ldapname, $ldac_split, $ldapfilter));
if ($ldapscope == "one")
$ldapfunc = "ldap_list";
else
@@ -1123,7 +1123,7 @@ function ldap_backed($username, $passwd, $authcfg) {
return false;
}
- log_error(sprintf(gettext('Logged in successfully as %1$s via LDAP server %2$s with DN = %3$s.'), $username, $ldapname, $userdn));
+ log_auth(sprintf(gettext('Logged in successfully as %1$s via LDAP server %2$s with DN = %3$s.'), $username, $ldapname, $userdn));
/* At this point we are bound to LDAP so the user was auth'd okay. Close connection. */
@ldap_unbind($ldap);
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 9961b4b..81f2dc4 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -968,7 +968,7 @@ function log_error($error) {
/****f* util/log_auth
* NAME
-* log_error - Sends a string to syslog as LOG_AUTH facility
+* log_auth - Sends a string to syslog as LOG_AUTH facility
* INPUTS
* $error - string containing the syslog message.
* RESULT
OpenPOWER on IntegriCloud