| 1 |
vip-ire |
1.1 |
diff -Nur smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify smeserver-shared-folders-0.1_ntacl/root/etc/e-smith/events/actions/share-modify |
| 2 |
|
|
--- smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify 2013-10-17 09:42:39.235345362 +0200 |
| 3 |
|
|
+++ smeserver-shared-folders-0.1_ntacl/root/etc/e-smith/events/actions/share-modify 2013-10-17 09:44:57.298358601 +0200 |
| 4 |
|
|
@@ -99,7 +99,7 @@ |
| 5 |
|
|
|
| 6 |
|
|
# Don't reset permissions if ManualPermissions is set to 'yes' |
| 7 |
|
|
|
| 8 |
|
|
-unless ( $perm eq 'yes' || $perm eq 'enabled' ){ |
| 9 |
|
|
+unless ( $perm eq 'yes' || $perm eq 'enabled' || $perm eq 'ntacl' ){ |
| 10 |
|
|
# Remove existing ACLs |
| 11 |
|
|
system($setfacl, |
| 12 |
|
|
'-R', |
| 13 |
|
|
diff -Nur smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/10acl_xattr smeserver-shared-folders-0.1_ntacl/root/etc/e-smith/templates/etc/smb.conf/shares/10acl_xattr |
| 14 |
|
|
--- smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/10acl_xattr 1970-01-01 01:00:00.000000000 +0100 |
| 15 |
|
|
+++ smeserver-shared-folders-0.1_ntacl/root/etc/e-smith/templates/etc/smb.conf/shares/10acl_xattr 2013-10-17 09:50:55.890397084 +0200 |
| 16 |
|
|
@@ -0,0 +1,10 @@ |
| 17 |
|
|
+{ |
| 18 |
|
|
+ my $perm = $share->prop('ManualPermissions') || "no"; |
| 19 |
|
|
+ if ($perm eq 'ntacl'){ |
| 20 |
|
|
+ $OUT .= ''; |
| 21 |
|
|
+ $share_vfs->{acl_xattr}->{'ignore system acls'} = "no"; |
| 22 |
|
|
+ } |
| 23 |
|
|
+ else{ |
| 24 |
|
|
+ $OUT .= ''; |
| 25 |
|
|
+ } |
| 26 |
|
|
+} |
| 27 |
|
|
diff -Nur smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/30permissions smeserver-shared-folders-0.1_ntacl/root/etc/e-smith/templates/etc/smb.conf/shares/30permissions |
| 28 |
|
|
--- smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/30permissions 2009-04-08 11:55:18.000000000 +0200 |
| 29 |
|
|
+++ smeserver-shared-folders-0.1_ntacl/root/etc/e-smith/templates/etc/smb.conf/shares/30permissions 2013-10-17 09:52:45.929411519 +0200 |
| 30 |
|
|
@@ -1,4 +1,15 @@ |
| 31 |
|
|
{ |
| 32 |
|
|
$OUT .= "inherit permissions = yes\n"; |
| 33 |
|
|
$OUT .= "create mode = 0660"; |
| 34 |
|
|
+ my $perm = $share->prop('ManualPermissions') || 'no'; |
| 35 |
|
|
+ if ( $perm eq 'ntacl' ){ |
| 36 |
|
|
+ $OUT .=<<"HERE"; |
| 37 |
|
|
+nt acl support = yes |
| 38 |
|
|
+store dos attributes = yes |
| 39 |
|
|
+map hidden = no |
| 40 |
|
|
+map system = no |
| 41 |
|
|
+map archive = no |
| 42 |
|
|
+map readonly = no |
| 43 |
|
|
+HERE |
| 44 |
|
|
+ } |
| 45 |
|
|
} |
| 46 |
|
|
diff -Nur smeserver-shared-folders-0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm smeserver-shared-folders-0.1_ntacl/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm |
| 47 |
|
|
--- smeserver-shared-folders-0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm 2013-10-17 09:42:39.272345365 +0200 |
| 48 |
|
|
+++ smeserver-shared-folders-0.1_ntacl/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm 2013-10-17 09:43:49.842352909 +0200 |
| 49 |
|
|
@@ -361,7 +361,7 @@ |
| 50 |
|
|
my $ReadUsers = $share->prop('ReadUsers') || ''; |
| 51 |
|
|
my $manualPerm = $share->prop('ManualPermissions') || 'no'; |
| 52 |
|
|
|
| 53 |
|
|
- if (($manualPerm eq 'yes') || ($manualPerm eq 'enabled')){ |
| 54 |
|
|
+ if (($manualPerm eq 'yes') || ($manualPerm eq 'enabled') || ($manualPerm eq 'ntacl')){ |
| 55 |
|
|
$out .= $self->localise('MANUAL_PERMS'); |
| 56 |
|
|
} |
| 57 |
|
|
|
Parent Directory
| 
Revision Log
| 
Revision Graph
