/[smecontribs]/rpms/smeserver-phpldapadmin/contribs8/smeserver-phpldapadmin-1.2.3-bigone.patch
ViewVC logotype

Contents of /rpms/smeserver-phpldapadmin/contribs8/smeserver-phpldapadmin-1.2.3-bigone.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.2 - (show annotations) (download)
Tue Nov 5 20:55:07 2013 UTC (11 years ago) by unnilennium
Branch: MAIN
CVS Tags: smeserver-phpldapadmin-1_2_3-6_el5_sme, smeserver-phpldapadmin-1_2_3-5_el5_sme, HEAD
Changes since 1.1: +1 -1 lines
Error occurred while calculating annotation data.
* Mon Nov 4 2013 JP Pialasse <tests@pialasse.com> 1.2.3-4.sme
- wrong tempalte path for config file [SME: 7975]
- patching also incorrect template.
- error binding to server swith to http auth to prevent

1 diff -Nur smeserver-phpldapadmin-1.2.3.old/createlinks smeserver-phpldapadmin-1.2.3/createlinks
2 --- smeserver-phpldapadmin-1.2.3.old/createlinks 2013-11-05 01:53:57.000000000 -0500
3 +++ smeserver-phpldapadmin-1.2.3/createlinks 2013-11-05 01:59:44.000000000 -0500
4 @@ -12,4 +12,4 @@
5 {
6 templates2events("/etc/phpldapadmin/config.php", $event)
7 }
8 -
9 +safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/etc/phpldapadmin/config.php/template-begin");
10 diff -Nur smeserver-phpldapadmin-1.2.3.old/root/etc/e-smith/templates/etc/phpldapadmin/config.php/01header smeserver-phpldapadmin-1.2.3/root/etc/e-smith/templates/etc/phpldapadmin/config.php/01header
11 --- smeserver-phpldapadmin-1.2.3.old/root/etc/e-smith/templates/etc/phpldapadmin/config.php/01header 2013-11-05 01:53:57.000000000 -0500
12 +++ smeserver-phpldapadmin-1.2.3/root/etc/e-smith/templates/etc/phpldapadmin/config.php/01header 2013-11-05 02:02:12.000000000 -0500
13 @@ -1,4 +1,4 @@
14 -<?php
15 +
16 /** NOTE **
17 ** Make sure that <?php is the FIRST line of this file!
18 ** IE: There should NOT be any blank lines or spaces BEFORE <?php
19 diff -Nur smeserver-phpldapadmin-1.2.3.old/root/etc/e-smith/templates/etc/phpldapadmin/config.php/02UsefulConfOver smeserver-phpldapadmin-1.2.3/root/etc/e-smith/templates/etc/phpldapadmin/config.php/02UsefulConfOver
20 --- smeserver-phpldapadmin-1.2.3.old/root/etc/e-smith/templates/etc/phpldapadmin/config.php/02UsefulConfOver 2013-11-05 01:53:57.000000000 -0500
21 +++ smeserver-phpldapadmin-1.2.3/root/etc/e-smith/templates/etc/phpldapadmin/config.php/02UsefulConfOver 2013-11-05 02:02:46.000000000 -0500
22 @@ -51,7 +51,7 @@
23 // $config->custom->appearance['timezone'] = null;
24 # $config->custom->appearance['timezone'] = 'Australia/Melbourne';
25
26 - meaning that users will not be presented a form for modifying those
27 +/* meaning that users will not be presented a form for modifying those
28 attributes, and they will not be allowed to be modified on the "back-end"
29 either. You may configure this list here:
30 NOTE: The user must be able to read the readonly_attrs_exempt entry to be
31 diff -Nur smeserver-phpldapadmin-1.2.3.old/root/etc/e-smith/templates/etc/phpldapadmin/config.php/05LdapServer smeserver-phpldapadmin-1.2.3/root/etc/e-smith/templates/etc/phpldapadmin/config.php/05LdapServer
32 --- smeserver-phpldapadmin-1.2.3.old/root/etc/e-smith/templates/etc/phpldapadmin/config.php/05LdapServer 2013-11-05 01:53:57.000000000 -0500
33 +++ smeserver-phpldapadmin-1.2.3/root/etc/e-smith/templates/etc/phpldapadmin/config.php/05LdapServer 2013-11-05 14:54:42.000000000 -0500
34 @@ -62,6 +62,8 @@
35 /* Use TLS (Transport Layer Security) to connect to the LDAP server. */
36 // $servers->setValue('server','tls',false);
37
38 +$servers->setValue('server','tls',false);
39 +$servers->setValue('login','anon_bind',false);
40
41 {
42 open (PW, "/etc/openldap/ldap.pw")
43 @@ -80,7 +82,8 @@
44 my $dc = esmith::util::ldapBase($domain);
45
46 $OUT .= "\$servers->setValue('server','base',array('$dc'));\n";
47 - $OUT .= "\$servers->setValue('server','auth_type','config');\n";
48 - $OUT .= "\$servers->SetValue('login','dn','cn=root,$dc');\n";
49 - $OUT .= "\$servers->setValue('login','pass','$pw');\n";
50 + $OUT .= "\$servers->setValue('login','base',array('$dc'));\n";
51 + $OUT .= "\$servers->setValue('login','auth_type','http');\n";
52 + $OUT .= "\$servers->SetValue('login','bind_id','cn=root,$dc');\n";
53 + $OUT .= "\$servers->setValue('login','bind_pass','$pw');\n";
54 }

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed