aboutsummaryrefslogtreecommitdiffstats
path: root/packages/freenas/www
diff options
context:
space:
mode:
authorDaniel Stefan Haischt <dsh@pfsense.org>2006-08-21 01:09:53 +0000
committerDaniel Stefan Haischt <dsh@pfsense.org>2006-08-21 01:09:53 +0000
commitd4b90b2e1d58ebdb09235232449e0563ce2f22de (patch)
treee3a51c4a9212341f24a9f4f3ce58dadf6ba1f125 /packages/freenas/www
parent458b5a213e6673ce16e56b31ca9430a029dfed06 (diff)
downloadpfsense-packages-d4b90b2e1d58ebdb09235232449e0563ce2f22de.tar.gz
pfsense-packages-d4b90b2e1d58ebdb09235232449e0563ce2f22de.tar.bz2
pfsense-packages-d4b90b2e1d58ebdb09235232449e0563ce2f22de.zip
samba and unix user/group bug fixing
Diffstat (limited to 'packages/freenas/www')
-rw-r--r--packages/freenas/www/services_rsyncd.php10
-rw-r--r--packages/freenas/www/services_rsyncd_client.php6
2 files changed, 8 insertions, 8 deletions
diff --git a/packages/freenas/www/services_rsyncd.php b/packages/freenas/www/services_rsyncd.php
index ea85202d..a8b34b4c 100644
--- a/packages/freenas/www/services_rsyncd.php
+++ b/packages/freenas/www/services_rsyncd.php
@@ -42,12 +42,12 @@ require_once("freenas_guiconfig.inc");
require_once("freenas_functions.inc");
/* TODO: use pfSense users/groups. */
-if (!is_array($freenas_config['access']['user']))
- $freenas_config['access']['user'] = array();
+if (!is_array($freenas_config['system']['user']))
+ $freenas_config['system']['user'] = array();
users_sort();
-$a_user = &$freenas_config['access']['user'];
+$a_user = &$freenas_config['system']['user'];
if (!is_array($freenas_config['rsync']))
{
@@ -212,8 +212,8 @@ echo $pfSenseHead->getHTML();
<option value="ftp"<?php if ($pconfig['rsyncd_user'] == "ftp") echo "selected";?>>
<?php echo htmlspecialchars("guest"); ?>
<?php foreach ($a_user as $user): ?>
- <option value="<?=$user['login'];?>"<?php if ($user['login'] == $pconfig['rsyncd_user']) echo "selected";?>>
- <?php echo htmlspecialchars($user['login']); ?>
+ <option value="<?=$user['name'];?>"<?php if ($user['name'] == $pconfig['rsyncd_user']) echo "selected";?>>
+ <?php echo htmlspecialchars($user['name']); ?>
</option>
<?php endforeach; ?>
</select>
diff --git a/packages/freenas/www/services_rsyncd_client.php b/packages/freenas/www/services_rsyncd_client.php
index ab54f562..a1b1a815 100644
--- a/packages/freenas/www/services_rsyncd_client.php
+++ b/packages/freenas/www/services_rsyncd_client.php
@@ -42,12 +42,12 @@ require_once("freenas_guiconfig.inc");
require_once("freenas_functions.inc");
/* TODO: use pfSense users/groups. */
-if (!is_array($freenas_config['access']['user']))
- $freenas_config['access']['user'] = array();
+if (!is_array($freenas_config['system']['user']))
+ $freenas_config['system']['user'] = array();
users_sort();
-$a_user = &$freenas_config['access']['user'];
+$a_user = &$freenas_config['system']['user'];
if (!is_array($freenas_config['rsync']))
{