[dev] Re: LDAP Preferences container

[Jeff Seifert]

Chuck Hagenbuch <chuck at horde.org> writes:

> Quoting Jeffrey Seifert <seifert at everybody.org>:
>
>> I propose to deprecate the username parameter in favor of the rootdn.
>> I can't think of a compelling reason to keep both.  We'd probably need
>> to keep on supporting both for at least the short term, while people
>> get a chance to update their installations.
>
> Sounds okay to me...
>
> -chuck

Here's my proposed patch, which really just cleans up the comments
telling users to use the rootdn parameter instead of username.

-Jeff

-------------- next part --------------
Index: horde/config/conf.php.dist
===================================================================
RCS file: /repository/horde/config/conf.php.dist,v
retrieving revision 1.43
diff -c -r1.43 conf.php.dist
*** horde/config/conf.php.dist	19 May 2003 17:49:10 -0000	1.43
--- horde/config/conf.php.dist	9 Jun 2003 19:12:54 -0000
***************
*** 269,275 ****
   * do NOT have permission to modify their own ldap accounts.
   */
  //$conf['prefs']['params']['rootdn'] = 'cn=Manager,dc=example,dc=org';
- //$conf['prefs']['params']['username'] = 'Manager';
  //$conf['prefs']['params']['password'] = 'password';
  
  // The size of the preferences field in your backend in bytes. Horde will
--- 269,274 ----
Index: horde/lib/Prefs/ldap.php
===================================================================
RCS file: /repository/horde/lib/Prefs/ldap.php,v
retrieving revision 1.65
diff -c -r1.65 ldap.php
*** horde/lib/Prefs/ldap.php	6 Jun 2003 19:22:04 -0000	1.65
--- horde/lib/Prefs/ldap.php	9 Jun 2003 19:15:30 -0000
***************
*** 10,18 ****
   *
   * Optional values for $params:
   *      'version'       The version of the LDAP protocol to use.
!  *      'rootdn'        The DN of the root (administrative) account.
!  *      'username'      The user as which to bind for write operations.
!  *      'password'      'username's password for bind authentication.
   *
   * $Horde: horde/lib/Prefs/ldap.php,v 1.65 2003/06/06 19:22:04 slusarz Exp $
   *
--- 10,20 ----
   *
   * Optional values for $params:
   *      'version'       The version of the LDAP protocol to use.
!  *      'rootdn'        The DN of the root (administrative) account
!  *                      to bind for write operations
!  *      'password'      'rootdn's password for bind authentication.
!  *
!  * Note: parameter 'username' for $params has been deprecated.  Use 'rootdn'.
   *
   * $Horde: horde/lib/Prefs/ldap.php,v 1.65 2003/06/06 19:22:04 slusarz Exp $
   *
***************
*** 86,94 ****
              $this->params['port'] = 389;
          }
  
!         /* If $params['username'] is empty, set it to the name of the
!            current user. Also, set $params['password'] to the current
!            user's password.
  
             Note: This assumes the user is allowed to modify their own LDAP
                   entry.
--- 88,94 ----
              $this->params['port'] = 389;
          }
  
!         /* If $params['rootdn'] is empty, authenticate as the current user.
  
             Note: This assumes the user is allowed to modify their own LDAP
                   entry.
-------------- next part --------------

-- 
/* A programmer is a machine for turning coffee into code */