[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSMigration.pm.in, 1.6, 1.7
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4362
Modified Files:
DSMigration.pm.in
Log Message:
Resolves: #260341
Summary: Migration script references a non-existing directory (comment #5,#7)
Description: 3 more fixes for the with-fhs-opt case
Index: DSMigration.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSMigration.pm.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DSMigration.pm.in 29 Aug 2007 16:33:40 -0000 1.6
+++ DSMigration.pm.in 29 Aug 2007 23:10:22 -0000 1.7
@@ -128,12 +128,22 @@
return $oldval;
}
# otherwise, just use the new default locations
- if ($objclasses{nsbackendinstance}) {
- $newval = "@localstatedir@/lib/$mig->{pkgname}/$inst/db/$cn";
- } elsif (lc $cn eq 'config') {
- $newval = "@localstatedir@/lib/$mig->{pkgname}/$inst/db";
- } elsif (lc $cn eq 'changelog5') {
- $newval = "@localstatedir@/lib/$mig->{pkgname}/$inst/changelogdb";
+ if ("@with_fhs_opt@") {
+ if ($objclasses{nsbackendinstance}) {
+ $newval = "@localstatedir@/$mig->{pkgname}/$inst/db/$cn";
+ } elsif (lc $cn eq 'config') {
+ $newval = "@localstatedir@/$mig->{pkgname}/$inst/db";
+ } elsif (lc $cn eq 'changelog5') {
+ $newval = "@localstatedir@/$mig->{pkgname}/$inst/changelogdb";
+ }
+ } else {
+ if ($objclasses{nsbackendinstance}) {
+ $newval = "@localstatedir@/lib/$mig->{pkgname}/$inst/db/$cn";
+ } elsif (lc $cn eq 'config') {
+ $newval = "@localstatedir@/lib/$mig->{pkgname}/$inst/db";
+ } elsif (lc $cn eq 'changelog5') {
+ $newval = "@localstatedir@/lib/$mig->{pkgname}/$inst/changelogdb";
+ }
}
debug(2, "New value [$newval] for attr $attr in entry ", $ent->getDN(), "\n");
return $newval;
@@ -142,8 +152,8 @@
sub migrateCredentials {
my ($ent, $attr, $mig, $inst) = @_;
my $oldval = $ent->getValues($attr);
- debug(3, "Executing migratecred -o $mig->{actualsroot}/$inst -n @instconfigdir@/$inst -c $oldval . . .\n");
- my $newval = `migratecred -o $mig->{actualsroot}/$inst -n @instconfigdir@/$inst -c $oldval`;
+ debug(3, "Executing @bindir@/migratecred -o $mig->{actualsroot}/$inst -n @instconfigdir@/$inst -c $oldval . . .\n");
+ my $newval = `@bindir@/migratecred -o $mig->{actualsroot}/$inst -n @instconfigdir@/$inst -c $oldval`;
debug(3, "Converted old value [$oldval] to new value [$newval] for attr $attr in entry ", $ent->getDN(), "\n");
return $newval;
}
@@ -230,7 +240,13 @@
my $foundldif;
for (glob("$mig->{oldsroot}/$inst/db/*.ldif")) {
my $dbname = basename($_, '.ldif');
- my $cmd = "@serverdir@/$inst/ldif2db -n \"$dbname\" -i \"$_\"";
+ my $cmd = "";
+ if ("@with_fhs_opt@") {
+ $cmd = "/opt/@PACKAGE_NAME@/$inst/ldif2db -n \"$dbname\" -i \"$_\"";
+ } else {
+ $cmd = "@serverdir@/$inst/ldif2db -n \"$dbname\" -i \"$_\"";
+ }
+
debug(1, "migrateDatabases: executing command $cmd\n");
$? = 0; # clear error condition
my $output = `$cmd 2>&1`;
@@ -306,8 +322,14 @@
debug(1, "old instance $cn dbdir $dir\n");
my $srcdir = $dir || "$olddefault/db/$cn";
my $newent = $dest->search($ent->getDN(), "base", "(objectclass=*)");
- my $newdbdir = $newent->getValues('nsslapd-directory') ||
- "@localstatedir@/lib/$mig->{pkgname}/$inst/db/$cn";
+ my $newdbdir = "";
+ if ("@with_fhs_opt@") {
+ $newdbdir = $newent->getValues('nsslapd-directory') ||
+ "@localstatedir@/$mig->{pkgname}/$inst/db/$cn";
+ } else {
+ $newdbdir = $newent->getValues('nsslapd-directory') ||
+ "@localstatedir@/lib/$mig->{pkgname}/$inst/db/$cn";
+ }
if (-d $srcdir and ($srcdir !~ /^$olddefault/)) {
debug(2, "Not copying database indexes from [$srcdir]\n");
} else {
16 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSMigration.pm.in, 1.5, 1.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28030
Modified Files:
DSMigration.pm.in
Log Message:
Resolves: #260341
Summary: Migration script references a non-existing directory
Description: added an if clause for the with_fhs_opt case
Index: DSMigration.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSMigration.pm.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DSMigration.pm.in 15 Aug 2007 22:04:31 -0000 1.5
+++ DSMigration.pm.in 29 Aug 2007 16:33:40 -0000 1.6
@@ -262,8 +262,14 @@
my %objclasses = map { lc($_) => $_ } $ent->getValues('objectclass');
if ($cn eq 'config') { # global config
my $newent = $dest->search($ent->getDN(), "base", "(objectclass=*)");
- my $newdbdir = $newent->getValues('nsslapd-directory') ||
- "@localstatedir@/lib/$mig->{pkgname}/$inst/db";
+ my $newdbdir = "";
+ if ("@with_fhs_opt@") {
+ $newdbdir = $newent->getValues('nsslapd-directory') ||
+ "@localstatedir@/$mig->{pkgname}/$inst/db";
+ } else {
+ $newdbdir = $newent->getValues('nsslapd-directory') ||
+ "@localstatedir@/lib/$mig->{pkgname}/$inst/db";
+ }
debug(1, "Found ldbm database plugin config entry ", $ent->getDN(), "\n");
my $dir = $ent->getValues('nsslapd-directory');
my $homedir = $ent->getValues('nsslapd-db-home-directory');
16 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication windows_protocol_util.c, 1.28, 1.29 windowsrepl.h, 1.10, 1.11
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10633
Modified Files:
windows_protocol_util.c windowsrepl.h
Log Message:
Resolves: 207893
Summary: Check if passwords are already hashed before sync'ing with AD.
Index: windows_protocol_util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_protocol_util.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- windows_protocol_util.c 23 Aug 2007 20:50:56 -0000 1.28
+++ windows_protocol_util.c 27 Aug 2007 17:16:48 -0000 1.29
@@ -1375,7 +1375,37 @@
slapi_valueset_first_value(vs,&value);
password_value = slapi_value_get_string(value);
- *password = slapi_ch_strdup(password_value);
+ /* We need to check if the first character of password_value is an
+ * opening brace since strstr will simply return it's first argument
+ * if it is an empty string. */
+ if (password_value && (*password_value == '{')) {
+ if (strchr( password_value, '}' )) {
+ /* A storage scheme is present. Check if it's the
+ * clear storage scheme. */
+ if ((strlen(password_value) >= PASSWD_CLEAR_PREFIX_LEN + 1) &&
+ (strncasecmp(password_value, PASSWD_CLEAR_PREFIX, PASSWD_CLEAR_PREFIX_LEN) == 0)) {
+ /* This password is in clear text. Strip off the clear prefix
+ * and sync it. */
+ *password = slapi_ch_strdup(password_value + PASSWD_CLEAR_PREFIX_LEN);
+ } else {
+ /* This password is stored in a non-cleartext format.
+ * We can only sync cleartext passwords. */
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
+ "%s: windows_create_remote_entry: "
+ "Password is already hashed. Not syncing.\n",
+ agmt_get_long_name(prp->agmt));
+ }
+ } else {
+ /* This password doesn't have a storage prefix but
+ * just happens to start with the '{' character. We'll
+ * assume that it's just a cleartext password without
+ * the proper storage prefix. */
+ *password = slapi_ch_strdup(password_value);
+ }
+ } else {
+ /* This password has no storage prefix, or the password is empty */
+ *password = slapi_ch_strdup(password_value);
+ }
}
}
@@ -1554,7 +1584,37 @@
{
char *password_value = NULL;
password_value = mod->mod_bvalues[0]->bv_val;
- *password = slapi_ch_strdup(password_value);
+ /* We need to check if the first character of password_value is an
+ * opening brace since strstr will simply return it's first argument
+ * if it is an empty string. */
+ if (password_value && (*password_value == '{')) {
+ if (strchr( password_value, '}' )) {
+ /* A storage scheme is present. Check if it's the
+ * clear storage scheme. */
+ if ((strlen(password_value) >= PASSWD_CLEAR_PREFIX_LEN + 1) &&
+ (strncasecmp(password_value, PASSWD_CLEAR_PREFIX, PASSWD_CLEAR_PREFIX_LEN) == 0)) {
+ /* This password is in clear text. Strip off the clear prefix
+ * and sync it. */
+ *password = slapi_ch_strdup(password_value + PASSWD_CLEAR_PREFIX_LEN);
+ } else {
+ /* This password is stored in a non-cleartext format.
+ * We can only sync cleartext passwords. */
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
+ "%s: windows_create_remote_entry: "
+ "Password is already hashed. Not syncing.\n",
+ agmt_get_long_name(prp->agmt));
+ }
+ } else {
+ /* This password doesn't have a storage prefix but
+ * just happens to start with the '{' character. We'll
+ * assume that it's just a cleartext password without
+ * the proper storage prefix. */
+ *password = slapi_ch_strdup(password_value);
+ }
+ } else {
+ /* This password has no storage prefix, or the password is empty */
+ *password = slapi_ch_strdup(password_value);
+ }
}
}
}
Index: windowsrepl.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windowsrepl.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- windowsrepl.h 23 Aug 2007 20:50:56 -0000 1.10
+++ windowsrepl.h 27 Aug 2007 17:16:48 -0000 1.11
@@ -99,4 +99,6 @@
#define FAKE_STREET_ATTR_NAME "in#place#of#streetaddress"
/* Used to work around contrained attribute legth for initials on AD */
#define AD_INITIALS_LENGTH 6
-
+/* Used to check for pre-hashed passwords when syncing */
+#define PASSWD_CLEAR_PREFIX "{clear}"
+#define PASSWD_CLEAR_PREFIX_LEN 7
16 years, 7 months
[Fedora-directory-commits] adminserver/admserv/newinst/src AdminUtil.pm.in, 1.13, 1.14 RegDSDialogs.pm, 1.1, 1.2 register-ds-admin.pl.in, 1.3, 1.4 register-ds-admin.res.in, 1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24382
Modified Files:
AdminUtil.pm.in RegDSDialogs.pm register-ds-admin.pl.in
register-ds-admin.res.in
Log Message:
Resolves: #253811
Summary: RFE: registration tool (register-ds-admin.pl)
Fixed problems
1. if ldap servers are installed at the non-standard location using .inf file
(as quickinstall does), register-ds-admin.pl could not find them.
2. provided a method to select ldap servers not to register to the
Configuration Directory Server.
Index: AdminUtil.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminUtil.pm.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AdminUtil.pm.in 7 Aug 2007 23:30:02 -0000 1.13
+++ AdminUtil.pm.in 23 Aug 2007 23:51:24 -0000 1.14
@@ -23,11 +23,13 @@
updateAdmConf updateAdmpw updateLocalConf importCACert
getLocalConfigDS getPset registerDSWithConfigDS
registerManyDSWithConfigDS createSubDSNoConn
+ registerScatteredDSWithConfigDS
unregisterDSWithConfigDS isConfigDS);
@EXPORT_OK = qw(getAdmConf getConfigDSConn createConfigDS createSubDS
updateAdmConf updateAdmpw updateLocalConf importCACert
getLocalConfigDS getPset registerDSWithConfigDS
registerManyDSWithConfigDS createSubDSNoConn
+ registerScatteredDSWithConfigDS
unregisterDSWithConfigDS isConfigDS);
# load perldap
@@ -329,7 +331,7 @@
$inf->{General}->{certdir});
if (!$conn) {
@{$errs} = ('error_connection_failed');
- return 1;
+ return 0;
}
return internalCreateSubDS($conn, $inf, $errs);
@@ -629,6 +631,47 @@
return 1
}
+sub registerScatteredDSWithConfigDS {
+ my $inf = shift;
+ my $errs = shift;
+ my $instances_ref = shift;
+ my @configdirs = keys %{$instances_ref};
+ my $configdir = $configdirs[0]; # use the first configdir for admin-serv
+
+ if ( ! $instances_ref ) {
+ return 1; # no instances to register - just return ok
+ }
+
+ # open a connection to the configuration directory server
+ my $conn = getConfigDSConn($inf->{General}->{ConfigDirectoryLdapURL},
+ $inf->{General}->{ConfigDirectoryAdminID},
+ $inf->{General}->{ConfigDirectoryAdminPwd},
+ "$configdir/admin-serv", $errs);
+
+ if (!$conn or @{$errs}) {
+ return 0;
+ }
+
+ my $admConf = getAdmConf("$configdir/admin-serv");
+
+ for $configdir ( @configdirs ) {
+ foreach my $dsinst ( @{$instances_ref->{$configdir}} ) {
+ my $instinf = createInfFromConfig("$configdir/$dsinst", $dsinst);
+ unlink($instinf->{filename});
+ $instinf->{General}->{ConfigDirectoryLdapURL} =
+ $inf->{General}->{ConfigDirectoryLdapURL};
+ $instinf->{General}->{AdminDomain} = $inf->{General}->{AdminDomain};
+ if (!registerDSWithConfigDS($dsinst, $errs, $instinf,
+ $conn, $admConf, $configdir)) {
+ return 0;
+ }
+ }
+ }
+
+ $conn->close();
+
+ return 1
+}
sub registerDSWithConfigDS {
my $servid = shift;
Index: RegDSDialogs.pm
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/RegDSDialogs.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegDSDialogs.pm 27 Jul 2007 01:42:46 -0000 1.1
+++ RegDSDialogs.pm 23 Aug 2007 23:51:24 -0000 1.2
@@ -58,16 +58,21 @@
my $ans = shift;
my $index = shift;
my $res = $DialogManager::SAME;
- $self->{manager}->setType($TYPICAL);
+ my %instances = %{$self->{manager}->{inf}->{slapd}->{Instances}};
+ $self->{manager}->setType($TYPICAL);
if ($index == 0) {
# validate serverIdentifier?
- foreach my $inst (@{$self->{manager}->{inf}->{slapd}->{Instances}})
+ foreach my $confdir ( keys %instances )
{
- if ( "$inst" eq "slapd-" . $ans )
+ foreach my $inst ( @{$instances{$confdir}} )
{
- $self->{manager}->{inf}->{slapd}->{ServerIdentifier} = $ans;
- $res = $DialogManager::NEXT;
- goto out;
+ if ( "$inst" eq "slapd-" . $ans )
+ {
+ $self->{manager}->{inf}->{slapd}->{ServerIdentifier} = $ans;
+ $self->{manager}->{inf}->{slapd}->{config_dir} = $confdir;
+ $res = $DialogManager::NEXT;
+ goto out;
+ }
}
}
out:
Index: register-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register-ds-admin.pl.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- register-ds-admin.pl.in 7 Aug 2007 23:30:02 -0000 1.3
+++ register-ds-admin.pl.in 23 Aug 2007 23:51:24 -0000 1.4
@@ -39,6 +39,8 @@
use lib qw(@perlpath@);
+use strict;
+
use File::Basename;
use Net::Domain qw(hostfqdn);
@@ -58,10 +60,22 @@
{
my $setup = shift;
my $key = shift;
- my $value = shift;
+ my $value0 = shift;
+ my $value1 = shift;
print("\n==============================================================================\n");
- $setup->msg(0, $key, $value);
+ if ( $value1 )
+ {
+ $setup->msg(0, $key, $value0, $value1);
+ }
+ elsif ( $value0 )
+ {
+ $setup->msg(0, $key, $value0);
+ }
+ else
+ {
+ $setup->msg(0, $key);
+ }
system("stty -echo");
my $ans = <STDIN>;
system("stty echo");
@@ -70,6 +84,20 @@
return $ans;
}
+sub reg_get_response
+{
+ my $setup = shift;
+ my $key = shift;
+ my $value = shift;
+
+ print("\n==============================================================================\n");
+ $setup->msg(0, $key, $value);
+ my $ans = <STDIN>;
+ print "\n";
+ chop($ans);
+ return $ans;
+}
+
my $res = new Resource("@propertydir(a)/register-ds-admin.res",
"@propertydir(a)/setup-ds-admin.res",
"@propertydir(a)/setup-ds.res");
@@ -79,35 +107,130 @@
$setup->msg('begin_ds_registration');
# get existing instances
my $instconfigdir = $setup->{configdir};
-my @instances = ();
-for my $dir (glob("$setup->{configdir}/slapd-*")) {
- if (-d $dir) {
- push @instances, basename($dir);
+my %instances = ();
+for my $dir (glob("$setup->{configdir}/slapd-*"))
+{
+ if (-d $dir)
+ {
+ my $dname = dirname($dir);
+ my $bname = basename($dir);
+ push @{$instances{$dname}}, $bname;
+ }
+}
+
+# in case Directory Servers are installed at the unexpected location.
+my $done = 0;
+my $ans;
+while ( !$done && ($ans = reg_get_response($setup, 'subds_conf_prompt', "@instconfigdir@")) )
+{
+ if ( $ans eq "" || !$ans )
+ {
+ $done = 1;
+ }
+ elsif ( ! -d $ans )
+ {
+ ;
+ }
+ elsif ( basename($ans) =~ /^slapd-/ )
+ {
+ my $dname = dirname($ans);
+ my $bname = basename($ans);
+ if ( exists $instances{$dname} )
+ {
+ my $addit = 1;
+ foreach my $thisslapd ( @{$instances{$dname}} )
+ {
+ if ( $thisslapd eq $bname )
+ {
+ $addit = 0;
+ goto out0;
+ }
+ }
+out0:
+ if ( $addit )
+ {
+ push @{$instances{$dname}}, $bname;
+ }
+ }
+ else
+ {
+ push @{$instances{$dname}}, $bname;
+ }
+ }
+ else
+ {
+ $ans =~ s/^\s+//;
+ $ans =~ s/[\/\s]+$//;
+ my $rc = opendir(DIR, $ans);
+ if ( $rc )
+ {
+ my $file = "";
+ while ( defined($file = readdir(DIR)) )
+ {
+ next if ( !("$file" =~ /^slapd-/) );
+ if ( exists $instances{$ans} )
+ {
+ my $addit = 1;
+ foreach my $thisslapd ( @{$instances{$ans}} )
+ {
+ if ( $thisslapd eq $file )
+ {
+ $addit = 0;
+ goto out1;
+ }
+ }
+out1:
+ if ( $addit )
+ {
+ push @{$instances{$ans}}, $file;
+ }
+ }
+ else
+ {
+ push @{$instances{$ans}}, $file;
+ }
+ }
+ closedir(DIR);
+ }
}
}
-if ( $#instances < 0 )
+
+my @instconfigdirs = keys %instances;
+if ( $#instconfigdirs < 0 )
{
$setup->msg($FATAL, 'error_no_ds');
$setup->doExit(1);
}
+print("\n==============================================================================\n");
+$setup->msg('candidate_list_txt');
+foreach my $c ( @instconfigdirs )
+{
+ foreach my $i ( @{$instances{$c}} )
+ {
+ print " $c/$i\n";
+ }
+}
+
# see if there is already a configds
my $admConf = AdminUtil::getAdmConf("$instconfigdir/admin-serv");
my @admConfKeys = keys %$admConf;
my $orig_confdsid = "";
my $new_confdsid = "";
+my $new_confdir = "";
my $adminuid = "";
my @errs = ();
my $fqdn = hostfqdn();
# set defaults
-if ( $#admConfKeys >= 0 )
+if ( $#admConfKeys >= 4 ) # admserv.conf, console.conf, httpd.conf, nss.conf
{
# Admin Server is installed; that is Config DS exists, which may be
# replaced with a new one in the RegDSDialogs
$orig_confdsid = getLocalConfigDS("$instconfigdir/admin-serv");
$setup->{inf}->{slapd}->{ServerIdentifier} = $orig_confdsid;
- $setup->{inf}->{slapd}->{Instances} = \@instances;
+ $setup->{inf}->{slapd}->{config_dir} = $instconfigdir;
+ $setup->{inf}->{slapd}->{Instances} = \%instances;
$setup->{inf}->{General}->{ConfigDirectoryLdapURL} = $admConf->{ldapurl};
$setup->{inf}->{General}->{ConfigDirectoryAdminID} = $admConf->{userdn};
$setup->{inf}->{General}->{AdminDomain} = $admConf->{AdminDomain};
@@ -147,9 +270,10 @@
}
$new_confdsid = $setup->{inf}->{slapd}->{ServerIdentifier};
+ $new_confdir = $setup->{inf}->{slapd}->{config_dir};
my $newinst = "slapd-$new_confdsid";
my $inf = createInfFromConfig("$instconfigdir/$newinst", $newinst);
- if ( NULL == $inf )
+ if ( ! $inf )
{
$setup->msg($FATAL, 'error_create_inf_from_config',
"$instconfigdir/$newinst");
@@ -184,24 +308,30 @@
}
# Set the new inf to $setup->{inf}
$setup->{inf}->{slapd} = $inf->{slapd};
+ $setup->{inf}->{slapd}->{config_dir} = $instconfigdir;
+ $setup->{inf}->{slapd}->{Instances} = \%instances;
}
else
{
# Admin Server is not set up.
- # @instances has more than one instance
+ # %instances has more than one instance
# note: this is orig_confdsid is just a candidate...
- ($orig_confdsid = $instances[0]) =~ s/slapd-(.*)/\1/;
+ my $orig_confdir = $instconfigdirs[0];
+ my @orig_confdsids = @{$instances{$orig_confdir}};
+ ($orig_confdsid = $orig_confdsids[0]) =~ s/slapd-(.*)/\1/;
+
my $originst = "slapd-$orig_confdsid";
- my $inf = createInfFromConfig("$instconfigdir/$originst", $originst);
- if ( NULL == $inf )
+ my $inf = createInfFromConfig("$orig_confdir/$originst", $originst);
+ if ( ! $inf )
{
$setup->msg($FATAL, 'error_create_inf_from_config',
- "$instconfigdir/$originst");
+ "$orig_confdir/$originst");
$setup->doExit(1);
}
$setup->{inf} = $inf;
$setup->{inf}->{slapd}->{ServerIdentifier} = $orig_confdsid;
- $setup->{inf}->{slapd}->{Instances} = \@instances;
+ $setup->{inf}->{slapd}->{config_dir} = $orig_confdir;
+ $setup->{inf}->{slapd}->{Instances} = \%instances;
my $dialogmgr = new DialogManager($setup, $res, $TYPICAL);
@@ -220,18 +350,19 @@
$setup->doExit(1);
}
$new_confdsid = $setup->{inf}->{slapd}->{ServerIdentifier};
+ $new_confdir = $setup->{inf}->{slapd}->{config_dir};
if ( $orig_confdsid ne $new_confdsid )
{
my $newinst = "slapd-$new_confdsid";
$inf = createInfFromConfig("$instconfigdir/$newinst", $newinst);
- if ( NULL == $inf )
+ if ( ! $inf )
{
$setup->msg($FATAL, 'error_create_inf_from_config',
"$instconfigdir/$newinst");
$setup->doExit(1);
}
$setup->{inf}->{slapd} = $inf->{slapd};
- $setup->{inf}->{slapd}->{Instances} = \@instances;
+ $setup->{inf}->{slapd}->{Instances} = \%instances;
}
$setup->{inf}->{General}->{ConfigDirectoryLdapURL} = "ldap://" . $fqdn . ":". $setup->{inf}->{slapd}->{ServerPort} . "/o=NetscapeRoot";
@@ -250,11 +381,13 @@
$adminuid = $setup->{inf}->{General}->{ConfigDirectoryAdminID};
}
+
+
# Get the ConfigDS's rootDN password
print("\n==============================================================================\n");
$setup->msg('register_new_confds', $new_confdsid);
-$setup->{inf}->{slapd}->{RootDNPwd} = reg_get_passwd($setup,
- 'input_rootdn_passwd', $new_confdsid);
+$setup->{inf}->{slapd}->{RootDNPwd} =
+ reg_get_passwd($setup, 'input_rootdn_passwd', $new_confdsid);
if ( ($#admConfKeys >= 0 && ($orig_confdsid ne $new_confdsid)) ||
$#admConfKeys < 0 )
@@ -270,8 +403,8 @@
goto out;
}
}
- $setup->{inf}->{slapd}->{RootDNPwd} = reg_get_passwd($setup,
- 'input_rootdn_passwd', $new_confdsid);
+ $setup->{inf}->{slapd}->{RootDNPwd} =
+ reg_get_passwd($setup, 'input_rootdn_passwd', $new_confdsid);
@errs = ();
}
out:
@@ -296,43 +429,65 @@
my $hassubinst = 0;
# Then, register the rest of the Directory Servers, if any
-my @subinstances = (); # array without the Config DS
-foreach my $subinst (@instances)
+my %subinstances = (); # hash without the Config DS
+%instances = %{$setup->{inf}->{slapd}->{Instances}};
+foreach my $subconfdir (keys %instances)
{
- if ( "$subinst" ne "slapd-" . $new_confdsid )
+ my @subinsts = @{$instances{$subconfdir}};
+ foreach my $subinst ( @subinsts )
{
- if ( 0 == $hassubinst )
+ if ( ("$subinst" ne "slapd-" . $new_confdsid) ||
+ ($subconfdir ne $new_confdir) )
{
- $hassubinst = 1;
- print("\n==============================================================================\n");
- $setup->msg('register_subds');
- }
- my $subid = $subinst;
- $subid =~ s/slapd-//;
- push(@subinstances, ($subinst));
- my $subinf = createInfFromConfig("$instconfigdir/$subinst", $subinst);
- if ( NULL == $subinf )
- {
- $setup->msg($FATAL, 'error_create_inf_from_config',
- "$subinstconfigdir/$subinst");
- $setup->doExit(1);
- }
- $setup->{inf}->{slapd} = $subinf->{slapd};
- $setup->{inf}->{slapd}->{RootDNPwd} = reg_get_passwd($setup,
- 'input_rootdn_passwd', $subid);
- while (createSubDS($setup->{inf}, \@errs))
- {
- $setup->msg($FATAL, @errs);
- $setup->{inf}->{slapd}->{RootDNPwd} = reg_get_passwd($setup,
- 'input_rootdn_passwd', $subid);
+ if ( 0 == $hassubinst )
+ {
+ $hassubinst = 1;
+ print("\n==============================================================================\n");
+ $setup->msg('register_subds');
+ }
+ my $subid = $subinst;
+ $subid =~ s/slapd-//;
+ my $passwd =
+ reg_get_passwd($setup, 'input_rootdn_passwd_sub', $subid, $subid);
+ # if the password is not given, we don't register the server
+ next if ( "" eq $passwd || !$passwd );
+ my $subinf = createInfFromConfig("$subconfdir/$subinst", $subinst);
+ if ( ! $subinf )
+ {
+ $setup->msg($FATAL, 'error_create_inf_from_config',
+ "$subconfdir/$subinst");
+ }
+ else
+ {
+ $setup->{inf}->{slapd} = $subinf->{slapd};
+ $setup->{inf}->{slapd}->{RootDNPwd} = $passwd;
+ push @{$subinstances{$subconfdir}}, $subinst;
+ $done = 0;
+ while ( !$done && !createSubDS($setup->{inf}, \@errs) )
+ {
+ $setup->msg($FATAL, @errs);
+ $passwd = reg_get_passwd($setup, 'input_rootdn_passwd_sub',
+ $subid, $subid);
+ if ( "" eq $passwd || !$passwd )
+ {
+ $done = 1;
+ pop @{$subinstances{$subconfdir}};
+ }
+ else
+ {
+ $setup->{inf}->{slapd}->{RootDNPwd} = $passwd;
+ }
+ }
+ }
}
}
}
-if ( $#subinstances >= 0 )
+my @subkeys = keys %subinstances;
+if ( $#subkeys >= 0 )
{
@errs = ();
- if ( !registerManyDSWithConfigDS($setup->{inf}, \@errs, $instconfigdir, @subinstances) )
+ if ( !registerScatteredDSWithConfigDS($setup->{inf}, \@errs, \%subinstances) )
{
$setup->msg($FATAL, @errs);
$setup->doExit(1);
Index: register-ds-admin.res.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register-ds-admin.res.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- register-ds-admin.res.in 27 Jul 2007 01:42:46 -0000 1.1
+++ register-ds-admin.res.in 23 Aug 2007 23:51:24 -0000 1.2
@@ -2,6 +2,10 @@
use_existing_configds_txt = Do you want to use this server as Configuration Directory Server?\n\n
+subds_conf_prompt = The Directory Server locates its configuration file (dse.ldif) at %s/slapd-ID, by default. If you have Directory Server(s) which configuration file is put at the other location, you need to input it to register the server.\n\nIf you have such Directory Server, type the full path that stores the configuration file.\n\nIf you don't, type return.\n[configuration directory path or return]:
+
+candidate_list_txt = Candidate servers to register:\n
+
unregister_old_confds = Cleaning up old Config DS: %s\n
register_new_confds = Registering new Config DS: %s\n
@@ -10,7 +14,9 @@
end_ds_registration = Finished registration of the Directory Server
-input_rootdn_passwd = Please input the Directory Manager password on the server %s:
+input_rootdn_passwd = Input the Directory Server password on the server %s:
+
+input_rootdn_passwd_sub = If you want to register the server %s, input the Directory Manager password on the server.\n\nIf you don't, type return.\n[Directory Manager password on %s or return]:
input_admin_uid = Please input the password for the Administrator User ID: [%s]
16 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd mapping_tree.c, 1.9, 1.10
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27789/ldapserver/ldap/servers/slapd
Modified Files:
mapping_tree.c
Log Message:
Resolves: bug 252263
Bug Description: enabling chain-on-update causes replica to act as a master
Reviewed by: nkinder (Thanks!)
Fix Description: This fix is only minor - we must use sym_load() to look up plugins, including the entry distribution plugin we use for chain on update. But I don't believe this was causing the problem. Chain on update does not work if you BIND as directory manager. You must bind as a regular user. It may be difficult to change this. We need to do more testing to see if, in general, proxy BIND and operations work with directory manager. The chaining backend cannot use directory manager as the proxy user.
Platforms tested: RHEL5
Flag Day: no
Doc impact: Yes, we need to make sure we document exactly how chain on update is to be used.
Index: mapping_tree.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/mapping_tree.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mapping_tree.c 15 Mar 2007 18:21:37 -0000 1.9
+++ mapping_tree.c 23 Aug 2007 20:52:13 -0000 1.10
@@ -792,18 +792,8 @@
if (plugin_lib && plugin_funct)
{
- PRLibrary *lib = PR_LoadLibrary(plugin_lib);
- if (lib)
- {
- plugin = (mtn_distrib_fct) PR_FindSymbol(lib, plugin_funct);
- }
- else
- {
- LDAPDebug(LDAP_DEBUG_ANY, "ERROR: can't load plugin lib %s. "
- SLAPI_COMPONENT_NAME_NSPR " %d (%s)\n",
- plugin_lib, PR_GetError(), slapd_pr_strerror(PR_GetError()));
- }
-
+ plugin = (mtn_distrib_fct)sym_load(plugin_lib, plugin_funct,
+ "Entry Distribution", 1);
if (plugin == NULL)
{
LDAPDebug(LDAP_DEBUG_ANY,
@@ -1315,9 +1305,7 @@
{
if (plugin_lib && plugin_fct)
{
- PRLibrary *lib = PR_LoadLibrary(plugin_lib);
- if (lib)
- plugin = (mtn_distrib_fct) PR_FindSymbol(lib, plugin_fct);
+ plugin = (mtn_distrib_fct) sym_load(plugin_lib, plugin_fct, "Entry Distribution", 1);
if (plugin == NULL)
{
16 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication windows_protocol_util.c, 1.27, 1.28 windowsrepl.h, 1.9, 1.10
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27689
Modified Files:
windows_protocol_util.c windowsrepl.h
Log Message:
Resolves: 243221
Summary: Trim initials attribute value when sync'ing to AD.
Index: windows_protocol_util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_protocol_util.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- windows_protocol_util.c 10 Nov 2006 23:45:17 -0000 1.27
+++ windows_protocol_util.c 23 Aug 2007 20:50:56 -0000 1.28
@@ -1315,6 +1315,33 @@
if ( is_straight_mapped_attr(type,is_user,is_nt4) )
{
+ /* The initials attribute is a special case. AD has a constraint
+ * that limits the value length. If we're sending a change to
+ * the initials attribute to AD, we trim if neccessary.
+ */
+ if (0 == slapi_attr_type_cmp(type, "initials", SLAPI_TYPE_CMP_SUBTYPE)) {
+ int i = 0;
+ const char *initials_value = NULL;
+ Slapi_Value *value = NULL;
+
+ i = slapi_valueset_first_value(vs,&value);
+ while (i >= 0) {
+ initials_value = slapi_value_get_string(value);
+
+ /* If > AD_INITIALS_LENGTH, trim the value */
+ if (strlen(initials_value) > AD_INITIALS_LENGTH) {
+ char *new_initials = PL_strndup(initials_value, AD_INITIALS_LENGTH);
+ /* the below hands off memory */
+ slapi_value_set_string_passin(value, new_initials);
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
+ "%s: windows_create_remote_entry: "
+ "Trimming initials attribute to %d characters.\n",
+ agmt_get_long_name(prp->agmt), AD_INITIALS_LENGTH);
+ }
+
+ i = slapi_valueset_next_value(vs, i, &value);
+ }
+ }
/* copy over the attr values */
slapi_entry_add_valueset(new_entry,type,vs);
} else
@@ -1461,7 +1488,26 @@
/* Check to see if this attribute is passed through */
if (is_straight_mapped_attr(attr_type,is_user,is_nt4)) {
- /* If so then just copy over the mod */
+ /* The initials attribute is a special case. AD has a constraint
+ * that limits the value length. If we're sending a change to
+ * the initials attribute to AD, we trim if neccessary.
+ */
+ if (0 == slapi_attr_type_cmp(attr_type, "initials", SLAPI_TYPE_CMP_SUBTYPE)) {
+ int i;
+ for (i = 0; mod->mod_bvalues[i] != NULL; i++) {
+ /* If > AD_INITIALS_LENGTH, trim the value */
+ if (mod->mod_bvalues[i]->bv_len > AD_INITIALS_LENGTH) {
+ mod->mod_bvalues[i]->bv_val[AD_INITIALS_LENGTH] = '\0';
+ mod->mod_bvalues[i]->bv_len = AD_INITIALS_LENGTH;
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
+ "%s: windows_map_mods_for_replay: "
+ "Trimming initials attribute to %d characters.\n",
+ agmt_get_long_name(prp->agmt), AD_INITIALS_LENGTH);
+ }
+ }
+ }
+
+ /* copy over the mod */
slapi_mods_add_modbvps(&mapped_smods,mod->mod_op,attr_type,mod->mod_bvalues);
} else
{
@@ -1521,9 +1567,12 @@
LDAPDebug( LDAP_DEBUG_TRACE, "<= windows_map_mods_for_replay\n", 0, 0, 0 );
}
-/* Returns non-zero if the attribute value sets are identical */
-static int
-attr_compare_equal(Slapi_Attr *a, Slapi_Attr *b)
+
+/* Returns non-zero if the attribute value sets are identical. If you want to
+ * compare the entire attribute value, set n to 0. You can compare only the
+ * first n characters of the values by passing in the legth as n. */
+static int
+attr_compare_equal(Slapi_Attr *a, Slapi_Attr *b, int n)
{
/* For now only handle single values */
Slapi_Value *va = NULL;
@@ -1535,23 +1584,25 @@
slapi_attr_get_numvalues(a,&num_a);
slapi_attr_get_numvalues(b,&num_b);
- if (num_a == num_b)
- {
+ if (num_a == num_b) {
slapi_attr_first_value(a, &va);
slapi_attr_first_value(b, &vb);
- if (va->bv.bv_len == vb->bv.bv_len)
- {
- if (0 != memcmp(va->bv.bv_val,vb->bv.bv_val,va->bv.bv_len))
- {
+ /* If either val is less than n, then check if the length, then values are
+ * equal. If both are n or greater, then only compare the first n chars.
+ * If n is 0, then just compare the entire attribute. */
+ if ((va->bv.bv_len < n) || (vb->bv.bv_len < n) || (n == 0)) {
+ if (va->bv.bv_len == vb->bv.bv_len) {
+ if (0 != memcmp(va->bv.bv_val, vb->bv.bv_val, va->bv.bv_len)) {
+ match = 0;
+ }
+ } else {
match = 0;
}
- } else
- {
+ } else if (0 != memcmp(va->bv.bv_val, vb->bv.bv_val, n)) {
match = 0;
}
- } else
- {
+ } else {
match = 0;
}
return match;
@@ -2554,7 +2605,17 @@
{
if (!mapdn)
{
- int values_equal = attr_compare_equal(attr,local_attr);
+ int values_equal = 0;
+
+ /* AD has a legth contraint on the initials attribute,
+ * so treat is as a special case. */
+ if (0 == slapi_attr_type_cmp(type,"initials",SLAPI_TYPE_CMP_SUBTYPE) && !to_windows) {
+ values_equal = attr_compare_equal(attr, local_attr, AD_INITIALS_LENGTH);
+ } else {
+ /* Compare the entire attribute values */
+ values_equal = attr_compare_equal(attr, local_attr, 0);
+ }
+
/* If it is then we need to replace the local values with the remote values if they are different */
if (!values_equal)
{
Index: windowsrepl.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windowsrepl.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- windowsrepl.h 10 Nov 2006 23:45:17 -0000 1.9
+++ windowsrepl.h 23 Aug 2007 20:50:56 -0000 1.10
@@ -97,4 +97,6 @@
/* Used to work around a schema incompatibility between Microsoft and the IETF */
#define FAKE_STREET_ATTR_NAME "in#place#of#streetaddress"
+/* Used to work around contrained attribute legth for initials on AD */
+#define AD_INITIALS_LENGTH 6
16 years, 7 months
[Fedora-directory-commits] ldapserver configure, 1.61, 1.62 configure.ac, 1.36, 1.37
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31888
Modified Files:
configure configure.ac
Log Message:
Resolves: 253818
Summary: Support FHS opt layout for perldir and propertydir.
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- configure 20 Aug 2007 17:49:17 -0000 1.61
+++ configure 22 Aug 2007 05:11:34 -0000 1.62
@@ -23160,6 +23160,10 @@
serverplugindir=/plugins
# relative to datadir
infdir=/inf
+ # location of property/resource files, relative to datadir
+ propertydir=/properties
+ # relative to libdir
+ perldir=/perl
else
if test "$with_fhs" = "yes"; then
ac_default_prefix=/usr
@@ -23178,17 +23182,17 @@
serverplugindir=/$PACKAGE_NAME/plugins
# relative to datadir
infdir=/$PACKAGE_NAME/inf
+ # location of property/resource files, relative to datadir
+ propertydir=/$PACKAGE_NAME/properties
+ # relative to libdir
+ perldir=/$PACKAGE_NAME/perl
fi
# Shared paths for all layouts
# relative to sysconfdir
configdir=/$PACKAGE_NAME/config
-# location of property/resource files, relative to datadir
-propertydir=/$PACKAGE_NAME/properties
# relative to sysconfdir
schemadir=/$PACKAGE_NAME/schema
-# relative to libdir
-perldir=/$PACKAGE_NAME/perl
# default user, group
defaultuser=nobody
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- configure.ac 13 Aug 2007 15:35:35 -0000 1.36
+++ configure.ac 22 Aug 2007 05:11:34 -0000 1.37
@@ -165,6 +165,10 @@
serverplugindir=/plugins
# relative to datadir
infdir=/inf
+ # location of property/resource files, relative to datadir
+ propertydir=/properties
+ # relative to libdir
+ perldir=/perl
else
if test "$with_fhs" = "yes"; then
ac_default_prefix=/usr
@@ -185,17 +189,17 @@
serverplugindir=/$PACKAGE_NAME/plugins
# relative to datadir
infdir=/$PACKAGE_NAME/inf
+ # location of property/resource files, relative to datadir
+ propertydir=/$PACKAGE_NAME/properties
+ # relative to libdir
+ perldir=/$PACKAGE_NAME/perl
fi
# Shared paths for all layouts
# relative to sysconfdir
configdir=/$PACKAGE_NAME/config
-# location of property/resource files, relative to datadir
-propertydir=/$PACKAGE_NAME/properties
# relative to sysconfdir
schemadir=/$PACKAGE_NAME/schema
-# relative to libdir
-perldir=/$PACKAGE_NAME/perl
# default user, group
defaultuser=nobody
16 years, 7 months
[Fedora-directory-commits] adminserver Makefile.am, 1.31, 1.32 Makefile.in, 1.36, 1.37 configure, 1.33, 1.34 configure.ac, 1.19, 1.20 ltmain.sh, 1.5, 1.6
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19997
Modified Files:
Makefile.am Makefile.in configure configure.ac ltmain.sh
Log Message:
Resolves: 253760
Summary: Support FHS optional layout in Admin Server.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Makefile.am 15 Aug 2007 22:08:13 -0000 1.31
+++ Makefile.am 21 Aug 2007 20:46:45 -0000 1.32
@@ -75,7 +75,6 @@
securitydir = $(configdir)
piddir = $(localstatedir)@piddir@
pidfile = @pidfile@
-logdir = $(localstatedir)@logdir@/$(instancename)
HTTPD = @HTTPD@
httpduser = @httpduser@
modnssbindir = @modnssbindir@
@@ -84,6 +83,11 @@
infdir = $(datadir)@infdir@
perldir = $(libdir)@perldir@
dslibdir = @dslibdir@
+if BUNDLE
+logdir = $(localstatedir)@admlogdir@
+else
+logdir = $(localstatedir)@admlogdir@/$(instancename)
+endif
libbase_a_SOURCES = lib/base/file.cpp lib/base/nscperror.c \
lib/base/system.cpp lib/base/nscputil.cpp
@@ -434,6 +438,59 @@
# ADMConfigDir = ${prefix}/etc/packagename
# i.e. it literally copies in '${prefix}' rather than expanding it out - we want this instead:
# ADMConfigDir = /etc/packagename
+if BUNDLE
+# Some of the paths need to be different if we are making a bundled build,
+# namely the mod_nss bindir.
+fixupcmd = sed \
+ -e 's,@ECHO_C\@,$(ECHO_C),g' \
+ -e 's,@ECHO_N\@,$(ECHO_N),g' \
+ -e 's,@HTTPD\@,$(HTTPD),g' \
+ -e 's,@bindir\@,$(bindir),g' \
+ -e 's,@sbindir\@,$(sbindir),g' \
+ -e 's,@localstatedir\@,$(localstatedir),g' \
+ -e 's,@cgibindir\@,$(cgibindir),g' \
+ -e 's,@cmdbindir\@,$(cmdbindir),g' \
+ -e 's,@moddir\@,$(moddir),g' \
+ -e 's,@modnssbindir\@,$(sbindir),g' \
+ -e 's,@propertydir\@,$(propertydir),g' \
+ -e 's,@htmldir\@,$(htmldir),g' \
+ -e 's,@icondir\@,$(icondir),g' \
+ -e 's,@logdir\@,$(logdir),g' \
+ -e 's,@manualdir\@,$(manualdir),g' \
+ -e 's,@configdir\@,$(configdir),g' \
+ -e 's,@securitydir\@,$(securitydir),g' \
+ -e 's,@httpduser\@,$(httpduser),g' \
+ -e 's,@httpdgroup\@,$(httpdgroup),g' \
+ -e 's,@httpdconfdir\@,$(httpdconfdir),g' \
+ -e 's,@piddir\@,$(piddir),g' \
+ -e 's,@pidfile\@,$(pidfile),g' \
+ -e 's,@admservport\@,$(admservport),g' \
+ -e 's,@LIBPATH\@,$(LIBPATH),g' \
+ -e 's,@nss_libdir\@,$(runtime_nss_libdir),g' \
+ -e 's,@ldapsdk_libdir\@,$(runtime_ldapsdk_libdir),g' \
+ -e 's,@admmoddir\@,$(admmoddir),g' \
+ -e 's,@nssmoddir\@,$(runtime_nssmoddir),g' \
+ -e 's,@instconfigdir\@,$(instconfigdir),g' \
+ -e 's,@instancename\@,$(instancename),g' \
+ -e 's,@BUILD_NUM\@,$(BUILDNUM),g' \
+ -e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
+ -e 's,@package_name\@,$(PACKAGE_NAME),g' \
+ -e 's,@PACKAGE_BASE_NAME\@,$(PACKAGE_BASE_NAME),g' \
+ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+ -e 's,@PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
+ -e 's,@brand\@,$(brand),g' \
+ -e 's,@capbrand\@,$(capbrand),g' \
+ -e 's,@vendor\@,$(vendor),g' \
+ -e 's,@helpdir\@,$(helpdir),g' \
+ -e 's,@mimemagic\@,$(mimemagic),g' \
+ -e 's,@initdir\@,$(initdir),g' \
+ -e 's,@perlpath\@,$(perlpath),g' \
+ -e 's,@perlexec\@,@perlexec@,g' \
+ -e 's,@infdir\@,$(infdir),g' \
+ -e 's,@dslibdir\@,$(dslibdir),g' \
+ -e 's,@ldifdir\@,$(ldifdir),g' \
+ -e 's,@adminutilpath\@,$(adminutilpath),g'
+else
fixupcmd = sed \
-e 's,@ECHO_C\@,$(ECHO_C),g' \
-e 's,@ECHO_N\@,$(ECHO_N),g' \
@@ -483,6 +540,7 @@
-e 's,@dslibdir\@,$(dslibdir),g' \
-e 's,@ldifdir\@,$(ldifdir),g' \
-e 's,@adminutilpath\@,$(adminutilpath),g'
+endif
# because the source may be either httpd.conf.in or httpd-2.2.conf.in
admserv/cfgstuff/httpd.conf: $(HTTPD_CONF_SRC)
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Makefile.in 17 Aug 2007 18:39:12 -0000 1.36
+++ Makefile.in 21 Aug 2007 20:46:45 -0000 1.37
@@ -417,6 +417,7 @@
adminutil_lib = @adminutil_lib@
adminutil_libdir = @adminutil_libdir@
adminutil_ver = @adminutil_ver@
+admlogdir = @admlogdir@
admmoddir = $(libdir)@admmoddir@
admservport = @admservport@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
@@ -471,7 +472,6 @@
libdir = @libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
-logdir = $(localstatedir)@logdir@/$(instancename)
mandir = @mandir@
manualdir = $(datadir)@manualdir@
mimemagic = @mimemagic@
@@ -543,6 +543,8 @@
configdir = $(instconfigdir)/$(instancename)
# same as configdir for now
securitydir = $(configdir)
+@BUNDLE_FALSE@logdir = $(localstatedir)@admlogdir@/$(instancename)
+@BUNDLE_TRUE@logdir = $(localstatedir)@admlogdir@
libbase_a_SOURCES = lib/base/file.cpp lib/base/nscperror.c \
lib/base/system.cpp lib/base/nscputil.cpp
@@ -824,6 +826,56 @@
admserv/cgi-src40/ds_create.res \
admserv/cgi-src40/ds_remove.res
+@BUNDLE_FALSE@fixupcmd = sed \
+@BUNDLE_FALSE@ -e 's,@ECHO_C\@,$(ECHO_C),g' \
+@BUNDLE_FALSE@ -e 's,@ECHO_N\@,$(ECHO_N),g' \
+@BUNDLE_FALSE@ -e 's,@HTTPD\@,$(HTTPD),g' \
+@BUNDLE_FALSE@ -e 's,@bindir\@,$(bindir),g' \
+@BUNDLE_FALSE@ -e 's,@sbindir\@,$(sbindir),g' \
+@BUNDLE_FALSE@ -e 's,@localstatedir\@,$(localstatedir),g' \
+@BUNDLE_FALSE@ -e 's,@cgibindir\@,$(cgibindir),g' \
+@BUNDLE_FALSE@ -e 's,@cmdbindir\@,$(cmdbindir),g' \
+@BUNDLE_FALSE@ -e 's,@moddir\@,$(moddir),g' \
+@BUNDLE_FALSE@ -e 's,@modnssbindir\@,$(modnssbindir),g' \
+@BUNDLE_FALSE@ -e 's,@propertydir\@,$(propertydir),g' \
+@BUNDLE_FALSE@ -e 's,@htmldir\@,$(htmldir),g' \
+@BUNDLE_FALSE@ -e 's,@icondir\@,$(icondir),g' \
+@BUNDLE_FALSE@ -e 's,@logdir\@,$(logdir),g' \
+@BUNDLE_FALSE@ -e 's,@manualdir\@,$(manualdir),g' \
+@BUNDLE_FALSE@ -e 's,@configdir\@,$(configdir),g' \
+@BUNDLE_FALSE@ -e 's,@securitydir\@,$(securitydir),g' \
+@BUNDLE_FALSE@ -e 's,@httpduser\@,$(httpduser),g' \
+@BUNDLE_FALSE@ -e 's,@httpdgroup\@,$(httpdgroup),g' \
+@BUNDLE_FALSE@ -e 's,@httpdconfdir\@,$(httpdconfdir),g' \
+@BUNDLE_FALSE@ -e 's,@piddir\@,$(piddir),g' \
+@BUNDLE_FALSE@ -e 's,@pidfile\@,$(pidfile),g' \
+@BUNDLE_FALSE@ -e 's,@admservport\@,$(admservport),g' \
+@BUNDLE_FALSE@ -e 's,@LIBPATH\@,$(LIBPATH),g' \
+@BUNDLE_FALSE@ -e 's,@nss_libdir\@,$(runtime_nss_libdir),g' \
+@BUNDLE_FALSE@ -e 's,@ldapsdk_libdir\@,$(runtime_ldapsdk_libdir),g' \
+@BUNDLE_FALSE@ -e 's,@admmoddir\@,$(admmoddir),g' \
+@BUNDLE_FALSE@ -e 's,@nssmoddir\@,$(runtime_nssmoddir),g' \
+@BUNDLE_FALSE@ -e 's,@instconfigdir\@,$(instconfigdir),g' \
+@BUNDLE_FALSE@ -e 's,@instancename\@,$(instancename),g' \
+@BUNDLE_FALSE@ -e 's,@BUILD_NUM\@,$(BUILDNUM),g' \
+@BUNDLE_FALSE@ -e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
+@BUNDLE_FALSE@ -e 's,@package_name\@,$(PACKAGE_NAME),g' \
+@BUNDLE_FALSE@ -e 's,@PACKAGE_BASE_NAME\@,$(PACKAGE_BASE_NAME),g' \
+@BUNDLE_FALSE@ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+@BUNDLE_FALSE@ -e 's,@PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
+@BUNDLE_FALSE@ -e 's,@brand\@,$(brand),g' \
+@BUNDLE_FALSE@ -e 's,@capbrand\@,$(capbrand),g' \
+@BUNDLE_FALSE@ -e 's,@vendor\@,$(vendor),g' \
+@BUNDLE_FALSE@ -e 's,@helpdir\@,$(helpdir),g' \
+@BUNDLE_FALSE@ -e 's,@mimemagic\@,$(mimemagic),g' \
+@BUNDLE_FALSE@ -e 's,@initdir\@,$(initdir),g' \
+@BUNDLE_FALSE@ -e 's,@perlpath\@,$(perlpath),g' \
+@BUNDLE_FALSE@ -e 's,@perlexec\@,@perlexec@,g' \
+@BUNDLE_FALSE@ -e 's,@infdir\@,$(infdir),g' \
+@BUNDLE_FALSE@ -e 's,@dslibdir\@,$(dslibdir),g' \
+@BUNDLE_FALSE@ -e 's,@ldifdir\@,$(ldifdir),g' \
+@BUNDLE_FALSE@ -e 's,@adminutilpath\@,$(adminutilpath),g'
+
# these are for the config files and scripts that we need to generate and replace
# the paths and other tokens with the real values set during configure/make
@@ -831,55 +883,57 @@
# ADMConfigDir = ${prefix}/etc/packagename
# i.e. it literally copies in '${prefix}' rather than expanding it out - we want this instead:
# ADMConfigDir = /etc/packagename
-fixupcmd = sed \
- -e 's,@ECHO_C\@,$(ECHO_C),g' \
- -e 's,@ECHO_N\@,$(ECHO_N),g' \
- -e 's,@HTTPD\@,$(HTTPD),g' \
- -e 's,@bindir\@,$(bindir),g' \
- -e 's,@sbindir\@,$(sbindir),g' \
- -e 's,@localstatedir\@,$(localstatedir),g' \
- -e 's,@cgibindir\@,$(cgibindir),g' \
- -e 's,@cmdbindir\@,$(cmdbindir),g' \
- -e 's,@moddir\@,$(moddir),g' \
- -e 's,@modnssbindir\@,$(modnssbindir),g' \
- -e 's,@propertydir\@,$(propertydir),g' \
- -e 's,@htmldir\@,$(htmldir),g' \
- -e 's,@icondir\@,$(icondir),g' \
- -e 's,@logdir\@,$(logdir),g' \
- -e 's,@manualdir\@,$(manualdir),g' \
- -e 's,@configdir\@,$(configdir),g' \
- -e 's,@securitydir\@,$(securitydir),g' \
- -e 's,@httpduser\@,$(httpduser),g' \
- -e 's,@httpdgroup\@,$(httpdgroup),g' \
- -e 's,@httpdconfdir\@,$(httpdconfdir),g' \
- -e 's,@piddir\@,$(piddir),g' \
- -e 's,@pidfile\@,$(pidfile),g' \
- -e 's,@admservport\@,$(admservport),g' \
- -e 's,@LIBPATH\@,$(LIBPATH),g' \
- -e 's,@nss_libdir\@,$(runtime_nss_libdir),g' \
- -e 's,@ldapsdk_libdir\@,$(runtime_ldapsdk_libdir),g' \
- -e 's,@admmoddir\@,$(admmoddir),g' \
- -e 's,@nssmoddir\@,$(runtime_nssmoddir),g' \
- -e 's,@instconfigdir\@,$(instconfigdir),g' \
- -e 's,@instancename\@,$(instancename),g' \
- -e 's,@BUILD_NUM\@,$(BUILDNUM),g' \
- -e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
- -e 's,@package_name\@,$(PACKAGE_NAME),g' \
- -e 's,@PACKAGE_BASE_NAME\@,$(PACKAGE_BASE_NAME),g' \
- -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
- -e 's,@PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
- -e 's,@brand\@,$(brand),g' \
- -e 's,@capbrand\@,$(capbrand),g' \
- -e 's,@vendor\@,$(vendor),g' \
- -e 's,@helpdir\@,$(helpdir),g' \
- -e 's,@mimemagic\@,$(mimemagic),g' \
- -e 's,@initdir\@,$(initdir),g' \
- -e 's,@perlpath\@,$(perlpath),g' \
- -e 's,@perlexec\@,@perlexec@,g' \
- -e 's,@infdir\@,$(infdir),g' \
- -e 's,@dslibdir\@,$(dslibdir),g' \
- -e 's,@ldifdir\@,$(ldifdir),g' \
- -e 's,@adminutilpath\@,$(adminutilpath),g'
+# Some of the paths need to be different if we are making a bundled build,
+# namely the mod_nss bindir.
+@BUNDLE_TRUE@fixupcmd = sed \
+@BUNDLE_TRUE@ -e 's,@ECHO_C\@,$(ECHO_C),g' \
+@BUNDLE_TRUE@ -e 's,@ECHO_N\@,$(ECHO_N),g' \
+@BUNDLE_TRUE@ -e 's,@HTTPD\@,$(HTTPD),g' \
+@BUNDLE_TRUE@ -e 's,@bindir\@,$(bindir),g' \
+@BUNDLE_TRUE@ -e 's,@sbindir\@,$(sbindir),g' \
+@BUNDLE_TRUE@ -e 's,@localstatedir\@,$(localstatedir),g' \
+@BUNDLE_TRUE@ -e 's,@cgibindir\@,$(cgibindir),g' \
+@BUNDLE_TRUE@ -e 's,@cmdbindir\@,$(cmdbindir),g' \
+@BUNDLE_TRUE@ -e 's,@moddir\@,$(moddir),g' \
+@BUNDLE_TRUE@ -e 's,@modnssbindir\@,$(sbindir),g' \
+@BUNDLE_TRUE@ -e 's,@propertydir\@,$(propertydir),g' \
+@BUNDLE_TRUE@ -e 's,@htmldir\@,$(htmldir),g' \
+@BUNDLE_TRUE@ -e 's,@icondir\@,$(icondir),g' \
+@BUNDLE_TRUE@ -e 's,@logdir\@,$(logdir),g' \
+@BUNDLE_TRUE@ -e 's,@manualdir\@,$(manualdir),g' \
+@BUNDLE_TRUE@ -e 's,@configdir\@,$(configdir),g' \
+@BUNDLE_TRUE@ -e 's,@securitydir\@,$(securitydir),g' \
+@BUNDLE_TRUE@ -e 's,@httpduser\@,$(httpduser),g' \
+@BUNDLE_TRUE@ -e 's,@httpdgroup\@,$(httpdgroup),g' \
+@BUNDLE_TRUE@ -e 's,@httpdconfdir\@,$(httpdconfdir),g' \
+@BUNDLE_TRUE@ -e 's,@piddir\@,$(piddir),g' \
+@BUNDLE_TRUE@ -e 's,@pidfile\@,$(pidfile),g' \
+@BUNDLE_TRUE@ -e 's,@admservport\@,$(admservport),g' \
+@BUNDLE_TRUE@ -e 's,@LIBPATH\@,$(LIBPATH),g' \
+@BUNDLE_TRUE@ -e 's,@nss_libdir\@,$(runtime_nss_libdir),g' \
+@BUNDLE_TRUE@ -e 's,@ldapsdk_libdir\@,$(runtime_ldapsdk_libdir),g' \
+@BUNDLE_TRUE@ -e 's,@admmoddir\@,$(admmoddir),g' \
+@BUNDLE_TRUE@ -e 's,@nssmoddir\@,$(runtime_nssmoddir),g' \
+@BUNDLE_TRUE@ -e 's,@instconfigdir\@,$(instconfigdir),g' \
+@BUNDLE_TRUE@ -e 's,@instancename\@,$(instancename),g' \
+@BUNDLE_TRUE@ -e 's,@BUILD_NUM\@,$(BUILDNUM),g' \
+@BUNDLE_TRUE@ -e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
+@BUNDLE_TRUE@ -e 's,@package_name\@,$(PACKAGE_NAME),g' \
+@BUNDLE_TRUE@ -e 's,@PACKAGE_BASE_NAME\@,$(PACKAGE_BASE_NAME),g' \
+@BUNDLE_TRUE@ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+@BUNDLE_TRUE@ -e 's,@PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
+@BUNDLE_TRUE@ -e 's,@brand\@,$(brand),g' \
+@BUNDLE_TRUE@ -e 's,@capbrand\@,$(capbrand),g' \
+@BUNDLE_TRUE@ -e 's,@vendor\@,$(vendor),g' \
+@BUNDLE_TRUE@ -e 's,@helpdir\@,$(helpdir),g' \
+@BUNDLE_TRUE@ -e 's,@mimemagic\@,$(mimemagic),g' \
+@BUNDLE_TRUE@ -e 's,@initdir\@,$(initdir),g' \
+@BUNDLE_TRUE@ -e 's,@perlpath\@,$(perlpath),g' \
+@BUNDLE_TRUE@ -e 's,@perlexec\@,@perlexec@,g' \
+@BUNDLE_TRUE@ -e 's,@infdir\@,$(infdir),g' \
+@BUNDLE_TRUE@ -e 's,@dslibdir\@,$(dslibdir),g' \
+@BUNDLE_TRUE@ -e 's,@ldifdir\@,$(ldifdir),g' \
+@BUNDLE_TRUE@ -e 's,@adminutilpath\@,$(adminutilpath),g'
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- configure 17 Aug 2007 18:39:12 -0000 1.33
+++ configure 21 Aug 2007 20:46:45 -0000 1.34
@@ -468,7 +468,7 @@
ac_default_prefix=/opt/dirsrv
ac_subdirs_all="$ac_subdirs_all mod_admserv"
ac_subdirs_all="$ac_subdirs_all mod_restartd"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser httpdgroup admlogdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -23013,39 +23013,6 @@
fi
-# installation paths - by default, configure will just
-# use /usr as the prefix for everything, which means
-# /usr/etc and /usr/var. FHS sez to use /etc and /var.
-# The with-fhs-opt option will use the
-# prefix, but it's sysconfdir and localstatedir will be
-# /etc/opt, and /var/opt.
-if test "$with_fhs_opt" = "yes"; then
- # Override sysconfdir and localstatedir if FHS optional
- # package was requested.
- sysconfdir='/etc/opt'
- localstatedir='/var/opt'
- # relative to datadir
- infdir=/inf
- htmldir=/html
- icondir=/icons
- manualdir=/manual
- ldifdir=/data
-else
- if test "$with_fhs" = "yes"; then
- ac_default_prefix=/usr
- prefix=$ac_default_prefix
- exec_prefix=$prefix
- sysconfdir='/etc'
- localstatedir='/var'
- fi
-# relative to datadir
- infdir=/$PACKAGE_BASE_NAME/inf
- htmldir=/$PACKAGE_BASE_NAME/html
- icondir=/$PACKAGE_BASE_NAME/icons
- manualdir=/$PACKAGE_BASE_NAME/manual
- ldifdir=/$PACKAGE_BASE_NAME/data
-fi
-
# server userid, groupid
httpduser=nobody
httpdgroup=nobody
@@ -24949,26 +24916,64 @@
fi;
-# CGI program directory, relative to libdir
-cgibindir=/$PACKAGE_BASE_NAME/cgi-bin
-
-# cmdbindir is just sbindir
-#cmdbindir=$libdir/$PKGNAME
+# installation paths - by default, configure will just
+# use /usr as the prefix for everything, which means
+# /usr/etc and /usr/var. FHS sez to use /etc and /var.
+# The with-fhs-opt option will use the
+# prefix, but it's sysconfdir and localstatedir will be
+# /etc/opt, and /var/opt.
+if test "$with_fhs_opt" = "yes"; then
+ # Override sysconfdir and localstatedir if FHS optional
+ # package was requested.
+ sysconfdir='/etc/opt'
+ localstatedir='/var/opt'
+ # relative to datadir
+ infdir=/inf
+ htmldir=/html
+ icondir=/icons
+ manualdir=/manual
+ ldifdir=/data
+ # relative to libdir
+ # CGI program directory
+ cgibindir=/cgi-bin
+ # where our private Apache modules will go
+ admmoddir=/modules
+ perldir=/perl
+ # log files, relative to localstatedir
+ admlogdir=/$PACKAGE_BASE_NAME/$instancename/log
+ # the pid dir, relative to localstatedir
+ piddir=/$PACKAGE_BASE_NAME/$instancename/run
+ # location of property/resource files, relative to datadir
+ propertydir=/properties
+else
+ if test "$with_fhs" = "yes"; then
+ ac_default_prefix=/usr
+ prefix=$ac_default_prefix
+ exec_prefix=$prefix
+ sysconfdir='/etc'
+ localstatedir='/var'
+ fi
+ # relative to datadir
+ infdir=/$PACKAGE_BASE_NAME/inf
+ htmldir=/$PACKAGE_BASE_NAME/html
+ icondir=/$PACKAGE_BASE_NAME/icons
+ manualdir=/$PACKAGE_BASE_NAME/manual
+ ldifdir=/$PACKAGE_BASE_NAME/data
+ # relative to libdir
+ # CGI program directory
+ cgibindir=/$PACKAGE_BASE_NAME/cgi-bin
+ # where our private Apache modules will go
+ admmoddir=/$PACKAGE_BASE_NAME/modules
+ perldir=/$PACKAGE_BASE_NAME/perl
+ # log files, relative to localstatedir
+ admlogdir=/log/$PACKAGE_BASE_NAME
+ # the pid dir, relative to localstatedir
+ piddir=/run/$PACKAGE_BASE_NAME
+ # location of property/resource files, relative to datadir
+ propertydir=/$PACKAGE_BASE_NAME/properties
+fi
-# log files, relative to localstatedir
-logdir=/log/$PACKAGE_BASE_NAME
-# the pid dir, relative to localstatedir
-piddir=/run/$PACKAGE_BASE_NAME
pidfile=$instancename.pid
-# location of property/resource files, relative to datadir
-propertydir=/$PACKAGE_BASE_NAME/properties
-
-# where our private Apache modules will go
-# relative to libdir
-admmoddir=/$PACKAGE_BASE_NAME/modules
-
-# relative to libdir
-perldir=/$PACKAGE_BASE_NAME/perl
# write out paths for binary components
@@ -25948,7 +25953,7 @@
s,@mimemagic@,$mimemagic,;t t
s,@httpduser@,$httpduser,;t t
s,@httpdgroup@,$httpdgroup,;t t
-s,@logdir@,$logdir,;t t
+s,@admlogdir@,$admlogdir,;t t
s,@piddir@,$piddir,;t t
s,@pidfile@,$pidfile,;t t
s,@admservport@,$admservport,;t t
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- configure.ac 17 Aug 2007 18:39:12 -0000 1.19
+++ configure.ac 21 Aug 2007 20:46:45 -0000 1.20
@@ -92,41 +92,6 @@
m4_include(m4/fhs.m4)
-# installation paths - by default, configure will just
-# use /usr as the prefix for everything, which means
-# /usr/etc and /usr/var. FHS sez to use /etc and /var.
-# The with-fhs-opt option will use the
-# prefix, but it's sysconfdir and localstatedir will be
-# /etc/opt, and /var/opt.
-if test "$with_fhs_opt" = "yes"; then
- # Override sysconfdir and localstatedir if FHS optional
- # package was requested.
- sysconfdir='/etc/opt'
- localstatedir='/var/opt'
- # relative to datadir
- infdir=/inf
- htmldir=/html
- icondir=/icons
- manualdir=/manual
- ldifdir=/data
-else
- if test "$with_fhs" = "yes"; then
- ac_default_prefix=/usr
- prefix=$ac_default_prefix
- exec_prefix=$prefix
- dnl as opposed to the default /usr/etc
- sysconfdir='/etc'
- dnl as opposed to the default /usr/var
- localstatedir='/var'
- fi
-# relative to datadir
- infdir=/$PACKAGE_BASE_NAME/inf
- htmldir=/$PACKAGE_BASE_NAME/html
- icondir=/$PACKAGE_BASE_NAME/icons
- manualdir=/$PACKAGE_BASE_NAME/manual
- ldifdir=/$PACKAGE_BASE_NAME/data
-fi
-
# server userid, groupid
httpduser=nobody
httpdgroup=nobody
@@ -271,26 +236,66 @@
])
AC_SUBST(dslibdir)
-# CGI program directory, relative to libdir
-cgibindir=/$PACKAGE_BASE_NAME/cgi-bin
-
-# cmdbindir is just sbindir
-#cmdbindir=$libdir/$PKGNAME
+# installation paths - by default, configure will just
+# use /usr as the prefix for everything, which means
+# /usr/etc and /usr/var. FHS sez to use /etc and /var.
+# The with-fhs-opt option will use the
+# prefix, but it's sysconfdir and localstatedir will be
+# /etc/opt, and /var/opt.
+if test "$with_fhs_opt" = "yes"; then
+ # Override sysconfdir and localstatedir if FHS optional
+ # package was requested.
+ sysconfdir='/etc/opt'
+ localstatedir='/var/opt'
+ # relative to datadir
+ infdir=/inf
+ htmldir=/html
+ icondir=/icons
+ manualdir=/manual
+ ldifdir=/data
+ # relative to libdir
+ # CGI program directory
+ cgibindir=/cgi-bin
+ # where our private Apache modules will go
+ admmoddir=/modules
+ perldir=/perl
+ # log files, relative to localstatedir
+ admlogdir=/$PACKAGE_BASE_NAME/$instancename/log
+ # the pid dir, relative to localstatedir
+ piddir=/$PACKAGE_BASE_NAME/$instancename/run
+ # location of property/resource files, relative to datadir
+ propertydir=/properties
+else
+ if test "$with_fhs" = "yes"; then
+ ac_default_prefix=/usr
+ prefix=$ac_default_prefix
+ exec_prefix=$prefix
+ dnl as opposed to the default /usr/etc
+ sysconfdir='/etc'
+ dnl as opposed to the default /usr/var
+ localstatedir='/var'
+ fi
+ # relative to datadir
+ infdir=/$PACKAGE_BASE_NAME/inf
+ htmldir=/$PACKAGE_BASE_NAME/html
+ icondir=/$PACKAGE_BASE_NAME/icons
+ manualdir=/$PACKAGE_BASE_NAME/manual
+ ldifdir=/$PACKAGE_BASE_NAME/data
+ # relative to libdir
+ # CGI program directory
+ cgibindir=/$PACKAGE_BASE_NAME/cgi-bin
+ # where our private Apache modules will go
+ admmoddir=/$PACKAGE_BASE_NAME/modules
+ perldir=/$PACKAGE_BASE_NAME/perl
+ # log files, relative to localstatedir
+ admlogdir=/log/$PACKAGE_BASE_NAME
+ # the pid dir, relative to localstatedir
+ piddir=/run/$PACKAGE_BASE_NAME
+ # location of property/resource files, relative to datadir
+ propertydir=/$PACKAGE_BASE_NAME/properties
+fi
-# log files, relative to localstatedir
-logdir=/log/$PACKAGE_BASE_NAME
-# the pid dir, relative to localstatedir
-piddir=/run/$PACKAGE_BASE_NAME
pidfile=$instancename.pid
-# location of property/resource files, relative to datadir
-propertydir=/$PACKAGE_BASE_NAME/properties
-
-# where our private Apache modules will go
-# relative to libdir
-admmoddir=/$PACKAGE_BASE_NAME/modules
-
-# relative to libdir
-perldir=/$PACKAGE_BASE_NAME/perl
# write out paths for binary components
AC_SUBST(PACKAGE_NAME)
@@ -331,7 +336,7 @@
AC_SUBST(mimemagic)
AC_SUBST(httpduser)
AC_SUBST(httpdgroup)
-AC_SUBST(logdir)
+AC_SUBST(admlogdir)
AC_SUBST(piddir)
AC_SUBST(pidfile)
AC_SUBST(admservport)
Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/adminserver/ltmain.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ltmain.sh 27 Jun 2007 18:32:46 -0000 1.5
+++ ltmain.sh 21 Aug 2007 20:46:45 -0000 1.6
@@ -46,10 +46,16 @@
VERSION=1.5.22
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
# Check that we have a working $echo.
@@ -105,12 +111,14 @@
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
- save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+ eval "if test \"\${$lt_var+set}\" = set; then
+ save_$lt_var=\$$lt_var
+ $lt_var=C
+ export $lt_var
+ fi"
+done
# Make sure IFS has a sensible default
lt_nl='
@@ -136,6 +144,8 @@
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
#####################################
# Shell function definitions:
@@ -327,7 +337,17 @@
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
- my_xdir="$my_gentop/$my_xlib"
+ my_xlib_u=$my_xlib
+ while :; do
+ case " $extracted_archives " in
+ *" $my_xlib_u "*)
+ extracted_serial=`expr $extracted_serial + 1`
+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
+ *) break ;;
+ esac
+ done
+ extracted_archives="$extracted_archives $my_xlib_u"
+ my_xdir="$my_gentop/$my_xlib_u"
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
@@ -758,6 +778,7 @@
*.f90) xform=f90 ;;
*.for) xform=for ;;
*.java) xform=java ;;
+ *.obj) xform=obj ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1159,9 @@
for arg
do
case $arg in
- -all-static | -static)
- if test "X$arg" = "X-all-static"; then
+ -all-static | -static | -static-libtool-libs)
+ case $arg in
+ -all-static)
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
fi
@@ -1147,12 +1169,20 @@
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
- else
+ ;;
+ -static)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=built
- fi
+ ;;
+ -static-libtool-libs)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ prefer_static_libs=yes
+ ;;
+ esac
build_libtool_libs=no
build_old_libs=yes
break
@@ -1712,7 +1742,7 @@
continue
;;
- -static)
+ -static | -static-libtool-libs)
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
@@ -2490,7 +2520,9 @@
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ { { test "$prefer_static_libs" = no ||
+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ test -z "$old_library"; }; then
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
@@ -3186,7 +3218,7 @@
# which has an extra 1 added just for fun
#
case $version_type in
- darwin|linux|osf|windows)
+ darwin|linux|osf|windows|none)
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
@@ -3410,11 +3442,11 @@
fi
# Eliminate all temporary directories.
- for path in $notinst_path; do
- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
- done
+# for path in $notinst_path; do
+# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+# done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
@@ -3515,13 +3547,12 @@
int main() { return 0; }
EOF
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
ldd_output=`ldd conftest`
for i in $deplibs; do
name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" -ne "0"; then
+ if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -3560,9 +3591,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $i
- # Did it work?
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
@@ -3594,7 +3623,7 @@
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
- $echo "*** make it link in! You will probably need to install it or some"
+ $echo "*** make it link in! You will probably need to install it or some"
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
@@ -4239,12 +4268,14 @@
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec
+ # -Wl from whole_archive_flag_spec and hope we can get by with
+ # turning comma into space..
wl=
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@@ -4692,16 +4723,16 @@
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
else
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
fi
;;
* )
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
;;
esac
;;
@@ -4716,13 +4747,13 @@
# really was required.
# Nullify the symbol file.
- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
fi
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4840,7 @@
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
else
# fast_install is set to needless
relink_command=
@@ -4846,7 +4877,7 @@
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
fi
# Quote $echo for shipping.
@@ -5253,6 +5284,18 @@
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
+else
+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5438,7 @@
;;
esac
$echo >> $output "\
- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+ \$echo \"\$0: cannot exec \$program \$*\"
exit $EXIT_FAILURE
fi
else
@@ -5581,7 +5624,7 @@
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -5926,9 +5969,9 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
else
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6180,7 @@
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
$show "$relink_command"
if $run eval "$relink_command"; then :
@@ -6413,12 +6456,15 @@
fi
# Restore saved environment variables
- if test "${save_LC_ALL+set}" = set; then
- LC_ALL="$save_LC_ALL"; export LC_ALL
- fi
- if test "${save_LANG+set}" = set; then
- LANG="$save_LANG"; export LANG
- fi
+ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ do
+ eval "if test \"\${save_$lt_var+set}\" = set; then
+ $lt_var=\$save_$lt_var; export $lt_var
+ else
+ $lt_unset $lt_var
+ fi"
+ done
+
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
@@ -6775,9 +6821,9 @@
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
- try to export only the symbols listed in SYMFILE
+ try to export only the symbols listed in SYMFILE
-export-symbols-regex REGEX
- try to export only the symbols matching REGEX
+ try to export only the symbols matching REGEX
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
@@ -6791,9 +6837,11 @@
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
- -static do not do any dynamic linking of libtool libraries
+ -static do not do any dynamic linking of uninstalled libtool libraries
+ -static-libtool-libs
+ do not do any dynamic linking of libtool libraries
-version-info CURRENT[:REVISION[:AGE]]
- specify library version info [each variable defaults to 0]
+ specify library version info [each variable defaults to 0]
All other options (arguments beginning with \`-') are ignored.
16 years, 7 months
[Fedora-directory-commits] ldapserver Makefile.am, 1.55, 1.56 Makefile.in, 1.67, 1.68
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16284
Modified Files:
Makefile.am Makefile.in
Log Message:
Added sasl link to ldap-agent binary.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- Makefile.am 9 Aug 2007 23:59:22 -0000 1.55
+++ Makefile.am 20 Aug 2007 18:33:31 -0000 1.56
@@ -859,7 +859,7 @@
ldap/servers/slapd/agtmmap.c
ldap_agent_bin_CPPFLAGS = $(AM_CPPFLAGS) @netsnmp_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-ldap_agent_bin_LDADD = $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK) $(NETSNMP_LINK)
+ldap_agent_bin_LDADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK) $(NETSNMP_LINK)
#------------------------
# ldclt
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- Makefile.in 13 Aug 2007 15:35:35 -0000 1.67
+++ Makefile.in 20 Aug 2007 18:33:32 -0000 1.68
@@ -561,7 +561,7 @@
ldap_agent_bin_OBJECTS = $(am_ldap_agent_bin_OBJECTS)
ldap_agent_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am__ldclt_bin_SOURCES_DIST = ldap/servers/slapd/tools/ldaptool-sasl.c \
ldap/servers/slapd/tools/ldclt/data.c \
ldap/servers/slapd/tools/ldclt/ldapfct.c \
@@ -1752,7 +1752,7 @@
ldap/servers/slapd/agtmmap.c
ldap_agent_bin_CPPFLAGS = $(AM_CPPFLAGS) @netsnmp_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-ldap_agent_bin_LDADD = $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK) $(NETSNMP_LINK)
+ldap_agent_bin_LDADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK) $(NETSNMP_LINK)
#------------------------
# ldclt
16 years, 7 months
[Fedora-directory-commits] ldapserver/m4 db.m4,1.8,1.9
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/m4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6373/m4
Modified Files:
db.m4
Log Message:
Resolves: 253582
Summary: Check if pkgconfig is available before trying to use it.
Index: db.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/db.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- db.m4 30 Mar 2007 18:20:06 -0000 1.8
+++ db.m4 20 Aug 2007 17:49:17 -0000 1.9
@@ -84,8 +84,12 @@
# last resort
# Although the other db_* variables are correctly assigned at this point,
# db_bindir needs to be set by pkg-config if possible (e.g., on 64-bit Solaris)
-if $PKG_CONFIG --exists db; then
- db_bindir=`$PKG_CONFIG --variable=bindir db`
+if test -n "$PKG_CONFIG"; then
+ if $PKG_CONFIG --exists db; then
+ db_bindir=`$PKG_CONFIG --variable=bindir db`
+ else
+ db_bindir=/usr/bin
+ fi
else
db_bindir=/usr/bin
fi
16 years, 7 months