Changeset 11208

Show
Ignore:
Timestamp:
08/15/08 14:24:36 (5 months ago)
Author:
/C=ES/O=Warp Networks S.L./CN=juruen@…
Message:

Merging r11207 from trunk into intrepid branches

Location:
branches/juruen
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • branches/juruen/intrepid-alpha4/client/samba/ChangeLog

    r11197 r11208  
    55        + Mark shares strings to translate 
    66        + Use eBox OID number in LDAP schemas 
     7        + Do not use shares that don't have permission for any user or group 
    780.11.103 
    89        + Bugfix. Add and use EBox::Samba::Types::Select to avoid  
  • branches/juruen/intrepid-alpha4/client/samba/src/EBox/Samba.pm

    r10576 r11208  
    280280        } 
    281281         
     282        next unless (@readOnly or @readWrite or @administrators);        
     283 
    282284        $shareConf->{'readOnly'} = join (', ', @readOnly); 
    283285        $shareConf->{'readWrite'} = join (', ', @readWrite); 
     
    286288                                                 @readWrite, 
    287289                                                 @administrators); 
     290 
    288291        push (@shares, $shareConf); 
    289292    } 
  • branches/juruen/intrepid-packages/client/samba/ChangeLog

    r11198 r11208  
    55        + Mark shares strings to translate 
    66        + Use eBox OID number in LDAP schemas 
     7        + Do not use shares that don't have permission for any user or group 
    780.11.103 
    89        + Bugfix. Add and use EBox::Samba::Types::Select to avoid  
  • branches/juruen/intrepid-packages/client/samba/src/EBox/Samba.pm

    r10576 r11208  
    280280        } 
    281281         
     282        next unless (@readOnly or @readWrite or @administrators);        
     283 
    282284        $shareConf->{'readOnly'} = join (', ', @readOnly); 
    283285        $shareConf->{'readWrite'} = join (', ', @readWrite); 
     
    286288                                                 @readWrite, 
    287289                                                 @administrators); 
     290 
    288291        push (@shares, $shareConf); 
    289292    }