--- rpms/smeserver-user-webspace/contribs8/smeserver-user-webspace-0.1-actions.patch	2013/11/23 23:20:29	1.2
+++ rpms/smeserver-user-webspace/contribs8/smeserver-user-webspace-0.1-actions.patch	2013/11/24 08:54:06	1.3
@@ -136,21 +136,21 @@ diff -Nur smeserver-user-webspace-0.1-ol
 +{
 +    die "$user is not a user account\n"
 +        unless ( grep /^$user$/, @users );
-+
++    next if $user eq "admin";
 +    my @dirs = ("/home/e-smith/files/samba/profiles/$user");
 +   
 +    foreach my $dir (@dirs)
 +    {
 +        my $pre_existing = ( -d $dir );
 +     
-+        $pre_existing || mkdir $dir, 710 || die "Couldn't create directory $dir\n";
++        $pre_existing || mkdir $dir, 750 || die "Couldn't create directory $dir\n";
 +
-+        chmod 0710, $dir;	# Remove setgid bit
++        chmod 0750, $dir;	# Remove setgid bit
 +        
 +        next if $pre_existing;
-+	chmod 0710, "/home/e-smith/files/users/$user";
-+	chmod 2770, "/home/e-smith/files/users/$user/home/public_html";
-+	chmod 2770, "/home/e-smith/files/users/$user/tmp";
++	system("chmod", "0750", "/home/e-smith/files/users/$user");
++	system("chmod", "2770", "/home/e-smith/files/users/$user/home/public_html");
++	system("chmod", "2770", "/home/e-smith/files/users/$user/tmp");
 +	system("/bin/chown", "$user:www", "-R" , "/home/e-smith/files/users/$user/home/public_html");
 +	system("/bin/chown", "$user:www", "/home/e-smith/files/users/$user");
 +	system("/bin/chown", "$user:www", "-R" , "/home/e-smith/files/users/$user/tmp");
@@ -215,10 +215,10 @@ diff -Nur smeserver-user-webspace-0.1-ol
 +
 +die "username argument missing" unless defined ($userName);
 +
-+
-+chmod 0710, "/home/e-smith/files/users/$userName";
-+chmod 2770, "/home/e-smith/files/users/$userName/home/public_html";
-+chmod 2770, "/home/e-smith/files/users/$userName/tmp";
++return if $userName eq "admin";
++system("chmod", "0750", "/home/e-smith/files/users/$userName");
++system("chmod", "2770", "/home/e-smith/files/users/$userName/home/public_html");
++system("chmod", "2770", "/home/e-smith/files/users/$userName/tmp");
 +system("/bin/chown", "$userName:www", "-R",  "/home/e-smith/files/users/$userName/home/public_html");
 +system("/bin/chown", "$userName:www", "/home/e-smith/files/users/$userName");
 +system("/bin/chown", "$userName:www", "-R", "/home/e-smith/files/users/$userName/tmp");
@@ -259,7 +259,7 @@ diff -Nur smeserver-user-webspace-0.1-ol
 +
 +my @users = ('admin', map { $_->key } $adb->users);
 +
-+my @newusers = @user;
++my @newusers = @users;
 +#($event eq "post-upgrade") ? @users : $ARGV[1] ;
 +
 +foreach my $user ( @newusers )
@@ -268,21 +268,21 @@ diff -Nur smeserver-user-webspace-0.1-ol
 +        unless ( grep /^$user$/, @users );
 +
 +    my @dirs = ("/home/e-smith/files/samba/profiles/$user");
-+   
++   next if $user eq "admin";
 +    foreach my $dir (@dirs)
 +    {
 +        my $pre_existing = ( -d $dir );
 +     
-+        $pre_existing || mkdir $dir, 710 || die "Couldn't create directory $dir\n";
++        $pre_existing || mkdir $dir, 750 || die "Couldn't create directory $dir\n";
 +
-+        chmod 0710, $dir;	# Remove setgid bit
++        chmod 0750, $dir;	# Remove setgid bit
 +        
 +        #next if $pre_existing;
 +        system("mkdir -p /home/e-smith/files/users/$user/home/public_html");
 +	system("mkdir -p /home/e-smith/files/users/$user/tmp");
-+	chmod 0710, "/home/e-smith/files/users/$user";
-+	chmod 2770, "/home/e-smith/files/users/$user/home/public_html";
-+	chmod 2770, "/home/e-smith/files/users/$user/tmp";
++	system("chmod", "0750", "/home/e-smith/files/users/$user");
++	system("chmod", "2770", "/home/e-smith/files/users/$user/home/public_html");
++	system("chmod", "2770", "/home/e-smith/files/users/$user/tmp");
 +	system("/bin/chown", "$user:www", "-R",  "/home/e-smith/files/users/$user/home/public_html");
 +	system("/bin/chown", "$user:www", "/home/e-smith/files/users/$user");
 +	system("/bin/chown", "$user:www", "-R", "/home/e-smith/files/users/$user/tmp");
@@ -329,7 +329,7 @@ diff -Nur smeserver-user-webspace-0.1-ol
 +
 +my @users = ('admin', map { $_->key } $adb->users);
 +
-+my @newusers = @user;
++my @newusers = @users;
 +#($event eq "post-upgrade") ? @users : $ARGV[1] ;
 +
 +foreach my $user ( @newusers )
@@ -338,7 +338,7 @@ diff -Nur smeserver-user-webspace-0.1-ol
 +        unless ( grep /^$user$/, @users );
 +
 +    my @dirs = ("/home/e-smith/files/samba/profiles/$user");
-+   
++   next if $user eq "admin";
 +    foreach my $dir (@dirs)
 +    {
 +        my $pre_existing = ( -d $dir );
@@ -349,7 +349,7 @@ diff -Nur smeserver-user-webspace-0.1-ol
 +       
 +        #next if $pre_existing;
 +	system("/bin/chown", "$user:$user", "-R",  "/home/e-smith/files/users/$user");
-+
++	system("/bin/chmod", "0700",  "/home/e-smith/files/users/$user");
 +        esmith::util::chownFile($user, $user, $dir) || 
 +            die "Couldn't change ownership of $dir\n";
 +    }