| 1 |
--- e-smith-samba-2.2.0/root/etc/e-smith/db/configuration/migrate/20smb.migratefix 2008-11-23 19:24:10.000000000 -0700 |
| 2 |
+++ e-smith-samba-2.2.0/root/etc/e-smith/db/configuration/migrate/20smb 2008-11-23 19:28:10.000000000 -0700 |
| 3 |
@@ -14,9 +14,9 @@ |
| 4 |
} |
| 5 |
} |
| 6 |
|
| 7 |
- foreach my $prop (qw(DomainMaster SambaDomainMaster)) |
| 8 |
+ foreach my $prop (qw(DomainMaster)) |
| 9 |
{ |
| 10 |
- my $old = $DB->get($prop); |
| 11 |
+ my $old = $DB->get("Samba$prop"); |
| 12 |
if (defined $old) |
| 13 |
{ |
| 14 |
$new_props{ServerRole} = 'PDC' unless $old eq 'no'; |
| 15 |
@@ -24,6 +24,16 @@ |
| 16 |
} |
| 17 |
} |
| 18 |
|
| 19 |
+ foreach my $prop (qw(DomainMaster)) |
| 20 |
+ { |
| 21 |
+ my $old = $smb->prop($prop); |
| 22 |
+ if (defined $old) |
| 23 |
+ { |
| 24 |
+ $new_props{ServerRole} = 'PDC' unless $old eq 'no'; |
| 25 |
+ $smb->delete_prop($prop); |
| 26 |
+ } |
| 27 |
+ } |
| 28 |
+ |
| 29 |
###Migrage CharacterSet->DisplayCharSet |
| 30 |
my $CharacterSet = $smb->prop('CharacterSet'); |
| 31 |
if ($CharacterSet) |
| 32 |
--- e-smith-samba-2.2.0/root/etc/e-smith/db/configuration/migrate/30smbServerName.migratefix 2007-12-15 08:53:09.000000000 -0700 |
| 33 |
+++ e-smith-samba-2.2.0/root/etc/e-smith/db/configuration/migrate/30smbServerName 2008-11-23 19:27:43.000000000 -0700 |
| 34 |
@@ -3,6 +3,6 @@ |
| 35 |
my $srvName = $smb->prop('ServerName') || 'e-smith-server'; |
| 36 |
my $sysName = $DB->get('SystemName') || return; |
| 37 |
|
| 38 |
- return unless $srvName =~ m#(mitel-networks|e-smith)-server#; |
| 39 |
+ return unless $srvName =~ m#mitel-networks|mitel-networks-server|mitel-server|e-smith-server#; |
| 40 |
$smb->set_prop('ServerName', $sysName->value); |
| 41 |
} |
Parent Directory
| 
Revision Log
| 
Revision Graph
