e-smith-ibays/sme9/e-smith-ibays-2.4.0-removeV3Migrate.patch

diff -ruN e-smith-ibays-2.4.0.old/root/etc/e-smith/db/accounts/migrate/20ibay-accounts e-smith-ibays-2.4.0/root/etc/e-smith/db/accounts/migrate/20ibay-accounts
--- e-smith-ibays-2.4.0.old/root/etc/e-smith/db/accounts/migrate/20ibay-accounts        2003-06-12 09:48:32.000000000 -0700
+++ e-smith-ibays-2.4.0/root/etc/e-smith/db/accounts/migrate/20ibay-accounts    1969-12-31 16:00:00.000000000 -0800
@@ -1,31 +0,0 @@
-{
-    foreach my $ibay ($DB->get_all_by_prop(type => 'ibay'))
-    {
-       my $usepw = $DB->get_prop_and_delete($ibay->key, 'UsePassword');
-       next unless defined $usepw;
-
-       # This is a version 3.x i-bay
-       # Migrate UsePassword, ReadAccess and WriteAccess properties to
-       # PublicAccess, Group, UserAccess properties
-       my $read_access = $DB->get_prop_and_delete($ibay->key, 'ReadAccess') || 'local';
-       if ($read_access eq 'global')
-       {
-           $ibay->merge_props(
-                   PublicAccess => ($usepw ?  'global-pw' : 'global'),
-               );
-       }
-       else
-       {
-           $ibay->merge_props(
-                   PublicAccess => ($usepw ?  'local-pw' : 'local'),
-               );
-       }
-
-       my $write_access = $DB->get_prop_and_delete($ibay->key, 'WriteAccess') || 'local';
-       $ibay->merge_props(
-                   Group => 'shared',
-                   UserAccess => ($write_access eq "admin" ?
-                       'wr_admin_rd_group' : 'wr-group-rd-group'),
-               );
-    }
-}

1	diff -ruN e-smith-ibays-2.4.0.old/root/etc/e-smith/db/accounts/migrate/20ibay-accounts e-smith-ibays-2.4.0/root/etc/e-smith/db/accounts/migrate/20ibay-accounts
2	--- e-smith-ibays-2.4.0.old/root/etc/e-smith/db/accounts/migrate/20ibay-accounts 2003-06-12 09:48:32.000000000 -0700
3	+++ e-smith-ibays-2.4.0/root/etc/e-smith/db/accounts/migrate/20ibay-accounts 1969-12-31 16:00:00.000000000 -0800
4	@@ -1,31 +0,0 @@
5	-{
6	- foreach my $ibay ($DB->get_all_by_prop(type => 'ibay'))
7	- {
8	- my $usepw = $DB->get_prop_and_delete($ibay->key, 'UsePassword');
9	- next unless defined $usepw;
10	-
11	- # This is a version 3.x i-bay
12	- # Migrate UsePassword, ReadAccess and WriteAccess properties to
13	- # PublicAccess, Group, UserAccess properties
14	- my $read_access = $DB->get_prop_and_delete($ibay->key, 'ReadAccess') \|\| 'local';
15	- if ($read_access eq 'global')
16	- {
17	- $ibay->merge_props(
18	- PublicAccess => ($usepw ? 'global-pw' : 'global'),
19	- );
20	- }
21	- else
22	- {
23	- $ibay->merge_props(
24	- PublicAccess => ($usepw ? 'local-pw' : 'local'),
25	- );
26	- }
27	-
28	- my $write_access = $DB->get_prop_and_delete($ibay->key, 'WriteAccess') \|\| 'local';
29	- $ibay->merge_props(
30	- Group => 'shared',
31	- UserAccess => ($write_access eq "admin" ?
32	- 'wr_admin_rd_group' : 'wr-group-rd-group'),
33	- );
34	- }
35	-}
36