[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv DSAdmin.java, 1.4, 1.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8374/src/com/netscape/admin/dirserv
Modified Files:
DSAdmin.java
Log Message:
Resolves: #247215
Summary: Reimplement ds_remove without setuputil code (comment #16)
Description: if searching sieDN returns NO_SUCH_OBJECT, skips the remove
operation and shows "Success!" dialog.
Index: DSAdmin.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSAdmin.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DSAdmin.java 2 Jul 2007 19:44:08 -0000 1.4
+++ DSAdmin.java 11 Jul 2007 01:26:23 -0000 1.5
@@ -986,15 +986,25 @@
LDAPEntry sieEntry = null;
try {
sieEntry = ldc.read( sieDN, attrs );
- } catch (Exception ex ) {
- Debug.println( "DSAdmin:removeServer <" + sieDN + "> " + ex);
+ } catch ( LDAPException ex ) {
+ Debug.println("DSAdmin:removeServer <" + sieDN + "> " + ex);
+ // Ignore the no such object error; sieEntry is already removed
+ if ( ex.getLDAPResultCode() == ex.NO_SUCH_OBJECT ) {
+ status = true;
+ } else {
+ args[1] = ex.toString();
+ DSUtil.showErrorDialog(frame, "removeinstance", args);
+ _removed = false; // problem reading sieEntry
+ return false;
+ }
+ } catch ( Exception ex ) {
+ Debug.println("DSAdmin:removeServer <" + sieDN + "> " + ex);
args[1] = ex.toString();
- DSUtil.showErrorDialog(frame, "removeinstance",
- args);
- _removed = false; // remove failed
+ DSUtil.showErrorDialog(frame, "removeinstance", args);
+ _removed = false; // problem reading sieEntry
return false;
}
- if (sieEntry != null ) {
+ if ( sieEntry != null ) {
try {
status = delete_sieTree(sieEntry );
} catch (Exception ex ) {
@@ -1009,7 +1019,7 @@
// Now we need to remove the reference of this server
status = remove_serverInstance(sieDN);
}
- if ( status == false) {
+ if ( status == false ) {
args[1] = "";
DSUtil.showErrorDialog(frame, "removesie",
args);
16 years, 11 months
[Fedora-directory-commits] adminserver/admserv/cgi-src40 ds_remove.in, NONE, 1.1 ds_remove.res, NONE, 1.1
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8193/admserv/cgi-src40
Added Files:
ds_remove.in ds_remove.res
Log Message:
Resolves: #247215
Summary: Reimplement ds_remove without setuputil code (comment #7)
Description: adding Perl version of ds_remove
--- NEW FILE ds_remove.in ---
#!/usr/bin/env perl
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
use lib '@perldir@';
use strict;
use File::Basename;
use File::Path;
use CGI qw(:cgi :oldstyle_urls);
use Inf;
use AdminUtil;
use Util;
use FileConn;
use Resource;
sub remove_tree
{
my $centry = shift;
my $key = shift;
my $instname = shift;
my $isparent = shift;
foreach my $path ( @{$centry->{$key}} )
{
my $rmdir = "";
if ( 1 == $isparent )
{
$rmdir = dirname($path);
}
else
{
$rmdir = $path;
}
if ( -d $rmdir && $rmdir =~ /$instname/ )
{
my $rc = rmtree($rmdir);
print STDERR "rmtree: $rmdir => RC: $rc\n";
}
}
}
sub remove_pidfile
{
my ($type, $instdir, $instname) = @_;
my $pattern = "^" . $type . ".*=";
my $pidline = `grep $pattern $instdir/start-slapd`;
chomp($pidline);
my ($key, $pidfile) = split(/=/, $pidline);
if ( -e $pidfile && $pidfile =~ /$instname/ )
{
unlink($pidfile);
}
}
my $res = new Resource("@propertydir(a)/ds_remove.res",
"@propertydir(a)/setup-ds-admin.res",
"@propertydir(a)/setup-ds.res");
# parse the input parameters
my $query = new CGI;
# call ds_newinst as a GET (GET or POST works, GET is simpler)
$ENV{REQUEST_METHOD} = "GET";
$ENV{QUERY_STRING} = $query->query_string();
my $instname = $query->param('InstanceName');
my ($slapd, $inst) = split(/-/, $instname, 2);
my @errs;
my $inf = createInfFromConfig("@instconfigdir@/slapd-$inst", $inst, \@errs);
if (@errs) {
print "Content-type: text/html\n\n";
print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
print "NMC_Status: 1\n";
exit 1;
}
# add the parmeters necessary to configure this DS to be managed
# by the console and to be registered with the config DS - these
# are usually passed in via the CGI params, or use reasonable
# default values
my $admConf = getAdmConf("@instconfigdir@/admin-serv");
$inf->{General}->{ConfigDirectoryLdapURL} = $query->param('ldap_url') ||
$admConf->{ldapurl};
$inf->{General}->{AdminDomain} = $query->param('admin_domain') ||
$admConf->{AdminDomain};
# read the config file to find out the paths
my $dseldif = "@instconfigdir(a)/$instname/dse.ldif";
my $conn = new FileConn($dseldif);
my $dn = "cn=config";
my $entry = $conn->search($dn, "base", "(cn=*)", 0);
if (!$entry) {
print "Content-type: text/html\n\n";
print "NMC_ErrInfo: Search $dn in $dseldif failed: $entry\n";
print "NMC_Status: 1\n";
exit 1;
}
# stop the server first
my $instdir = "";
foreach my $path ( @{$entry->{"nsslapd-instancedir"}} )
{
if ( -d $path )
{
my $prog = $path . "/stop-slapd";
if (-x $prog) {
$? = 0;
# run the CGI
my $output = `$prog 2>&1`;
my $status = $?;
if ($status) {
# Ignore the stop failure
print "Content-type: text/html\n\n";
print "NMC_ErrInfo: Could not stop directory server: $output\n";
}
$instdir = $path; # need to use it later...
} else {
print "Content-type: text/html\n\n";
print "NMC_ErrInfo: The program $prog does not exist\n";
print "NMC_Status: 1\n";
exit 1;
}
}
}
# Unregister the server from the configuration ds
# get config ds url from input or admconf
# get admin id from input or admconf
# must get admin password from input (PASSWORD_PIPE?)
# get admin domain
# config ds info
if (!unregisterDSWithConfigDS($inst, \@errs, $inf)) {
print "Content-type: text/html\n\n";
print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
print "NMC_Status: 1\n";
exit 1;
}
# remove physical dirs/files
$dn = "cn=config,cn=ldbm database,cn=plugins,cn=config";
my $dbentry = $conn->search($dn, "base", "(cn=*)", 0);
if (!$dbentry) {
print "Content-type: text/html\n\n";
print "NMC_ErrInfo: Search $dn in $dseldif failed: $dbentry\n";
print "NMC_Status: 1\n";
exit 1;
}
remove_tree($dbentry, "nsslapd-directory", $instname, 1);
remove_tree($dbentry, "nsslapd-db-logdirectory", $instname, 1);
remove_tree($entry, "nsslapd-lockdir", $instname);
remove_tree($entry, "nsslapd-tmpdir", $instname);
remove_tree($entry, "nsslapd-bakdir", $instname, 1);
remove_tree($entry, "nsslapd-errorlog", $instname, 1);
remove_tree($entry, "nsslapd-schemadir", $instname, 1);
# instance dir
if ( -d $instdir )
{
# clean up pid files (if any)
remove_pidfile("STARTPIDFILE", $instdir, $instname);
remove_pidfile("PIDFILE", $instdir, $instname);
my $rc = rmtree($instdir);
}
# if we got here, report success
print "Content-type: text/html\n\n";
print "NMC_Status: 0\n";
exit 0;
--- NEW FILE ds_remove.res ---
# resources for ds_remove
16 years, 11 months
[Fedora-directory-commits] adminserver/admserv/newinst/src AdminUtil.pm.in, 1.8, 1.9 adminserver.map.in, 1.5, 1.6 configdsroot.map.in, 1.4, 1.5 dirserver.map.in, 1.5, 1.6 register_param.map.in, 1.6, 1.7
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8193/admserv/newinst/src
Modified Files:
AdminUtil.pm.in adminserver.map.in configdsroot.map.in
dirserver.map.in register_param.map.in
Log Message:
Resolves: #247215
Summary: Reimplement ds_remove without setuputil code (comment #7)
Description: adding Perl version of ds_remove
Index: AdminUtil.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminUtil.pm.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AdminUtil.pm.in 4 Jul 2007 01:31:33 -0000 1.8
+++ AdminUtil.pm.in 11 Jul 2007 01:20:21 -0000 1.9
@@ -42,11 +42,13 @@
@EXPORT = qw(getAdmConf getConfigDSConn createConfigDS createSubDS
updateAdmConf updateAdmpw updateLocalConf importCACert
getLocalConfigDS getPset registerDSWithConfigDS
- registerManyDSWithConfigDS createSubDSNoConn);
+ registerManyDSWithConfigDS createSubDSNoConn
+ unregisterDSWithConfigDS);
@EXPORT_OK = qw(getAdmConf getConfigDSConn createConfigDS createSubDS
updateAdmConf updateAdmpw updateLocalConf importCACert
getLocalConfigDS getPset registerDSWithConfigDS
- registerManyDSWithConfigDS createSubDSNoConn);
+ registerManyDSWithConfigDS createSubDSNoConn
+ unregisterDSWithConfigDS);
# load perldap
use Mozilla::LDAP::Conn;
@@ -633,6 +635,32 @@
my $conn = shift;
my $admConf = shift;
my $configdir = shift || "@instconfigdir@";
+
+ my $rc = registerDSWithConfigDSExt(1, $servid, $errs, $inf,
+ $conn, $admConf, $configdir);
+ return $rc;
+}
+
+sub unregisterDSWithConfigDS {
+ my $servid = shift;
+ my $errs = shift;
+ my $inf = shift;
+ my $conn = shift;
+ my $admConf = shift;
+ my $configdir = shift || "@instconfigdir@";
+ my $rc = registerDSWithConfigDSExt(0, $servid, $errs, $inf,
+ $conn, $admConf, $configdir);
+ return $rc;
+}
+
+sub registerDSWithConfigDSExt {
+ my $isRegister = shift;
+ my $servid = shift;
+ my $errs = shift;
+ my $inf = shift;
+ my $conn = shift;
+ my $admConf = shift;
+ my $configdir = shift || "@instconfigdir@";
my $inst;
my $needclose;
@@ -682,10 +710,19 @@
}
}
- # add the Admin Server configuration entries
- my @ldiffiles = ("@ldifdir(a)/10dsdata.ldif.tmpl",
- "@ldifdir(a)/11dstasks.ldif.tmpl"
+ my @ldiffiles = ();
+ if ($isRegister)
+ {
+ # add the Admin Server configuration entries
+ @ldiffiles = ("@ldifdir(a)/10dsdata.ldif.tmpl",
+ "@ldifdir(a)/11dstasks.ldif.tmpl"
);
+ }
+ else
+ {
+ # remove the Admin Server configuration entries
+ @ldiffiles = ("@ldifdir(a)/10rm_dsdata.ldif.tmpl");
+ }
my $setupinf = new Inf("@infdir(a)/setup.inf");
my $slapdinf = new Inf("@infdir(a)/slapd.inf");
@@ -708,4 +745,3 @@
return @{$errs} ? 0 : 1;
}
-
Index: adminserver.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/adminserver.map.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- adminserver.map.in 6 Jul 2007 18:06:19 -0000 1.5
+++ adminserver.map.in 11 Jul 2007 01:20:21 -0000 1.6
@@ -48,6 +48,9 @@
# * If the right-hand value is in " (doublequote), the value is passed as is.
# * If the right-hand value is not in any quote, the value should be found
# in either of the setup inf file (static) or the install inf file (dynamic).
+# * The right-hand value could have the format Key:"default_value".
+# In this case, Key is searched in the inf files first.
+# If the Key is not found, the default_value is set.
# * Variables surrounded by @ (e.g., @configdir@) are replaced with the
# system path at the compile time.
# * The right-hand value can contain variables surrounded by % (e.g., %asid%)
Index: configdsroot.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/configdsroot.map.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configdsroot.map.in 25 Jun 2007 18:23:53 -0000 1.4
+++ configdsroot.map.in 11 Jul 2007 01:20:21 -0000 1.5
@@ -45,6 +45,9 @@
# * If the right-hand value is in " (doublequote), the value is passed as is.
# * If the right-hand value is not in any quote, the value should be found
# in either of the setup inf file (static) or the install inf file (dynamic).
+# * The right-hand value could have the format Key:"default_value".
+# In this case, Key is searched in the inf files first.
+# If the Key is not found, the default_value is set.
# * Variables surrounded by @ (e.g., @configdir@) are replaced with the
# system path at the compile time.
# * The right-hand value can contain variables surrounded by % (e.g., %asid%)
@@ -66,7 +69,7 @@
ds_version = Version
ds_baseversion = BaseVersion
ds_port = ServerPort
-ds_secure_port = "636"
+ds_secure_port = SecureServerPort:"636"
ds_suffix = Suffix
dsid = ServerIdentifier
Index: dirserver.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/dirserver.map.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dirserver.map.in 28 Jun 2007 16:24:41 -0000 1.5
+++ dirserver.map.in 11 Jul 2007 01:20:21 -0000 1.6
@@ -48,6 +48,9 @@
# * If the right-hand value is in " (doublequote), the value is passed as is.
# * If the right-hand value is not in any quote, the value should be found
# in either of the setup inf file (static) or the install inf file (dynamic).
+# * The right-hand value could have the format Key:"default_value".
+# In this case, Key is searched in the inf files first.
+# If the Key is not found, the default_value is set.
# * Variables surrounded by @ (e.g., @configdir@) are replaced with the
# system path at the compile time.
# * The right-hand value can contain variables surrounded by % (e.g., %asid%)
@@ -67,7 +70,7 @@
dsid = ServerIdentifier
ds_user = SuiteSpotUserID
ds_port = ServerPort
-ds_secure_port = "636"
+ds_secure_port = SecureServerPort:"636"
rootdn = RootDN
ds_suffix = Suffix
ds_buildnum = BuildNumber
Index: register_param.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_param.map.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- register_param.map.in 6 Jul 2007 18:06:19 -0000 1.6
+++ register_param.map.in 11 Jul 2007 01:20:21 -0000 1.7
@@ -48,6 +48,9 @@
# * If the right-hand value is in " (doublequote), the value is passed as is.
# * If the right-hand value is not in any quote, the value should be found
# in either of the setup inf file (static) or the install inf file (dynamic).
+# * The right-hand value could have the format Key:"default_value".
+# In this case, Key is searched in the inf files first.
+# If the Key is not found, the default_value is set.
# * Variables surrounded by @ (e.g., @configdir@) are replaced with the
# system path at the compile time.
# * The right-hand value can contain variables surrounded by % (e.g., %asid%)
@@ -84,7 +87,7 @@
dsid = ServerIdentifier
ds_user = SuiteSpotUserID
ds_port = ServerPort
-ds_secure_port = "636"
+ds_secure_port = SecureServerPort:"636"
rootdn = RootDN
ds_suffix = Suffix
ds_buildnum = BuildNumber
16 years, 11 months
[Fedora-directory-commits] adminserver/admserv/schema/ldif 10rm_dsdata.ldif.tmpl, 1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/schema/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8193/admserv/schema/ldif
Modified Files:
10rm_dsdata.ldif.tmpl
Log Message:
Resolves: #247215
Summary: Reimplement ds_remove without setuputil code (comment #7)
Description: adding Perl version of ds_remove
Index: 10rm_dsdata.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/10rm_dsdata.ldif.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 10rm_dsdata.ldif.tmpl 6 Jul 2007 17:41:18 -0000 1.1
+++ 10rm_dsdata.ldif.tmpl 11 Jul 2007 01:20:22 -0000 1.2
@@ -30,8 +30,5 @@
dn: cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
changetype: delete
-dn: cn=configuration,cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
-changetype: delete
-
dn: ou="cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot",ou=UserPreferences, ou=%domain%, o=NetscapeRoot
changetype: delete
16 years, 11 months
[Fedora-directory-commits] adminserver Makefile.am, 1.22, 1.23 Makefile.in, 1.22, 1.23 aclocal.m4, 1.17, 1.18 configure, 1.20, 1.21
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8193
Modified Files:
Makefile.am Makefile.in aclocal.m4 configure
Log Message:
Resolves: #247215
Summary: Reimplement ds_remove without setuputil code (comment #7)
Description: adding Perl version of ds_remove
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.am 4 Jul 2007 01:31:32 -0000 1.22
+++ Makefile.am 11 Jul 2007 01:20:21 -0000 1.23
@@ -136,6 +136,7 @@
admserv/schema/ldif/01nsroot.ldif.tmpl \
admserv/schema/ldif/02globalpreferences.ldif.tmpl \
admserv/schema/ldif/10dsdata.ldif.tmpl \
+ admserv/schema/ldif/10rm_dsdata.ldif.tmpl \
admserv/schema/ldif/11dstasks.ldif.tmpl \
admserv/schema/ldif/12dsconfig.mod.tmpl \
admserv/schema/ldif/13dsschema.mod.tmpl \
@@ -158,10 +159,10 @@
config statpingserv viewdata dsconfig monreplication restartsrv \
statusping viewlog htmladmin sec-activate stopsrv download help \
ds_start ds_restart ds_shutdown ds_ldif2db ds_db2ldif ds_bak2db \
- ds_db2bak ds_listdb ds_rmdb ds_remove ds_snmpctrl ds_vlvindex ds_addindex
+ ds_db2bak ds_listdb ds_rmdb ds_snmpctrl ds_vlvindex ds_addindex
bin_SCRIPTS = admserv/newinst/src/register_server.pl
-cgibin_SCRIPTS = admserv/cgi-src40/ds_create
+cgibin_SCRIPTS = admserv/cgi-src40/ds_create admserv/cgi-src40/ds_remove
nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin
cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl \
@@ -294,11 +295,6 @@
ds_rmdb_LDADD = libdsa.a $(DEFAULT_LIBS)
ds_rmdb_LINK = $(MYLINK)
-ds_remove_SOURCES = admserv/cgi-ds/ds_remove.c admserv/cgi-ds/init_ds_env.c
-ds_remove_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
-ds_remove_LDADD = libdsa.a $(DEFAULT_LIBS)
-ds_remove_LINK = $(MYLINK)
-
ds_snmpctrl_SOURCES = admserv/cgi-ds/ds_snmpctrl.c admserv/cgi-ds/init_ds_env.c
ds_snmpctrl_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_snmpctrl_LDADD = libdsa.a $(DEFAULT_LIBS)
@@ -374,7 +370,8 @@
# regular property files go here
property_DATA = admserv/newinst/src/setup-ds-admin.res \
admserv/newinst/src/migrate-ds-admin.res \
- admserv/cgi-src40/ds_create.res
+ admserv/cgi-src40/ds_create.res \
+ admserv/cgi-src40/ds_remove.res
# French resource bundles (for the French localization in the future)
#RESOURCE_BUNDLES_FR = foo_fr.res
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.in 4 Jul 2007 01:31:32 -0000 1.22
+++ Makefile.in 11 Jul 2007 01:20:21 -0000 1.23
@@ -51,8 +51,8 @@
help$(EXEEXT) ds_start$(EXEEXT) ds_restart$(EXEEXT) \
ds_shutdown$(EXEEXT) ds_ldif2db$(EXEEXT) ds_db2ldif$(EXEEXT) \
ds_bak2db$(EXEEXT) ds_db2bak$(EXEEXT) ds_listdb$(EXEEXT) \
- ds_rmdb$(EXEEXT) ds_remove$(EXEEXT) ds_snmpctrl$(EXEEXT) \
- ds_vlvindex$(EXEEXT) ds_addindex$(EXEEXT)
+ ds_rmdb$(EXEEXT) ds_snmpctrl$(EXEEXT) ds_vlvindex$(EXEEXT) \
+ ds_addindex$(EXEEXT)
DIST_COMMON = README $(am__configure_deps) $(dist_help_DATA) \
$(dist_html_DATA) $(dist_icon_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -167,10 +167,6 @@
admserv/cgi-ds/ds_listdb-init_ds_env.$(OBJEXT)
ds_listdb_OBJECTS = $(am_ds_listdb_OBJECTS)
ds_listdb_DEPENDENCIES = libdsa.a $(am__DEPENDENCIES_2)
-am_ds_remove_OBJECTS = admserv/cgi-ds/ds_remove-ds_remove.$(OBJEXT) \
- admserv/cgi-ds/ds_remove-init_ds_env.$(OBJEXT)
-ds_remove_OBJECTS = $(am_ds_remove_OBJECTS)
-ds_remove_DEPENDENCIES = libdsa.a $(am__DEPENDENCIES_2)
am_ds_restart_OBJECTS = admserv/cgi-ds/ds_restart-restart.$(OBJEXT) \
admserv/cgi-ds/ds_restart-init_ds_env.$(OBJEXT)
ds_restart_OBJECTS = $(am_ds_restart_OBJECTS)
@@ -274,8 +270,7 @@
$(download_SOURCES) $(ds_addindex_SOURCES) \
$(ds_bak2db_SOURCES) $(ds_db2bak_SOURCES) \
$(ds_db2ldif_SOURCES) $(ds_ldif2db_SOURCES) \
- $(ds_listdb_SOURCES) $(ds_remove_SOURCES) \
- $(ds_restart_SOURCES) $(ds_rmdb_SOURCES) \
+ $(ds_listdb_SOURCES) $(ds_restart_SOURCES) $(ds_rmdb_SOURCES) \
$(ds_shutdown_SOURCES) $(ds_snmpctrl_SOURCES) \
$(ds_start_SOURCES) $(ds_vlvindex_SOURCES) $(dsconfig_SOURCES) \
$(help_SOURCES) $(htmladmin_SOURCES) $(monreplication_SOURCES) \
@@ -289,8 +284,7 @@
$(download_SOURCES) $(ds_addindex_SOURCES) \
$(ds_bak2db_SOURCES) $(ds_db2bak_SOURCES) \
$(ds_db2ldif_SOURCES) $(ds_ldif2db_SOURCES) \
- $(ds_listdb_SOURCES) $(ds_remove_SOURCES) \
- $(ds_restart_SOURCES) $(ds_rmdb_SOURCES) \
+ $(ds_listdb_SOURCES) $(ds_restart_SOURCES) $(ds_rmdb_SOURCES) \
$(ds_shutdown_SOURCES) $(ds_snmpctrl_SOURCES) \
$(ds_start_SOURCES) $(ds_vlvindex_SOURCES) $(dsconfig_SOURCES) \
$(help_SOURCES) $(htmladmin_SOURCES) $(monreplication_SOURCES) \
@@ -401,7 +395,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -576,6 +569,7 @@
admserv/schema/ldif/01nsroot.ldif.tmpl \
admserv/schema/ldif/02globalpreferences.ldif.tmpl \
admserv/schema/ldif/10dsdata.ldif.tmpl \
+ admserv/schema/ldif/10rm_dsdata.ldif.tmpl \
admserv/schema/ldif/11dstasks.ldif.tmpl \
admserv/schema/ldif/12dsconfig.mod.tmpl \
admserv/schema/ldif/13dsschema.mod.tmpl \
@@ -595,7 +589,7 @@
admserv/newinst/src/asmigrate.map
bin_SCRIPTS = admserv/newinst/src/register_server.pl
-cgibin_SCRIPTS = admserv/cgi-src40/ds_create
+cgibin_SCRIPTS = admserv/cgi-src40/ds_create admserv/cgi-src40/ds_remove
nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin
cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl \
admserv/newinst/src/migrate-ds-admin.pl
@@ -715,10 +709,6 @@
ds_rmdb_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_rmdb_LDADD = libdsa.a $(DEFAULT_LIBS)
ds_rmdb_LINK = $(MYLINK)
-ds_remove_SOURCES = admserv/cgi-ds/ds_remove.c admserv/cgi-ds/init_ds_env.c
-ds_remove_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
-ds_remove_LDADD = libdsa.a $(DEFAULT_LIBS)
-ds_remove_LINK = $(MYLINK)
ds_snmpctrl_SOURCES = admserv/cgi-ds/ds_snmpctrl.c admserv/cgi-ds/init_ds_env.c
ds_snmpctrl_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_snmpctrl_LDADD = libdsa.a $(DEFAULT_LIBS)
@@ -785,7 +775,8 @@
# regular property files go here
property_DATA = admserv/newinst/src/setup-ds-admin.res \
admserv/newinst/src/migrate-ds-admin.res \
- admserv/cgi-src40/ds_create.res
+ admserv/cgi-src40/ds_create.res \
+ admserv/cgi-src40/ds_remove.res
# these are for the config files and scripts that we need to generate and replace
@@ -1144,15 +1135,6 @@
ds_listdb$(EXEEXT): $(ds_listdb_OBJECTS) $(ds_listdb_DEPENDENCIES)
@rm -f ds_listdb$(EXEEXT)
$(ds_listdb_LINK) $(ds_listdb_LDFLAGS) $(ds_listdb_OBJECTS) $(ds_listdb_LDADD) $(LIBS)
-admserv/cgi-ds/ds_remove-ds_remove.$(OBJEXT): \
- admserv/cgi-ds/$(am__dirstamp) \
- admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
-admserv/cgi-ds/ds_remove-init_ds_env.$(OBJEXT): \
- admserv/cgi-ds/$(am__dirstamp) \
- admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
-ds_remove$(EXEEXT): $(ds_remove_OBJECTS) $(ds_remove_DEPENDENCIES)
- @rm -f ds_remove$(EXEEXT)
- $(ds_remove_LINK) $(ds_remove_LDFLAGS) $(ds_remove_OBJECTS) $(ds_remove_LDADD) $(LIBS)
admserv/cgi-ds/ds_restart-restart.$(OBJEXT): \
admserv/cgi-ds/$(am__dirstamp) \
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
@@ -1419,8 +1401,6 @@
-rm -f admserv/cgi-ds/ds_ldif2db-init_ds_env.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_listdb-ds_listdb.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_listdb-init_ds_env.$(OBJEXT)
- -rm -f admserv/cgi-ds/ds_remove-ds_remove.$(OBJEXT)
- -rm -f admserv/cgi-ds/ds_remove-init_ds_env.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_restart-init_ds_env.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_restart-restart.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_rmdb-ds_rmdb.$(OBJEXT)
@@ -1517,8 +1497,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-init_ds_env.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_listdb-ds_listdb.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_listdb-init_ds_env.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_restart-init_ds_env.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_restart-restart.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_rmdb-ds_rmdb.Po(a)am__quote@
@@ -1941,34 +1919,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_listdb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_listdb-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`
-admserv/cgi-ds/ds_remove-ds_remove.o: admserv/cgi-ds/ds_remove.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_remove-ds_remove.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Tpo" -c -o admserv/cgi-ds/ds_remove-ds_remove.o `test -f 'admserv/cgi-ds/ds_remove.c' || echo '$(srcdir)/'`admserv/cgi-ds/ds_remove.c; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/ds_remove.c' object='admserv/cgi-ds/ds_remove-ds_remove.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_remove-ds_remove.o `test -f 'admserv/cgi-ds/ds_remove.c' || echo '$(srcdir)/'`admserv/cgi-ds/ds_remove.c
-
-admserv/cgi-ds/ds_remove-ds_remove.obj: admserv/cgi-ds/ds_remove.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_remove-ds_remove.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Tpo" -c -o admserv/cgi-ds/ds_remove-ds_remove.obj `if test -f 'admserv/cgi-ds/ds_remove.c'; then $(CYGPATH_W) 'admserv/cgi-ds/ds_remove.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/ds_remove.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/ds_remove.c' object='admserv/cgi-ds/ds_remove-ds_remove.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_remove-ds_remove.obj `if test -f 'admserv/cgi-ds/ds_remove.c'; then $(CYGPATH_W) 'admserv/cgi-ds/ds_remove.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/ds_remove.c'; fi`
-
-admserv/cgi-ds/ds_remove-init_ds_env.o: admserv/cgi-ds/init_ds_env.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_remove-init_ds_env.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_remove-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_remove-init_ds_env.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_remove-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c
-
-admserv/cgi-ds/ds_remove-init_ds_env.obj: admserv/cgi-ds/init_ds_env.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_remove-init_ds_env.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_remove-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_remove-init_ds_env.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_remove-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`
-
admserv/cgi-ds/ds_restart-restart.o: admserv/cgi-ds/restart.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_restart_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_restart-restart.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_restart-restart.Tpo" -c -o admserv/cgi-ds/ds_restart-restart.o `test -f 'admserv/cgi-ds/restart.c' || echo '$(srcdir)/'`admserv/cgi-ds/restart.c; \
@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_restart-restart.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_restart-restart.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_restart-restart.Tpo"; exit 1; fi
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/adminserver/aclocal.m4,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- aclocal.m4 4 Jul 2007 01:31:32 -0000 1.17
+++ aclocal.m4 11 Jul 2007 01:20:21 -0000 1.18
@@ -1578,27 +1578,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -4305,9 +4288,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -4441,11 +4421,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -4457,7 +4437,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -4537,7 +4517,7 @@
link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -6373,7 +6353,6 @@
done
done
done
-IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6406,7 +6385,6 @@
done
])
SED=$lt_cv_path_SED
-AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- configure 4 Jul 2007 01:31:32 -0000 1.20
+++ configure 11 Jul 2007 01:20:21 -0000 1.21
@@ -468,7 +468,7 @@
ac_default_prefix=/opt/fedora-ds
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 LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf 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 EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX!
XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf 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_files=''
# Initialize some variables set by options.
@@ -3832,7 +3832,6 @@
done
done
done
-IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -3867,7 +3866,6 @@
fi
SED=$lt_cv_path_SED
-
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
@@ -4308,7 +4306,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4311 "configure"' > conftest.$ac_ext
+ echo '#line 4309 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5443,7 +5441,7 @@
# Provide some information about the compiler.
-echo "$as_me:5446:" \
+echo "$as_me:5444:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6506,11 +6504,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6509: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6507: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6513: \$? = $ac_status" >&5
+ echo "$as_me:6511: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6774,11 +6772,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6777: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6775: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6781: \$? = $ac_status" >&5
+ echo "$as_me:6779: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6878,11 +6876,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6881: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6879: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6885: \$? = $ac_status" >&5
+ echo "$as_me:6883: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8343,31 +8341,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 8350 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -9244,7 +9221,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9247 "configure"
+#line 9224 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9344,7 +9321,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9347 "configure"
+#line 9324 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9675,9 +9652,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -9811,11 +9785,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_predep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_postdep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -9827,7 +9801,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -9907,7 +9881,7 @@
link_all_deplibs=$link_all_deplibs
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -11687,11 +11661,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11690: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11664: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11694: \$? = $ac_status" >&5
+ echo "$as_me:11668: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11791,11 +11765,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11794: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11768: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11798: \$? = $ac_status" >&5
+ echo "$as_me:11772: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12323,31 +12297,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 12330 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -12731,9 +12684,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_CXX
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -12867,11 +12817,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_CXX
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_CXX
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -12883,7 +12833,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -12963,7 +12913,7 @@
link_all_deplibs=$link_all_deplibs_CXX
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -13385,11 +13335,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13388: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13338: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13392: \$? = $ac_status" >&5
+ echo "$as_me:13342: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13489,11 +13439,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13492: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13442: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13496: \$? = $ac_status" >&5
+ echo "$as_me:13446: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14934,31 +14884,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 14941 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -15342,9 +15271,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_F77
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -15478,11 +15404,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_F77
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_F77
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -15494,7 +15420,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_F77
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -15574,7 +15500,7 @@
link_all_deplibs=$link_all_deplibs_F77
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -15716,11 +15642,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15719: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15645: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15723: \$? = $ac_status" >&5
+ echo "$as_me:15649: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15984,11 +15910,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15987: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15913: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15991: \$? = $ac_status" >&5
+ echo "$as_me:15917: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16088,11 +16014,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16091: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16017: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16095: \$? = $ac_status" >&5
+ echo "$as_me:16021: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17553,31 +17479,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 17560 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -17961,9 +17866,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_GCJ
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18097,11 +17999,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_GCJ
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_GCJ
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18113,7 +18015,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18193,7 +18095,7 @@
link_all_deplibs=$link_all_deplibs_GCJ
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18445,9 +18347,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_RC
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18581,11 +18480,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_RC
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_RC
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18597,7 +18496,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18677,7 +18576,7 @@
link_all_deplibs=$link_all_deplibs_RC
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -25945,7 +25844,6 @@
s,@CCDEPMODE@,$CCDEPMODE,;t t
s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s,@SED@,$SED,;t t
s,@EGREP@,$EGREP,;t t
s,@LN_S@,$LN_S,;t t
s,@ECHO@,$ECHO,;t t
16 years, 11 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd libglobs.c, 1.17, 1.18 proto-slap.h, 1.27, 1.28 slap.h, 1.22, 1.23
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8017/servers/slapd
Modified Files:
libglobs.c proto-slap.h slap.h
Log Message:
Resolves: #247215
Summary: Reimplement ds_remove without setuputil code (comment #6)
Description: adding nsslapd-instancedir to dse.ldif for ds_remove to find out
the instance dir path.
Index: libglobs.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libglobs.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libglobs.c 22 Jun 2007 21:54:58 -0000 1.17
+++ libglobs.c 11 Jul 2007 01:14:05 -0000 1.18
@@ -542,6 +542,9 @@
CONFIG_CONSTANT_STRING, NULL},
{CONFIG_HASH_FILTERS_ATTRIBUTE, config_set_hash_filters,
NULL, 0, NULL, CONFIG_ON_OFF, (ConfigGetFunc)config_get_hash_filters},
+ /* instance dir; used by admin tasks */
+ {CONFIG_INSTDIR_ATTRIBUTE, config_set_instancedir,
+ NULL, 0, NULL, CONFIG_STRING, NULL},
/* parameterizing schema dir */
{CONFIG_SCHEMADIR_ATTRIBUTE, config_set_schemadir,
NULL, 0,
@@ -4462,6 +4465,13 @@
return retVal;
}
+/* W/o the setter, "config_set: the attribute nsslapd-instancedir is read only" is printed out. */
+int
+config_set_instancedir(const char *attrname, char *value, char *errorbuf, int apply)
+{
+ return LDAP_SUCCESS;
+}
+
char *
config_get_schemadir()
{
Index: proto-slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- proto-slap.h 22 Jun 2007 21:54:58 -0000 1.27
+++ proto-slap.h 11 Jul 2007 01:14:05 -0000 1.28
@@ -316,6 +316,7 @@
int config_set_enquote_sup_oc(const char *attrname, char *value, char *errorbuf, int apply );
int config_set_basedn( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_configdir( const char *attrname, char *value, char *errorbuf, int apply );
+int config_set_instancedir( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_schemadir( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_lockdir( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_tmpdir( const char *attrname, char *value, char *errorbuf, int apply );
Index: slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slap.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- slap.h 22 Jun 2007 21:54:58 -0000 1.22
+++ slap.h 11 Jul 2007 01:14:05 -0000 1.23
@@ -1724,6 +1724,7 @@
#define CONFIG_REWRITE_RFC1274_ATTRIBUTE "nsslapd-rewrite-rfc1274"
#define CONFIG_CONFIG_ATTRIBUTE "nsslapd-config"
+#define CONFIG_INSTDIR_ATTRIBUTE "nsslapd-instancedir"
#define CONFIG_SCHEMADIR_ATTRIBUTE "nsslapd-schemadir"
#define CONFIG_LOCKDIR_ATTRIBUTE "nsslapd-lockdir"
#define CONFIG_TMPDIR_ATTRIBUTE "nsslapd-tmpdir"
16 years, 11 months
[Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.62, 1.63
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8017/admin/src
Modified Files:
create_instance.c
Log Message:
Resolves: #247215
Summary: Reimplement ds_remove without setuputil code (comment #6)
Description: adding nsslapd-instancedir to dse.ldif for ds_remove to find out
the instance dir path.
Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- create_instance.c 29 Jun 2007 21:12:22 -0000 1.62
+++ create_instance.c 11 Jul 2007 01:14:05 -0000 1.63
@@ -2687,6 +2687,7 @@
fprintf(f, "nsslapd-tmpdir: %s\n", cf->tmp_dir);
fprintf(f, "nsslapd-certdir: %s\n", cf->cert_dir);
fprintf(f, "nsslapd-ldifdir: %s\n", cf->ldif_dir);
+ fprintf(f, "nsslapd-instancedir: %s\n", cf->inst_dir);
fprintf(f, "nsslapd-bakdir: %s\n", cf->bak_dir);
/* We use the system SASL by default on Linux, so we don't need to set sasl path */
if (NULL != cf->sasl_path) {
16 years, 11 months
[Fedora-directory-commits] coolkey Makefile.in,1.8,1.9
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29768
Modified Files:
Makefile.in
Log Message:
Fix DIST in coolkey
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 16 Feb 2007 23:04:50 -0000 1.8
+++ Makefile.in 9 Jul 2007 21:26:33 -0000 1.9
@@ -220,7 +220,7 @@
target_vendor = @target_vendor@
SUBDIRS = src/libckyapplet src/coolkey $(am__append_1)
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = cookey.spec LICENSE
+EXTRA_DIST = coolkey.spec LICENSE
DISTCLEANFILES =
AUTOMAKE_OPTIONS = foreign
all: config.h
16 years, 11 months
[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv DSUtil.java, 1.2, 1.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11428
Modified Files:
DSUtil.java
Log Message:
Resolves: ?
Summary: Removed an unused variable that was causing some confusion.
Index: DSUtil.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DSUtil.java 2 Jul 2007 19:44:08 -0000 1.2
+++ DSUtil.java 9 Jul 2007 20:36:11 -0000 1.3
@@ -2907,7 +2907,6 @@
private static Icon _warningIcon = null;
private static Icon _errorIcon = null;
public static final String AUTH_CHANGE_LISTENERS = "AuthChangeListeners";
- private static final String INSTANCE_ATTR = "nsslapd-instancedir";
private static final String SECURITY_ATTR = "nsslapd-security";
private static final String BAKDIR_ATTR = "nsslapd-bakdir";
private static final String DBDIR_ATTR = "nsslapd-directory";
16 years, 11 months
[Fedora-directory-commits] admservconsole fedora-admserv-console.spec, NONE, 1.1 build.properties, 1.3, 1.4 build.xml, 1.1.1.1, 1.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/admservconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6902
Modified Files:
build.properties build.xml
Added Files:
fedora-admserv-console.spec
Log Message:
Resolves: 247525
Summary: Fixed parameters passed to ReadLog CGI. Also some packaging/build changes for building RPMs as well as a version bump.
--- NEW FILE fedora-admserv-console.spec ---
%define major_version 1.1
%define minor_version 0
Name: fedora-admserv-console
Version: %{major_version}.%{minor_version}
Release: 1
Group: Applications
Vendor: Fedora Project
URL: http://directory.fedora.redhat.com
License: LGPL
Packager: Red Hat, Inc. <http://bugzilla.redhat.com/bugzilla>
Summary: Fedora Directory Server Management Console
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildArch: noarch
Source: %{name}-%{version}.tar.gz
Autoreq: 0
AutoReqProv: no
BuildPreReq: ant >= 1.6.2, ldapjdk >= 4.18, fedora-console-framework >= 1.1
%description
A Java based remote management console used for Managing Fedora
Administration Server.
# prep and setup expect there to be a Source file
# in the /usr/src/redhat/SOURCES directory - it will be unpacked
# in the _builddir (not BuildRoot)
%prep
%setup -q
%build
cd admservconsole
ant -Dconsole.location=/usr/share/java
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/usr/share/java
install -m777 built/package/fedora-admserv* $RPM_BUILD_ROOT/usr/share/java
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
/usr/share/java/fedora-admserv-%{version}.jar
/usr/share/java/fedora-admserv-%{version}_en.jar
%post
cd /usr/share/java
ln -s fedora-admserv-%{version}.jar fedora-admserv-%{major_version}.jar
ln -s fedora-admserv-%{version}.jar fedora-admserv.jar
ln -s fedora-admserv-%{version}_en.jar fedora-admserv-%{major_version}_en.jar
ln -s fedora-admserv-%{version}_en.jar fedora-admserv_en.jar
%preun
rm -rf /usr/share/java/fedora-admserv-%{major_version}.jar
rm -rf /usr/share/java/fedora-admserv.jar
rm -rf /usr/share/java/fedora-admserv-%{major_version}_en.jar
rm -rf /usr/share/java/fedora-admserv_en.jar
%changelog
* Tue Jul 03 2007 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-1
- Initial creation
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/admservconsole/build.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.properties 29 Sep 2006 17:17:27 -0000 1.3
+++ build.properties 9 Jul 2007 20:10:09 -0000 1.4
@@ -21,8 +21,8 @@
lang=en
admservconsole.root=..
-admservconsole.version=1.0.3
-admservconsole.gen.version=1.0
+admservconsole.version=1.1.0
+admservconsole.gen.version=1.1
brand=fedora
admservconsole.name=${brand}-admserv-${admservconsole.version}
admservconsole.gen.name=${brand}-admserv-${admservconsole.gen.version}
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/admservconsole/build.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- build.xml 22 May 2006 18:14:31 -0000 1.1.1.1
+++ build.xml 9 Jul 2007 20:10:09 -0000 1.2
@@ -82,10 +82,10 @@
<!-- Construct classpath -->
<path id="admservconsole.classpath">
<fileset dir="${console.location}">
- <include name="**/java/${brand}-base-*.jar"/>
- <include name="**/java/${brand}-mcc-*.jar"/>
- <include name="**/java/${brand}-nmclf-*.jar"/>
- <include name="**/java/ldapjdk.jar"/>
+ <include name="**/${brand}-base-*.jar"/>
+ <include name="**/${brand}-mcc-*.jar"/>
+ <include name="**/${brand}-nmclf-*.jar"/>
+ <include name="**/ldapjdk.jar"/>
</fileset>
<pathelement path="${built.classdir}"/>
</path>
@@ -115,12 +115,6 @@
<include name="com/netscape/management/admserv/**/*.jpg" />
</fileset>
</jar>
- <exec executable="ln" dir="${package.dir}" vmlauncher="true">
- <arg line="-s ${admservconsole.name}.jar ${admservconsole.gen.name}.jar"/>
- </exec>
- <exec executable="ln" dir="${package.dir}" vmlauncher="true">
- <arg line="-s ${admservconsole.name}_${lang}.jar ${admservconsole.gen.name}_${lang}.jar"/>
- </exec>
</target>
<!-- Javadoc -->
16 years, 11 months