[Tikiwiki-cvs] tiki/db/profiles default-inserts.sql,1.15,1.16

[<sy...@us...>]

Update of /cvsroot/tikiwiki/tiki/db/profiles
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24785/db/profiles

Modified Files:
	default-inserts.sql 
Log Message:
[FIX]ldap: bad merge

Index: default-inserts.sql
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/db/profiles/default-inserts.sql,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- default-inserts.sql	22 May 2006 17:09:08 -0000	1.15
+++ default-inserts.sql	15 Nov 2006 14:56:14 -0000	1.16
@@ -20,10 +20,10 @@
 INSERT INTO tiki_preferences VALUES ('auth_ldap_groupattr','cn');
 INSERT INTO tiki_preferences VALUES ('auth_ldap_groupdn','');
 INSERT INTO tiki_preferences VALUES ('auth_ldap_groupoc','groupOfUniqueNames');
-INSERT INTO tiki_preferences VALUES ('auth_ldap_host','localhost');
+INSERT INTO tiki_preferences VALUES ('auth_pear_host','localhost');
 INSERT INTO tiki_preferences VALUES ('auth_ldap_memberattr','uniqueMember');
 INSERT INTO tiki_preferences VALUES ('auth_ldap_memberisdn','n');
-INSERT INTO tiki_preferences VALUES ('auth_ldap_port','389');
+INSERT INTO tiki_preferences VALUES ('auth_pear_port','389');
 INSERT INTO tiki_preferences VALUES ('auth_ldap_scope','sub');
 INSERT INTO tiki_preferences VALUES ('auth_ldap_userattr','uid');
 INSERT INTO tiki_preferences VALUES ('auth_ldap_userdn','');