← Back to branch summary

~ubuntu-branches/ubuntu/dapper/freeradius/dapper-updates

« back to all changes in this revision

Viewing changes to dialup_admin/lib/ldap/defaults.php3

  • Committer: Bazaar Package Importer
  • Author(s): Paul Hampson
  • Date: 2004-12-29 20:19:42 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20041229201942-uj2e95la965uthc7
Tags: 1.0.1-2
http://bugs.debian.org/279419
http://bugs.debian.org/262635
http://bugs.debian.org/284353
http://bugs.debian.org/280942
http://bugs.debian.org/280941
* freeradius-dialupadmin Suggests php4-mysql | php4-pgsql
   Closes: #279419
* Added a two-second pause to restart in init.d script
   Closes: #262635
* FreeRADIUS module packages now depend on the same source
  version of the main FreeRADIUS package.
   Closes: #284353
* FreeRADIUS-dialupadmin's default paths in admin.conf are
  now correct.
   Closes: #280942
* FreeRADIUS-dialupadmin's help.php3 can now find README.
   Closes: #280941
* Fixes stolen from 1.0.2 CVS:
  - Bug fix to make udpfromto code work
  - radrelay shouldn't dump core if it can't read a VP from the
    detail file.
  - Only initialize the random pool once.
  - In rlm_sql, don't escape characters twice.
  - In rlm_ldap, only claim Auth-Type if a plain text password is present.
  - Locking fixes in threading code
  - Fix building on gcc-4.0 by not trying to access static auth_port from
    other files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dialup_admin/lib/ldap/defaults.php3
27
27
                }
28
28
                if ($regular_profile_attr != ''){
29
29
                        $get_attrs = array("$regular_profile_attr");
 
30
                        if ($config[ldap_filter] != '')
 
31
                                $filter = ldap_xlat($config[ldap_filter],$login,$config);
 
32
                        else
 
33
                                $filter = 'uid=' . $login;
30
34
                        if ($config[ldap_debug] == 'true')
31
 
                                print "<b>DEBUG(LDAP): Search Query: BASE='$config[ldap_base]',FILTER='uid=$login'</b><br>\n";
32
 
                        $sr=@ldap_search($ds,"$config[ldap_base]","uid=" . $login,$get_attrs);
 
35
                                print "<b>DEBUG(LDAP): Search Query: BASE='$config[ldap_base]',FILTER='$filter'</b><br>\n";
 
36
                        $sr=@ldap_search($ds,"$config[ldap_base]",$filter,$get_attrs);
33
37
                        if ($info = @ldap_get_entries($ds,$sr)){
34
38
                                for($i=0;$i<$info[0][$regular_profile_attr]["count"];$i++){
35
39
                                        $dn2 = $info[0][$regular_profile_attr][$i];