1 |
vip-ire |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-ldap-5.2.0/root/etc/e-smith/events/actions/ldap-update mezzanine_patched_e-smith-ldap-5.2.0/root/etc/e-smith/events/actions/ldap-update |
2 |
|
|
--- e-smith-ldap-5.2.0/root/etc/e-smith/events/actions/ldap-update 2010-10-27 16:01:24.000000000 +0200 |
3 |
|
|
+++ mezzanine_patched_e-smith-ldap-5.2.0/root/etc/e-smith/events/actions/ldap-update 2010-10-27 15:58:33.000000000 +0200 |
4 |
|
|
@@ -279,7 +279,11 @@ |
5 |
|
|
my $dn = "cn=$group,ou=Groups,$base"; |
6 |
|
|
@{$updates->{$dn}}{'cn','userPassword','gidNumber','memberUid'} = getgrnam($group); |
7 |
|
|
utf8::upgrade($dn); |
8 |
|
|
- $updates->{$dn}->{objectClass} = ['posixGroup', 'mailboxRelatedObject']; |
9 |
|
|
+ $updates->{$dn}->{objectClass} = ['posixGroup']; |
10 |
|
|
+ if ($group eq 'shared'){ |
11 |
|
|
+ push @{$updates->{$dn}->{objectClass}}, 'mailboxRelatedObject'; |
12 |
|
|
+ $updates->{$dn}->{mail} = "everyone\@$domain"; |
13 |
|
|
+ } |
14 |
|
|
$updates->{$dn}->{userPassword} =~ s/^/{CRYPT}/ unless $updates->{$dn}->{userPassword} =~ m/^{/; |
15 |
|
|
$updates->{$dn}->{memberUid} = [ split /\s+/, $updates->{$dn}->{memberUid} ]; |
16 |
|
|
if ( -f "$schema" and exists $groupmap->{$group} ) |
17 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-ldap-5.2.0/root/etc/e-smith/templates/home/e-smith/db/ldap/ldif/template-begin mezzanine_patched_e-smith-ldap-5.2.0/root/etc/e-smith/templates/home/e-smith/db/ldap/ldif/template-begin |
18 |
|
|
--- e-smith-ldap-5.2.0/root/etc/e-smith/templates/home/e-smith/db/ldap/ldif/template-begin 2010-10-27 16:01:24.000000000 +0200 |
19 |
|
|
+++ mezzanine_patched_e-smith-ldap-5.2.0/root/etc/e-smith/templates/home/e-smith/db/ldap/ldif/template-begin 2010-10-27 16:01:22.000000000 +0200 |
20 |
|
|
@@ -109,6 +109,24 @@ |
21 |
|
|
} |
22 |
|
|
endgrent(); |
23 |
|
|
|
24 |
|
|
+ # Nobody and shared are special groups used by samba |
25 |
|
|
+ foreach my $group (qw/nobody shared/) |
26 |
|
|
+ { |
27 |
|
|
+ my $dn = "cn=$group,ou=Groups,$ldapBase"; |
28 |
|
|
+ utf8::upgrade($dn); |
29 |
|
|
+ $dnmap->{$group}->{group} = $dn; |
30 |
|
|
+ @{$ldif->{$dn}}{'cn','userPassword','gidNumber','memberUid'} = getgrnam($group); |
31 |
|
|
+ push @{$ldif->{$dn}->{objectClass}}, 'posixGroup'; |
32 |
|
|
+ if ($group eq 'shared'){ |
33 |
|
|
+ push @{$ldif->{$dn}->{objectClass}}, 'mailboxRelatedObject'; |
34 |
|
|
+ $ldif->{$dn}->{mail} = "everyone\@$DomainName"; |
35 |
|
|
+ } |
36 |
|
|
+ $ldif->{$dn}->{userPassword} =~ s/^/{CRYPT}/ unless $ldif->{$dn}->{userPassword} =~ m/^\{/; |
37 |
|
|
+ $ldif->{$dn}->{memberUid} = [ split /\s+/, $ldif->{$dn}->{memberUid} ]; |
38 |
|
|
+ } |
39 |
|
|
+ endgrent(); |
40 |
|
|
+ |
41 |
|
|
+ |
42 |
|
|
# Read in samba user details |
43 |
|
|
if ( -f "$schema" and -x '/usr/bin/pdbedit' ) |
44 |
|
|
{ |