Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixes for build process on "broken" installation, where NSPR libraries

Browse Source 
are missing even when prldap libraries are available.
* Changed all invocations of new to use the class method.


git-svn-id: svn://10.0.0.236/branches/devel-branch-1_4_2@167287 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
leif%ogre.com
2005-01-05 03:08:13 +00:00
parent 513936e473
commit 1a296183db
21 changed files with 77 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/directory/perldap/ChangeLog
View File

@@ -1,3 +1,16 @@
2005-01-04 Leif Hedstrom <leif@ogre.com>
* LDIF.pm: Changed all calls to new to use the class method directly.
* Utils.pm: Changed all calls to new to use the class method directly.
* Entry.pm: Changed all calls to new to use the class method directly.
* Conn.pm: Changed all calls to new to use the class method directly.
* Makefile.PL: Fixes for missing NSPR libraries, even though the prldap
libraries are available...
2004-12-28 Leif Hedstrom <leif@ogre.com>
* Conn.pm (new): Added the entryclass argument.

16
mozilla/directory/perldap/Conn.pm
View File

@@ -1,5 +1,5 @@
#############################################################################
# $Id: Conn.pm,v 1.24.2.9 2004-12-28 23:33:11 leif%ogre.com Exp $
# $Id: Conn.pm,v 1.24.2.10 2005-01-05 03:08:12 leif%ogre.com Exp $
#
# The contents of this file are subject to the Mozilla Public License
# Version 1.1 (the "License"); you may not use this file except in
@@ -185,7 +185,7 @@ sub newEntry
if (ref $self) {
$entry = $self->{"entryclass"}->new();
} else {
$entry = new Mozilla::LDAP::Entry;
$entry = Mozilla::LDAP::Entry->new();
}
$entry->setDN($dn) if (defined($dn) && $dn ne "");
@@ -1086,7 +1086,7 @@ Before you can do anything with PerLDAP, you'll need to instantiate at
least one Mozilla::LDAP::Conn object, and connect it to an LDAP server. As
you probably guessed already, this is done with the B<new> method:
$conn = new Mozilla::LDAP::Conn("ldap", "389", $bind, $pswd, $cert, $ver);
$conn = Mozilla::LDAP::Conn->new("ldap", "389", $bind, $pswd, $cert, $ver);
die "Couldn't connect to LDAP server ldap" unless $conn;
The arguments are: Host name, port number, and optionally a bind-DN, it's
@@ -1102,7 +1102,7 @@ providing each individual argument, you can provide one hash array
(actually, a pointer to a hash). For example:
%ld = Mozilla::LDAP::Utils::ldapArgs();
$conn = new Mozilla::LDAP::Conn(\%ld);
$conn = Mozilla::LDAP::Conn->new(\%ld);
The components of the hash are:
@@ -1174,7 +1174,7 @@ requires indexes to perform reasonably well.
Ok, now we are prepared to actually do a real search on the LDAP server:
$base = "o=netscape.com";
$conn = new Mozilla::LDAP::Conn("ldap", "389", "", ""); die "No LDAP
$conn = Mozilla::LDAP::Conn->new("ldap", "389", "", ""); die "No LDAP
connection" unless $conn;
$entry = $conn->search($base, "subtree", "(uid=leif)");
@@ -1261,7 +1261,7 @@ new entry, the first thing to set it it's DN, like
alternatively you can still use the B<new> method on the Entry class, like
$entry = new Mozilla::LDAP::Entry;
$entry = Mozilla::LDAP::Entry->new();
You should not do this for an existing LDAP entry, changing the RDN (or
DN) for such an entry must be done with B<modifyRDN>. To populate (or
@@ -1397,7 +1397,7 @@ authentication method (i.e. with a password).
A typical usage could be something like
%ld = Mozilla::LDAP::Utils::ldapArgs();
$conn = new Mozilla::LDAP::Conn(\%ld);
$conn = Mozilla::LDAP::Conn->new(\%ld);
Also, remember that if you use SSL, the port is (usually) 636.
@@ -1459,7 +1459,7 @@ example:
$user = "leif";
$password = "secret";
$conn = new Mozilla::LDAP::Conn($host, $port); # Anonymous bind
$conn = Mozilla::LDAP::Conn->new($host, $port); # Anonymous bind
die "Could't connect to LDAP server $host" unless $conn;
$entry = $conn->search($base, $scope, "(uid=$user)", 0, (uid));

4
mozilla/directory/perldap/Entry.pm
View File

@@ -1,5 +1,5 @@
#############################################################################
# $Id: Entry.pm,v 1.13.2.5 2004-11-02 18:22:15 leif%ogre.com Exp $
# $Id: Entry.pm,v 1.13.2.6 2005-01-05 03:08:12 leif%ogre.com Exp $
#
# The contents of this file are subject to the Mozilla Public License
# Version 1.1 (the "License"); you may not use this file except in
@@ -1069,7 +1069,7 @@ directly. Failing to do so may actually break the functionality.
To create a completely new entry, use the B<new> method, for instance
$entry = new Mozilla::LDAP::Entry()
$entry = Mozilla::LDAP::Entry->new()
$entry->setDN("uid=leif,ou=people,dc=netscape,dc=com");
$entry->{objectclass} = [ "top", "person", "inetOrgPerson" ];
$entry->addValue("cn", "Leif Hedstrom");

14
mozilla/directory/perldap/LDIF.pm
View File

@@ -1,5 +1,5 @@
#############################################################################
# $Id: LDIF.pm,v 1.8.2.1 2003-10-15 19:14:51 leif%ogre.com Exp $
# $Id: LDIF.pm,v 1.8.2.2 2005-01-05 03:08:12 leif%ogre.com Exp $
#
#
# The contents of this file are subject to the Netscape Public
@@ -775,14 +775,14 @@ Mozilla::LDAP::LDIF - read or write LDIF (LDAP Data Interchange Format)
sort_attributes references enlist_values delist_values
read_v1 read_v0 read_file_URL_or_name);
$ldif = new Mozilla::LDAP::LDIF (*FILEHANDLE, \&read_reference, $comments);
$ldif = Mozilla::LDAP::LDIF->new(*FILEHANDLE, \&read_reference, $comments);
@record = get $ldif;
@records = get $ldif ($maximum_number);
$entry = set_Entry (\entry, \@record);
$entry = readOneEntry $ldif;
@entries = readEntries $ldif ($maximum_number);
$ldif = new Mozilla::LDAP::LDIF (*FILEHANDLE, $options);
$ldif = Mozilla::LDAP::LDIF->new(*FILEHANDLE, $options);
$success = put $ldif (@record);
$success = put $ldif (\@record, \object ...);
$success = writeOneEntry $ldif (\entry);
@@ -990,7 +990,7 @@ Return false if the file can't be read.
=over 4
=item B<new> Mozilla::LDAP::LDIF (*FILEHANDLE, $options)
=item Mozilla::LDAP::LDIF->B<new>(*FILEHANDLE, $options)
Create and return an object used to write LDIF to the given file.
$options are described below.
@@ -1222,14 +1222,14 @@ to pass it only a single record.
use Mozilla::LDAP::LDIF qw(read_file_URL_or_name);
$in = new Mozilla::LDAP::LDIF (*STDIN, \&read_file_URL_or_name);
$out = new Mozilla::LDAP::LDIF (*STDOUT, 78);
$in = Mozilla::LDAP::LDIF->new(*STDIN, \&read_file_URL_or_name);
$out = Mozilla::LDAP::LDIF->new(*STDOUT, 78);
@records = get $in (undef); # read to end of file (^D)
put $out (@records);
use Mozilla::LDAP::Conn();
$conn = new Mozilla::LDAP::Conn (...);
$conn = Mozilla::LDAP::Conn->new(...);
while ($entry = readOneEntry $in) {
add $conn ($entry);
}

10
mozilla/directory/perldap/Makefile.PL
View File

@@ -1,5 +1,5 @@
#############################################################################
# $Id: Makefile.PL,v 1.16.2.4 2004-12-17 02:22:15 leif%ogre.com Exp $
# $Id: Makefile.PL,v 1.16.2.5 2005-01-05 03:08:12 leif%ogre.com Exp $
#
# The contents of this file are subject to the Mozilla Public License
# Version 1.1 (the "License"); you may not use this file except in
@@ -120,8 +120,12 @@ if ($#nsprlib >= 0)
print "$ldapsdk_pr\n";
}
}
$pr_def = "-DPRLDAP" if ($ldapsdk_pr =~ /^y/i);
@nsprlib = () unless ($ldapsdk_pr =~ /^y/i);
if ($ldapsdk_pr =~ /^y/i) {
$pr_def = "-DPRLDAP"
} else {
@nsprlib = ();
@prldaplib = ();
}
if ($#ldaplib < 0)
{

4
mozilla/directory/perldap/Utils.pm
View File

@@ -1,5 +1,5 @@
#############################################################################
# $Id: Utils.pm,v 1.14.2.2 2004-10-14 02:05:42 leif%ogre.com Exp $
# $Id: Utils.pm,v 1.14.2.3 2005-01-05 03:08:12 leif%ogre.com Exp $
#
# The contents of this file are subject to the Mozilla Public License
# Version 1.1 (the "License"); you may not use this file except in
@@ -287,7 +287,7 @@ sub userCredentials
{
my ($base) = $ld->{"base"} || $ld->{"root"};
$conn = new Mozilla::LDAP::Conn($ld);
$conn = Mozilla::LDAP::Conn->new($ld);
die "Could't connect to LDAP server " . $ld->{"host"} unless $conn;
$search = "(&(objectclass=inetOrgPerson)(uid=$ENV{USER}))";

5
mozilla/directory/perldap/examples/ChangeLog
View File

@@ -1,3 +1,8 @@
2005-01-04 Leif Hedstrom <leif@ogre.com>
* All examples: Changed all calls to new to use the class method
directly.
2004-10-13 Leif Hedstrom <leif@ogre.com>
* modattr.pl: Added a -i option, for case insentive "adds" to an

4
mozilla/directory/perldap/examples/changes2ldif.pl
View File

@@ -1,6 +1,6 @@
#!/usr/bin/perl5
#############################################################################
# $Id: changes2ldif.pl,v 1.3.2.2 2004-10-14 02:05:43 leif%ogre.com Exp $
# $Id: changes2ldif.pl,v 1.3.2.3 2005-01-05 03:08:12 leif%ogre.com Exp $
#
# The contents of this file are subject to the Mozilla Public License
# Version 1.1 (the "License"); you may not use this file except in
@@ -58,7 +58,7 @@ $ld{root} = "cn=changelog" if (!defined($ld{root}) || $ld{root} eq "");
#################################################################################
# Instantiate an LDAP object, which also binds to the LDAP server.
#
$conn = new Mozilla::LDAP::Conn(\%ld);
$conn = Mozilla::LDAP::Conn->new(\%ld);
die "Could't connect to LDAP server $ld{host}" unless $conn;

4
mozilla/directory/perldap/examples/ldappasswd.pl
View File

@@ -1,6 +1,6 @@
#!/usr/bin/perl5
#############################################################################
# $Id: ldappasswd.pl,v 1.7.2.2 2004-10-14 02:05:43 leif%ogre.com Exp $
# $Id: ldappasswd.pl,v 1.7.2.3 2005-01-05 03:08:12 leif%ogre.com Exp $
#
# The contents of this file are subject to the Mozilla Public License
# Version 1.1 (the "License"); you may not use this file except in
@@ -74,7 +74,7 @@ $crypted = Mozilla::LDAP::Utils::unixCrypt("$new");
# Now do all the searches, one by one. If there are no search criteria, we
# will change the password for the user running the script.
#
$conn = new Mozilla::LDAP::Conn(\%ld);
$conn = Mozilla::LDAP::Conn->new(\%ld);
die "Could't connect to LDAP server $ld{host}" unless $conn;
foreach $search ($#ARGV >= $[ ? @ARGV : $ld{bind})

4
mozilla/directory/perldap/examples/lfinger.pl
View File

@@ -1,6 +1,6 @@
#!/usr/bin/perl5
#############################################################################
# $Id: lfinger.pl,v 1.11.2.2 2004-10-14 02:05:43 leif%ogre.com Exp $
# $Id: lfinger.pl,v 1.11.2.3 2005-01-05 03:08:12 leif%ogre.com Exp $
#
# The contents of this file are subject to the Mozilla Public License
# Version 1.1 (the "License"); you may not use this file except in
@@ -98,7 +98,7 @@ $user=$ARGV[$[];
#############################################################################
# Instantiate an LDAP object, which also binds to the LDAP server.
#
$conn = new Mozilla::LDAP::Conn(\%ld);
$conn = Mozilla::LDAP::Conn->new(\%ld);
die "Could't connect to LDAP server $ld{host}" unless $conn;

4
mozilla/directory/perldap/examples/modattr.pl
View File

@@ -1,6 +1,6 @@
#!/usr/bin/perl5
#############################################################################
# $Id: modattr.pl,v 1.9.2.2 2004-10-14 02:05:43 leif%ogre.com Exp $
# $Id: modattr.pl,v 1.9.2.3 2005-01-05 03:08:12 leif%ogre.com Exp $
#
# The contents of this file are subject to the Mozilla Public License
# Version 1.1 (the "License"); you may not use this file except in
@@ -61,7 +61,7 @@ $nocase = (defined($opt_i) && $opt_i) ? 1 : 0;
# Let's process the changes requested, and commit them unless the "-n"
# option was given.
#
$conn = new Mozilla::LDAP::Conn(\%ld);
$conn = Mozilla::LDAP::Conn->new(\%ld);
die "Could't connect to LDAP server $ld{host}" unless $conn;
$conn->setDefaultRebindProc($ld{bind}, $ld{pswd});

4
mozilla/directory/perldap/examples/monitor.pl
View File

@@ -1,6 +1,6 @@
#!/usr/bin/perl5
#############################################################################
# $Id: monitor.pl,v 1.3.2.2 2004-10-14 02:05:43 leif%ogre.com Exp $
# $Id: monitor.pl,v 1.3.2.3 2005-01-05 03:08:12 leif%ogre.com Exp $
#
# The contents of this file are subject to the Mozilla Public License
# Version 1.1 (the "License"); you may not use this file except in
@@ -55,7 +55,7 @@ if (!getopts('b:h:D:p:w:P:V:'))
# Instantiate an LDAP object, which also binds to the LDAP server, and then
# do the simple search.
#
$conn = new Mozilla::LDAP::Conn(\%ld);
$conn = Mozilla::LDAP::Conn->new(\%ld);
die "Could't connect to LDAP server $ld{host}" unless $conn;
$entry = $conn->search($ld{root}, "base", "objectclass=*");

8
mozilla/directory/perldap/examples/psoftsync.pl
View File

@@ -1,6 +1,6 @@
#!/usr/bin/perl5
#############################################################################
# $Id: psoftsync.pl,v 1.6.2.2 2004-10-14 02:05:43 leif%ogre.com Exp $
# $Id: psoftsync.pl,v 1.6.2.3 2005-01-05 03:08:12 leif%ogre.com Exp $
#
# The contents of this file are subject to the Mozilla Public License
# Version 1.1 (the "License"); you may not use this file except in
@@ -165,7 +165,7 @@ sub readDump
next unless /$DELIMITER/;
@info = split(/\s*%%\s*/);
$entry = new PsoftEntry($info[$[]);
$entry = PsoftEntry->new($info[$[]);
foreach $attr (@ORDER)
{
$val = shift(@info);
@@ -243,7 +243,7 @@ if (!getopts('nvMWb:h:D:p:s:w:P:V:'))
%ld = Mozilla::LDAP::Utils::ldapArgs();
Mozilla::LDAP::Utils::userCredentials(\%ld) unless $opt_n;
$out = new Mail();
$out = Mail->new();
if ($opt_M)
{
$out->set("to", $MAILTO);
@@ -261,7 +261,7 @@ else
# which also binds to the LDAP server.
#
%psoft = readDump(@ARGV[$[]);
$conn = new Mozilla::LDAP::Conn(\%ld);
$conn = Mozilla::LDAP::Conn->new(\%ld);
die "Could't connect to LDAP server $ld{host}" unless $conn;

4
mozilla/directory/perldap/examples/qsearch.pl
View File

@@ -1,6 +1,6 @@
#!/usr/bin/perl5
#############################################################################
# $Id: qsearch.pl,v 1.9.2.3 2004-10-14 22:20:45 leif%ogre.com Exp $
# $Id: qsearch.pl,v 1.9.2.4 2005-01-05 03:08:12 leif%ogre.com Exp $
#
# The contents of this file are subject to the Mozilla Public License
# Version 1.1 (the "License"); you may not use this file except in
@@ -56,7 +56,7 @@ if (!getopts('b:h:D:p:s:w:P:V:'))
#################################################################################
# Now do all the searches, one by one.
#
$conn = new Mozilla::LDAP::Conn(\%ld);
$conn = Mozilla::LDAP::Conn->new(\%ld);
die "Could't connect to LDAP server $ld{host}" unless $conn;
foreach (@ARGV)

4
mozilla/directory/perldap/examples/rand_mods.pl
View File

@@ -1,6 +1,6 @@
#!/usr/bin/perl5
#################################################################################
# $Id: rand_mods.pl,v 1.3.2.2 2004-10-14 02:05:43 leif%ogre.com Exp $
# $Id: rand_mods.pl,v 1.3.2.3 2005-01-05 03:08:12 leif%ogre.com Exp $
#
# The contents of this file are subject to the Netscape Public
# License Version 1.1 (the "License"); you may not use this file
@@ -73,7 +73,7 @@ if (!getopts('b:h:D:p:s:w:P:'))
exit;
}
%ld = Mozilla::LDAP::Utils::ldapArgs();
$conn = new Mozilla::LDAP::Conn(\%ld);
$conn = Mozilla::LDAP::Conn->new(\%ld);
croak "Could't connect to LDAP server $ld{host}" unless $conn;

4
mozilla/directory/perldap/examples/rename.pl
View File

@@ -1,6 +1,6 @@
#!/usr/bin/perl5
#############################################################################
# $Id: rename.pl,v 1.5.2.2 2004-10-14 02:05:43 leif%ogre.com Exp $
# $Id: rename.pl,v 1.5.2.3 2005-01-05 03:08:12 leif%ogre.com Exp $
#
# The contents of this file are subject to the Mozilla Public License
# Version 1.1 (the "License"); you may not use this file except in
@@ -62,7 +62,7 @@ if (($search eq "") || ($rdn eq ""))
#############################################################################
# Instantiate an LDAP object, which also binds to the LDAP server.
#
$conn = new Mozilla::LDAP::Conn(\%ld);
$conn = Mozilla::LDAP::Conn->new(\%ld);
die "Could't connect to LDAP server $ld{host}" unless $conn;
$key = "Y" if $opt_I;

4
mozilla/directory/perldap/examples/rmentry.pl
View File

@@ -1,6 +1,6 @@
#!/usr/bin/perl5
#############################################################################
# $Id: rmentry.pl,v 1.6.2.2 2004-10-14 02:05:43 leif%ogre.com Exp $
# $Id: rmentry.pl,v 1.6.2.3 2005-01-05 03:08:12 leif%ogre.com Exp $
#
# The contents of this file are subject to the Mozilla Public License
# Version 1.1 (the "License"); you may not use this file except in
@@ -59,7 +59,7 @@ Mozilla::LDAP::Utils::userCredentials(\%ld) unless $opt_n;
#################################################################################
# Do the search, and process all the entries.
#
$conn = new Mozilla::LDAP::Conn(\%ld);
$conn = Mozilla::LDAP::Conn->new(\%ld);
die "Could't connect to LDAP server $ld{host}" unless $conn;
$key = "Y" if $opt_I;

4
mozilla/directory/perldap/examples/tabdump.pl
View File

@@ -1,6 +1,6 @@
#!/usr/bin/perl5
#############################################################################
# $Id: tabdump.pl,v 1.4.2.2 2004-10-14 02:05:43 leif%ogre.com Exp $
# $Id: tabdump.pl,v 1.4.2.3 2005-01-05 03:08:12 leif%ogre.com Exp $
#
# The contents of this file are subject to the Mozilla Public License
# Version 1.1 (the "License"); you may not use this file except in
@@ -60,7 +60,7 @@ die "Need to specify a list of attributes and the search filter.\n"
#################################################################################
# Do the searches, and produce the output.
#
$conn = new Mozilla::LDAP::Conn(\%ld);
$conn = Mozilla::LDAP::Conn->new(\%ld);
die "Could't connect to LDAP server $ld{host}" unless $conn;
@attr = split(/,/, $attributes);

6
mozilla/directory/perldap/t/ChangeLog
View File

@@ -1,3 +1,9 @@
2005-01-04 Leif Hedstrom <leif@ogre.com>
* entry.pl: Changed all calls to new to use the class method directly.
* conn.pl: Changed all calls to new to use the class method directly.
1999-08-06 Leif Hedstrom <leif@netscape.com>
* conn.pl: Added support for browse() and compare().

BIN
mozilla/directory/perldap/t/conn.pl
View File

Binary file not shown.

6
mozilla/directory/perldap/t/entry.pl
View File

@@ -1,6 +1,6 @@
#!/usr/bin/perl5
#############################################################################
# $Id: entry.pl,v 1.3.2.2 2004-10-19 05:53:42 leif%ogre.com Exp $
# $Id: entry.pl,v 1.3.2.3 2005-01-05 03:08:13 leif%ogre.com Exp $
#
# The contents of this file are subject to the Mozilla Public License
# Version 1.1 (the "License"); you may not use this file except in
@@ -72,7 +72,7 @@ sub getConn
{
if (!defined($main::mainConn))
{
$main::mainConn = new Mozilla::LDAP::Conn(\%main::ld);
$main::mainConn = Mozilla::LDAP::Conn->new(\%main::ld);
die "Could't connect to LDAP server $main::ld{host}"
unless $main::mainConn;
}
@@ -80,7 +80,7 @@ sub getConn
}
else
{
$conn = new Mozilla::LDAP::Conn(\%main::ld);
$conn = Mozilla::LDAP::Conn->new(\%main::ld);
die "Could't connect to LDAP server $main::ld{host}" unless $conn;
}