e-smith-ldap/sme7/e-smith-ldap-4.12.0-add2general.patch

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