1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/standalone/fileshareset b/perl-install/standalone/fileshareset
index 4a0ecc78a..e2185b07a 100755
--- a/perl-install/standalone/fileshareset
+++ b/perl-install/standalone/fileshareset
@@ -91,11 +91,11 @@ if ($0 =~ /fileshareset/) {
 	$export->update_server;
     }
 }
-my @mntpoints = uniq(map { map { $_->{mntpoint} } @$_ } @exports);
+my @mntpoints = grep {$_} uniq(map { map { $_->{mntpoint} } @$_ } @exports);
 print "$_\n" foreach grep { own($_) } @mntpoints;
 
 
-sub own { (stat($_[0]))[4] == $uid }
+sub own { $uid == 0 || (stat($_[0]))[4] == $uid }
 
 sub verify_mntpoint {
     local ($_) = @_;