rpms/phpldapadmin/devel phpldapadmin-1.1.0.5-config.patch, NONE, 1.1 phpldapadmin.spec, 1.15, 1.16 phpldapadmin-1.0.1-config.patch, 1.1, NONE

[Dmitry Butskoy]

Author: buc

Update of /cvs/extras/rpms/phpldapadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11070

Modified Files:
	phpldapadmin.spec 
Added Files:
	phpldapadmin-1.1.0.5-config.patch 
Removed Files:
	phpldapadmin-1.0.1-config.patch 
Log Message:
update config patch


phpldapadmin-1.1.0.5-config.patch:

--- NEW FILE phpldapadmin-1.1.0.5-config.patch ---
diff -Nrbu phpldapadmin-1.1.0.5/config/config.php phpldapadmin-1.1.0.5-OK/config/config.php
--- phpldapadmin-1.1.0.5/config/config.php	2008-09-26 18:55:09.000000000 +0400
+++ phpldapadmin-1.1.0.5-OK/config/config.php	2008-09-26 18:53:47.000000000 +0400
@@ -72,6 +72,11 @@
    30 seconds or the setting of max_exection_time if this is null. */
 // $config->custom->session['timelimit'] = 30;
 
+// $config->custom->appearance['show_clear_password'] = false;
+
+// $config->custom->search['size_limit'] = 50;
+#  $config->custom->search['size_limit'] = 1000;
+
 /*********************************************/
 /* Commands                                  */
 /*********************************************/
@@ -153,7 +158,7 @@
 
 /* A convenient name that will appear in the tree viewer and throughout
    phpLDAPadmin to identify this LDAP server to users. */
-$ldapservers->SetValue($i,'server','name','My LDAP Server');
+$ldapservers->SetValue($i,'server','name','Local LDAP Server');
 
 /* Examples:
    'ldap.example.com',
@@ -184,6 +189,7 @@
    encrypted using blowfish and the secret your specify above as
    session['blowfish']. */
 // $ldapservers->SetValue($i,'server','auth_type','cookie');
+$ldapservers->SetValue($i,'server','auth_type','session');
 
 /* The DN of the user for phpLDAPadmin to bind with. For anonymous binds or
    'cookie' or 'session' auth_types, LEAVE THE LOGIN_DN AND LOGIN_PASS BLANK. If
@@ -253,6 +259,7 @@
 /* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5,
    blowfish, crypt or leave blank for now default algorithm. */
 // $ldapservers->SetValue($i,'appearance','password_hash','md5');
+$ldapservers->SetValue($i,'appearance','password_hash','');
 
 /* If you specified 'cookie' or 'session' as the auth_type above, you can
    optionally specify here an attribute to use when logging in. If you enter
@@ -264,6 +271,7 @@
    specify 'string', in which case you can provide a string to use for logging
    users in. See 'login_string' directly below. */
 // $ldapservers->SetValue($i,'login','attr','dn');
+$ldapservers->SetValue($i,'login','attr','uid');
 
 /* If you specified something different from 'dn', for example 'uid', as the
    login_attr above, you can optionally specify here to fall back to


Index: phpldapadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/devel/phpldapadmin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- phpldapadmin.spec	13 Feb 2008 16:06:30 -0000	1.15
+++ phpldapadmin.spec	26 Sep 2008 15:02:13 -0000	1.16
@@ -1,12 +1,12 @@
 Name: phpldapadmin
 Summary: Web-based tool for managing LDAP servers
 Version: 1.1.0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 URL: http://phpldapadmin.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}.tar.gz
-Patch0: phpldapadmin-1.0.1-config.patch
+Patch0: phpldapadmin-1.1.0.5-config.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -115,6 +115,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.1.0.5-2
+- update config patch
+
 * Wed Feb 13 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.1.0.5-1
 - upgrade to 1.1.0.5
 


--- phpldapadmin-1.0.1-config.patch DELETED ---