Netscape has changed the way its internal LDAP is set up.

This commit is contained in:
terry%netscape.com 1999-01-08 00:27:15 +00:00
parent 231a7f5d7a
commit 27a0958f79
3 changed files with 27 additions and 5 deletions

View File

@ -28,7 +28,7 @@ set cocommand /tools/ns/bin/co
set lxr_base http://cvs-mirror.mozilla.org/webtools/lxr/source
set mozilla_lxr_kludge TRUE
set ldapserver directory.mcom.com
set ldapserver nsdirectory.mcom.com
# set ldapserver hoth.mcom.com
set ldapport 389
@ -45,6 +45,27 @@ if {![info exists env(TZ)] || [cequal $env(TZ) ""]} {
set BUGSYSTEMEXPR {<A HREF="http://scopus/bugsplat/show_bug.cgi?id=&">&</A>}
set treeid {default}
if {[info exists tcl_version] && $tcl_version >= 8.0} {
# The below tclX functions moved into the main TCL codebase in version 8,
# but their names changed. So, we cope. Note that these conversion
# routines only cover Bonsai's current use of these routines, not all
# possible uses.
proc getclock {} {
return [clock seconds]
}
proc convertclock {str args} {
if {[lindex $args 0] == "GMT"} {
return [clock scan $str -gmt 1]
}
return [clock scan $str]
}
proc fmtclock {date args} {
}
}
proc NOTDEF {foo} {
}
@ -442,7 +463,7 @@ proc GenerateProfileHTML {name} {
set value($n) ""
}
if {[catch {set fid [open "|./data/ldapsearch -b \"o=Netscape Communications Corp.,c=US\" -h $ldapserver -p $ldapport -s sub \"(mail=$name@netscape.com)\" $namelist" r]} errinfo]} {
if {[catch {set fid [open "|./data/ldapsearch -b \"dc=netscape,dc=com\" -h $ldapserver -p $ldapport -s sub \"(mail=$name@netscape.com)\" $namelist" r]} errinfo]} {
return "<B>Error -- Couldn't contact the directory server.</B><PRE>$errinfo</PRE>"
}

View File

@ -38,7 +38,7 @@ you'd like to see.
}
set fid [open "|./data/ldapsearch -b \"o=Netscape Communications Corp.,c=US\" -h $ldapserver -p $ldapport -s sub \"(mail=$FORM(person)@netscape.com)\" cn" r]
set fid [open "|./data/ldapsearch -b \"dc=netscape,dc=com\" -h $ldapserver -p $ldapport -s sub \"(mail=$FORM(person)@netscape.com)\" cn" r]
while {[gets $fid line] >= 0} {
if {[regexp -- {^cn: (.*)$} $line foo n]} {
@ -72,7 +72,7 @@ you'd like to see.
puts "Content-type: text/html
Refresh: 0; URL=http://phonebook/cgi-bin/expand-entry.pl?fullname=[url_quote "$fullname,o=Netscape Communications Corp.,c=US"]
Refresh: 0; URL=http://phonebook/cgi-bin/expand-entry.pl?fullname=[url_quote "$fullname,dc=netscape,dc=com"]
<HTML>
<TITLE>What a hack.</TITLE>

View File

@ -147,7 +147,8 @@ proc GetInfoForPeople {peoplelist} {
if {[cequal $ldapserver ""]} {
return
}
if {[catch {set fid [open "|./data/ldapsearch -b \"o=Netscape Communications Corp.,c=US\" -h $ldapserver -p $ldapport -s sub -S mail \"$query\" mail cn nscpcurcontactinfo" r]} errvar]} {
puts "Contacting ldap server $ldapserver <br>"
if {[catch {set fid [open "|./data/ldapsearch -b \"dc=netscape,dc=com\" -h $ldapserver -p $ldapport -s sub -S mail \"$query\" mail cn nscpcurcontactinfo" r]} errvar]} {
set ldaperror 1
} else {
set doingcontactinfo 0