diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-07-06 09:41:50 -0300 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-07-06 09:41:50 -0300 |
| commit | 1623ed9700dd89ee871313add2c4947c1227cc39 (patch) | |
| tree | f1809bd8552dd406bcef2cad32b982516c0262fb /etc/inc/config.lib.inc | |
| parent | 4842755397c92f1c16b50b16e01b28768f8b43c1 (diff) | |
| parent | f49c41c538e718d06b44e9c2d279ba9b9580b5ff (diff) | |
| download | pfsense-1623ed9700dd89ee871313add2c4947c1227cc39.zip pfsense-1623ed9700dd89ee871313add2c4947c1227cc39.tar.gz | |
Merge remote-tracking branch 'mainline/master' into inc
Conflicts:
etc/inc/priv.defs.inc
Diffstat (limited to 'etc/inc/config.lib.inc')
| -rw-r--r-- | etc/inc/config.lib.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/etc/inc/config.lib.inc b/etc/inc/config.lib.inc index d5e0f62..9ac40c9 100644 --- a/etc/inc/config.lib.inc +++ b/etc/inc/config.lib.inc @@ -495,6 +495,8 @@ function write_config($desc="Unknown", $backup = true) { */ $username = empty($_SESSION["Username"]) ? "(system)" : $_SESSION['Username']; + if (!empty($_SERVER['REMOTE_ADDR'])) + $username .= '@' . $_SERVER['REMOTE_ADDR']; if($backup) backup_config(); |
