diff -ruN e-smith-samba-2.4.0.old/root/etc/e-smith/db/configuration/migrate/20smb e-smith-samba-2.4.0/root/etc/e-smith/db/configuration/migrate/20smb --- e-smith-samba-2.4.0.old/root/etc/e-smith/db/configuration/migrate/20smb 2013-01-31 13:31:40.000000000 -0800 +++ e-smith-samba-2.4.0/root/etc/e-smith/db/configuration/migrate/20smb 1969-12-31 16:00:00.000000000 -0800 @@ -1,60 +0,0 @@ -{ - my $smb = $DB->get('smb'); - return unless $smb; - - my %new_props = (); - - foreach my $prop (qw(RoamingProfiles ServerName Workgroup)) - { - my $old = $DB->get("Samba$prop"); - if (defined $old) - { - $new_props{$prop} = $old->value; - $old->delete; - } - } - - foreach my $prop (qw(DomainMaster)) - { - my $old = $DB->get("Samba$prop"); - if (defined $old) - { - $new_props{ServerRole} = 'PDC' unless $old eq 'no'; - $old->delete; - } - } - - foreach my $prop (qw(DomainMaster)) - { - my $old = $smb->prop($prop); - if (defined $old) - { - $new_props{ServerRole} = 'PDC' unless $old eq 'no'; - $smb->delete_prop($prop); - } - } - - ###Migrage CharacterSet->DisplayCharSet - my $CharacterSet = $smb->prop('CharacterSet'); - if ($CharacterSet) - { - $new_props{DisplayCharSet} = $CharacterSet; - $smb->delete_prop('CharacterSet'); - } - - ###Migrate ClientCodePage->DosCharSet & UnixCharSet - my $ClientCodePage = $smb->prop('ClientCodePage'); - if ($ClientCodePage) - { - $new_props{DosCharSet} = - $new_props{UnixCharSet} = $ClientCodePage; - $smb->delete_prop('ClientCodePage'); - } - - if ($smb->prop('status') and not $smb->prop('UnixCharSet')) - { - $new_props{UnixCharSet} ||= 'ISO8859-1'; - } - - $smb->merge_props(%new_props); -}