e-smith-base%2Bldap/sme8/e-smith-base%2Bldap-4.19.1-add2general.patch

--- e-smith-base+ldap-4.19.1/root/etc/e-smith/web/functions/remoteaccess.add2general2   2008-07-04 23:13:37.000000000 +0200
+++ e-smith-base+ldap-4.19.1/root/etc/e-smith/web/functions/remoteaccess        2008-07-04 23:13:37.000000000 +0200
@@ -132,7 +132,7 @@
         
         <field type="select" 
             id="sshAccess" 
-            options=" 'off' => 'NO_ACCESS', 'private' => 'PRIVATE', 'public' => 'PUBLIC'"
+            options=" 'off' => 'NO_ACCESS', 'private' => 'NETWORKS_ALLOW_LOCAL', 'public' => 'NETWORKS_ALLOW_PUBLIC'"
             value="get_ssh_access()">
             <label>LABEL_SSH</label>
             <description>DESC_SSH</description>
--- e-smith-base+ldap-4.19.1/root/etc/e-smith/web/functions/directory.add2general2      2008-07-04 23:13:37.000000000 +0200
+++ e-smith-base+ldap-4.19.1/root/etc/e-smith/web/functions/directory   2008-07-04 23:13:37.000000000 +0200
@@ -106,7 +106,7 @@
             type="select"
             id="Access"
             value="get_prop('ldap','access')"
-            options="'private' => 'PRIVATE', 'public'  => 'PUBLIC'">
+            options="'private' => 'NETWORKS_ALLOW_LOCAL', 'public'  => 'NETWORKS_ALLOW_PUBLIC'">
             <label>DIRECTORY_ACCESS</label>
             <description>DESC_DIRECTORY_ACCESS</description>
         </field>
--- e-smith-base+ldap-4.19.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/directory.add2general3     2008-07-04 23:22:42.000000000 +0200
+++ e-smith-base+ldap-4.19.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/directory  2008-07-04 23:23:18.000000000 +0200
@@ -3,14 +3,6 @@
      <base>FORM_TITLE</base>
        <trans>Change LDAP directory settings</trans>
    </entry>    
-   <entry>
-     <base>PUBLIC</base>
-      <trans>Allow public access (entire Internet)</trans>
-   </entry>
-    <entry>
-     <base>PRIVATE</base>
-      <trans>Allow access only from local networks</trans>
-  </entry>
 <entry>
 <base>LABEL_ROOT</base>
 <trans>Server root</trans>
--- e-smith-base+ldap-4.19.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/directory.pm.add2general4     2008-07-05 18:29:50.000000000 +0200
+++ e-smith-base+ldap-4.19.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/directory.pm  2008-07-05 18:29:50.000000000 +0200
@@ -194,7 +194,7 @@
     #------------------------------------------------------------
 
     system ("/sbin/e-smith/signal-event ldap-update") == 0
-        or return $fm->error('ERROR_UPDATING');
+        or return $fm->error('ERROR_UPDATING_CONFIGURATION');
 
     return $fm->success('SUCCESS');
 }
1	--- e-smith-base+ldap-4.19.1/root/etc/e-smith/web/functions/remoteaccess.add2general2 2008-07-04 23:13:37.000000000 +0200
2	+++ e-smith-base+ldap-4.19.1/root/etc/e-smith/web/functions/remoteaccess 2008-07-04 23:13:37.000000000 +0200
3	@@ -132,7 +132,7 @@
4
5	<field type="select"
6	id="sshAccess"
7	- options=" 'off' => 'NO_ACCESS', 'private' => 'PRIVATE', 'public' => 'PUBLIC'"
8	+ options=" 'off' => 'NO_ACCESS', 'private' => 'NETWORKS_ALLOW_LOCAL', 'public' => 'NETWORKS_ALLOW_PUBLIC'"
9	value="get_ssh_access()">
10	<label>LABEL_SSH</label>
11	<description>DESC_SSH</description>
12	--- e-smith-base+ldap-4.19.1/root/etc/e-smith/web/functions/directory.add2general2 2008-07-04 23:13:37.000000000 +0200
13	+++ e-smith-base+ldap-4.19.1/root/etc/e-smith/web/functions/directory 2008-07-04 23:13:37.000000000 +0200
14	@@ -106,7 +106,7 @@
15	type="select"
16	id="Access"
17	value="get_prop('ldap','access')"
18	- options="'private' => 'PRIVATE', 'public' => 'PUBLIC'">
19	+ options="'private' => 'NETWORKS_ALLOW_LOCAL', 'public' => 'NETWORKS_ALLOW_PUBLIC'">
20	<label>DIRECTORY_ACCESS</label>
21	<description>DESC_DIRECTORY_ACCESS</description>
22	</field>
23	--- e-smith-base+ldap-4.19.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/directory.add2general3 2008-07-04 23:22:42.000000000 +0200
24	+++ e-smith-base+ldap-4.19.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/directory 2008-07-04 23:23:18.000000000 +0200
25	@@ -3,14 +3,6 @@
26	<base>FORM_TITLE</base>
27	<trans>Change LDAP directory settings</trans>
28	</entry>
29	- <entry>
30	- <base>PUBLIC</base>
31	- <trans>Allow public access (entire Internet)</trans>
32	- </entry>
33	- <entry>
34	- <base>PRIVATE</base>
35	- <trans>Allow access only from local networks</trans>
36	- </entry>
37	<entry>
38	<base>LABEL_ROOT</base>
39	<trans>Server root</trans>
40	--- e-smith-base+ldap-4.19.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/directory.pm.add2general4 2008-07-05 18:29:50.000000000 +0200
41	+++ e-smith-base+ldap-4.19.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/directory.pm 2008-07-05 18:29:50.000000000 +0200
42	@@ -194,7 +194,7 @@
43	#------------------------------------------------------------
44
45	system ("/sbin/e-smith/signal-event ldap-update") == 0
46	- or return $fm->error('ERROR_UPDATING');
47	+ or return $fm->error('ERROR_UPDATING_CONFIGURATION');
48
49	return $fm->success('SUCCESS');
50	}