[Fedora-directory-commits] adminserver/admserv/newinst/src AdminUtil.pm.in, 1.5, 1.6 dirserver.map.in, 1.4, 1.5 register_param.map.in, 1.4, 1.5 setup-ds-admin.pl.in, 1.4, 1.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12280/admserv/newinst/src
Modified Files:
AdminUtil.pm.in dirserver.map.in register_param.map.in
setup-ds-admin.pl.in
Log Message:
Resolves: #244749
Summary: Configure Pass Thru Auth (comment #27)
Adding "cn=pass through authentication" to the subordinative DS instances
(createSubDS in AdminUtil.pm) as well as the calling point to
setup-ds-admin.pl.in in case the new server is non-configuration DS.
Index: AdminUtil.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminUtil.pm.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AdminUtil.pm.in 27 Jun 2007 18:32:46 -0000 1.5
+++ AdminUtil.pm.in 28 Jun 2007 16:24:41 -0000 1.6
@@ -39,10 +39,10 @@
package AdminUtil;
require Exporter;
@ISA = qw(Exporter);
-@EXPORT = qw(getAdmConf getConfigDSConn createConfigDS updateAdmConf
- updateAdmpw updateLocalConf importCACert);
-@EXPORT_OK = qw(getAdmConf getConfigDSConn createConfigDS updateAdmConf
- updateAdmpw updateLocalConf importCACert);
+@EXPORT = qw(getAdmConf getConfigDSConn createConfigDS createSubDS
+ updateAdmConf updateAdmpw updateLocalConf importCACert);
+@EXPORT_OK = qw(getAdmConf getConfigDSConn createConfigDS createSubDS
+ updateAdmConf updateAdmpw updateLocalConf importCACert);
# load perldap
use Mozilla::LDAP::Conn;
@@ -276,6 +276,45 @@
return 1;
}
+# Take the slapd server instance specified in the slapd section of the given inf
+# and make it into a subordinative directory server
+# (no o=netscaperoot, with PTA setup)
+sub createSubDS {
+ my $inf = shift;
+ my $errs = shift;
+
+ # open a connection to the directory server
+ my $conn = new Mozilla::LDAP::Conn($inf->{General}->{FullMachineName},
+ $inf->{slapd}->{ServerPort},
+ $inf->{slapd}->{RootDN},
+ $inf->{slapd}->{RootDNPwd},
+ $inf->{General}->{certdir});
+
+ # add the o=NetscapeRoot tree using the mapper and ldif templates
+ my @ldiffiles = ('@ldifdir(a)/12dsconfig.mod.tmpl',
+ '@ldifdir(a)/13dsschema.mod.tmpl',
+ '@ldifdir(a)/14dsmonitor.mod.tmpl',
+ '@ldifdir(a)/15dspta.ldif.tmpl'
+ );
+ my $setupinf = new Inf("@infdir(a)/setup.inf");
+ my $admininf = new Inf("@infdir(a)/admin.inf");
+ my $dsinf = new Inf("@infdir(a)/slapd.inf");
+ my $mapper = new Inf("@infdir(a)/dirserver.map");
+
+ $mapper = process_maptbl($mapper, ($inf, $dsinf, $admininf, $setupinf));
+ if (!$mapper) {
+ $conn->close();
+ @{$errs} = ('error_creating_configds_maptbl');
+ return 0;
+ }
+
+ getMappedEntries($mapper, \@ldiffiles, \&check_and_add_entry,
+ [$conn]);
+
+ $conn->close();
+ return 1;
+}
+
sub updateAdmConf {
my $params = shift; # hashref
my $configdir = shift || "@configdir@";
Index: dirserver.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/dirserver.map.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dirserver.map.in 25 Jun 2007 18:23:53 -0000 1.4
+++ dirserver.map.in 28 Jun 2007 16:24:41 -0000 1.5
@@ -67,9 +67,10 @@
dsid = ServerIdentifier
ds_user = SuiteSpotUserID
ds_port = ServerPort
-ds_secure_port ="636"
+ds_secure_port = "636"
rootdn = RootDN
ds_suffix = Suffix
ds_buildnum = BuildNumber
ds_console_jar ="%normbrand%-ds-%ds_baseversion%.jar"
ds_sie = "cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot"
+config_ds_url = ConfigDirectoryLdapURL
Index: register_param.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_param.map.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- register_param.map.in 25 Jun 2007 18:23:53 -0000 1.4
+++ register_param.map.in 28 Jun 2007 16:24:41 -0000 1.5
@@ -84,10 +84,11 @@
dsid = ServerIdentifier
ds_user = SuiteSpotUserID
ds_port = ServerPort
-ds_secure_port ="636"
+ds_secure_port = "636"
rootdn = RootDN
ds_suffix = Suffix
ds_buildnum = BuildNumber
ds_passwd = RootDNPwd
ds_console_jar ="%normbrand%-ds-%ds_baseversion%.jar"
ds_sie = "cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot"
+config_ds_url = ConfigDirectoryLdapURL
Index: setup-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.pl.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- setup-ds-admin.pl.in 20 Jun 2007 16:35:02 -0000 1.4
+++ setup-ds-admin.pl.in 28 Jun 2007 16:24:41 -0000 1.5
@@ -162,6 +162,16 @@
exit 1;
}
}
+else
+{
+ my @errs = ();
+ $setup->msg('create_configds');
+ if (!createSubDS($setup->{inf}, \@errs)) {
+ $setup->msg($FATAL, @errs);
+ $setup->msg($FATAL, 'error_create_configds');
+ exit 1;
+ }
+}
# register ds instances with config DS
if (!registerDSWithConfigDS($setup)) {
16 years, 10 months
- 1
- 0
[Fedora-directory-commits] adminserver Makefile.am, 1.19, 1.20 Makefile.in, 1.19, 1.20
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12280
Modified Files:
Makefile.am Makefile.in
Log Message:
Resolves: #244749
Summary: Configure Pass Thru Auth (comment #27)
Adding "cn=pass through authentication" to the subordinative DS instances
(createSubDS in AdminUtil.pm) as well as the calling point to
setup-ds-admin.pl.in in case the new server is non-configuration DS.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.am 27 Jun 2007 18:32:46 -0000 1.19
+++ Makefile.am 28 Jun 2007 16:24:41 -0000 1.20
@@ -140,6 +140,7 @@
admserv/schema/ldif/12dsconfig.mod.tmpl \
admserv/schema/ldif/13dsschema.mod.tmpl \
admserv/schema/ldif/14dsmonitor.mod.tmpl \
+ admserv/schema/ldif/15dspta.ldif.tmpl \
admserv/schema/ldif/20asdata.ldif.tmpl \
admserv/schema/ldif/21astasks.ldif.tmpl \
admserv/schema/ldif/22ascommands.ldif.tmpl
@@ -438,6 +439,7 @@
-e 's,@initdir\@,$(initdir),g' \
-e 's,@perldir\@,$(perldir),g' \
-e 's,@infdir\@,$(infdir),g' \
+ -e 's,@dslibdir\@,$(dslibdir),g' \
-e 's,@ldifdir\@,$(ldifdir),g'
# because the source may be either httpd.conf.in or httpd-2.2.conf.in
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.in 27 Jun 2007 18:32:46 -0000 1.19
+++ Makefile.in 28 Jun 2007 16:24:41 -0000 1.20
@@ -579,6 +579,7 @@
admserv/schema/ldif/12dsconfig.mod.tmpl \
admserv/schema/ldif/13dsschema.mod.tmpl \
admserv/schema/ldif/14dsmonitor.mod.tmpl \
+ admserv/schema/ldif/15dspta.ldif.tmpl \
admserv/schema/ldif/20asdata.ldif.tmpl \
admserv/schema/ldif/21astasks.ldif.tmpl \
admserv/schema/ldif/22ascommands.ldif.tmpl
@@ -832,6 +833,7 @@
-e 's,@initdir\@,$(initdir),g' \
-e 's,@perldir\@,$(perldir),g' \
-e 's,@infdir\@,$(infdir),g' \
+ -e 's,@dslibdir\@,$(dslibdir),g' \
-e 's,@ldifdir\@,$(ldifdir),g'
all: config.h
16 years, 10 months
- 1
- 0
[Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.60, 1.61 create_instance.h, 1.17, 1.18
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11502
Modified Files:
create_instance.c create_instance.h
Log Message:
Resolves: #244749
Summary: Configure Pass Thru Auth (comment #28)
Descri[tion: 1) removing the dependency on the config_ds
2) ds_newinst always adds "cn=Pass Through Authentication" with the
nsslapd-pluginEnabled value off.
Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- create_instance.c 22 Jun 2007 23:14:52 -0000 1.60
+++ create_instance.c 28 Jun 2007 16:15:26 -0000 1.61
@@ -301,9 +301,7 @@
conf->start_server = "1";
conf->install_full_schema = 1;
conf->admin_domain = NULL;
- conf->config_ldap_url = NULL;
conf->user_ldap_url = NULL;
- conf->use_existing_config_ds = 0;
conf->use_existing_user_ds = 0;
conf->consumerdn = NULL;
conf->disable_schema_checking = NULL;
@@ -3217,53 +3215,17 @@
fprintf(f, "\n");
#endif
- /* enable pass thru authentication */
- if ((cf->use_existing_config_ds && cf->config_ldap_url) ||
- (cf->use_existing_user_ds && cf->user_ldap_url))
- {
- LDAPURLDesc *desc = 0;
- char *url = cf->use_existing_config_ds ? cf->config_ldap_url :
- cf->user_ldap_url;
- if (url && !ldap_url_parse(url, &desc) && desc)
- {
- char *suffix = desc->lud_dn;
- char *service = !strncmp(url, "ldaps:", strlen("ldaps:")) ?
- "ldaps" : "ldap";
- if (cf->use_existing_config_ds)
- {
- suffix = cf->netscaperoot;
- }
-
- suffix = ds_URL_encode(suffix);
- fprintf(f, "dn: cn=Pass Through Authentication,cn=plugins,cn=config\n");
- fprintf(f, "objectclass: top\n");
- fprintf(f, "objectclass: nsSlapdPlugin\n");
- fprintf(f, "objectclass: extensibleObject\n");
- fprintf(f, "cn: Pass Through Authentication\n");
- fprintf(f, "nsslapd-pluginpath: %s/libpassthru-plugin%s\n", cf->plugin_dir, shared_lib);
- fprintf(f, "nsslapd-plugininitfunc: passthruauth_init\n");
- fprintf(f, "nsslapd-plugintype: preoperation\n");
- fprintf(f, "nsslapd-pluginenabled: on\n");
- fprintf(f, "nsslapd-pluginarg0: %s://%s:%d/%s\n", service, desc->lud_host, desc->lud_port,
- suffix);
- fprintf(f, "nsslapd-plugin-depends-on-type: database\n");
- fprintf(f, "\n");
- free(suffix);
- ldap_free_urldesc(desc);
- }
- } else { /* just add the config, disabled */
- fprintf(f, "dn: cn=Pass Through Authentication,cn=plugins,cn=config\n");
- fprintf(f, "objectclass: top\n");
- fprintf(f, "objectclass: nsSlapdPlugin\n");
- fprintf(f, "objectclass: extensibleObject\n");
- fprintf(f, "cn: Pass Through Authentication\n");
- fprintf(f, "nsslapd-pluginpath: %s/libpassthru-plugin%s\n", cf->plugin_dir, shared_lib);
- fprintf(f, "nsslapd-plugininitfunc: passthruauth_init\n");
- fprintf(f, "nsslapd-plugintype: preoperation\n");
- fprintf(f, "nsslapd-pluginenabled: off\n");
- fprintf(f, "nsslapd-plugin-depends-on-type: database\n");
- fprintf(f, "\n");
- }
+ fprintf(f, "dn: cn=Pass Through Authentication,cn=plugins,cn=config\n");
+ fprintf(f, "objectclass: top\n");
+ fprintf(f, "objectclass: nsSlapdPlugin\n");
+ fprintf(f, "objectclass: extensibleObject\n");
+ fprintf(f, "cn: Pass Through Authentication\n");
+ fprintf(f, "nsslapd-pluginpath: %s/libpassthru-plugin%s\n", cf->plugin_dir, shared_lib);
+ fprintf(f, "nsslapd-plugininitfunc: passthruauth_init\n");
+ fprintf(f, "nsslapd-plugintype: preoperation\n");
+ fprintf(f, "nsslapd-pluginenabled: off\n");
+ fprintf(f, "nsslapd-plugin-depends-on-type: database\n");
+ fprintf(f, "\n");
#ifdef ENABLE_PAM_PASSTHRU
#if !defined( XP_WIN32 )
@@ -4518,38 +4480,12 @@
cf->admin_domain = ds_a_get_cgi_var("admin_domain", NULL, NULL);
- if ((temp = ds_a_get_cgi_var("use_existing_config_ds", NULL, NULL))) {
- cf->use_existing_config_ds = atoi(temp);
- } else {
- cf->use_existing_config_ds = 1; /* there must already be one */
- }
-
if ((temp = ds_a_get_cgi_var("use_existing_user_ds", NULL, NULL))) {
cf->use_existing_user_ds = atoi(temp);
} else {
cf->use_existing_user_ds = 0; /* we are creating it */
}
- temp = ds_a_get_cgi_var("ldap_url", NULL, NULL);
- if (temp && !ldap_url_parse(temp, &desc) && desc)
- {
- char *suffix;
- int isSSL;
-
- if (desc->lud_dn && *desc->lud_dn) { /* use given DN for netscaperoot suffix */
- cf->netscaperoot = strdup(desc->lud_dn);
- suffix = cf->netscaperoot;
- } else { /* use the default */
- suffix = dn_normalize_convert(strdup(cf->netscaperoot));
- }
- /* the config ds connection may require SSL */
- isSSL = !strncmp(temp, "ldaps:", strlen("ldaps:"));
- cf->config_ldap_url = PR_smprintf("ldap%s://%s:%d/%s",
- (isSSL ? "s" : ""), desc->lud_host,
- desc->lud_port, suffix);
- ldap_free_urldesc(desc);
- }
-
/* if being called as a CGI, the user_ldap_url will be the directory
we're creating */
/* this is the directory we're creating, and we cannot create an ssl
Index: create_instance.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- create_instance.h 7 Jun 2007 21:23:54 -0000 1.17
+++ create_instance.h 28 Jun 2007 16:15:26 -0000 1.18
@@ -161,10 +161,8 @@
char * start_server;
char * admin_domain;
- char * config_ldap_url;
char * user_ldap_url;
int use_existing_user_ds;
- int use_existing_config_ds;
char * disable_schema_checking;
char * install_ldif_file;
char *adminport;
16 years, 10 months
- 1
- 0
[Fedora-directory-commits] adminserver/admserv/schema/ldif 11dstasks.ldif.tmpl, 1.2, 1.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/adminserver/admserv/schema/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10464/admserv/schema/ldif
Modified Files:
11dstasks.ldif.tmpl
Log Message:
Resolves: 246020
Summary: Modified viewlog CGI to work for Console.
Index: 11dstasks.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/11dstasks.ldif.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 11dstasks.ldif.tmpl 20 Jun 2007 23:50:11 -0000 1.2
+++ 11dstasks.ldif.tmpl 27 Jun 2007 22:25:00 -0000 1.3
@@ -120,7 +120,7 @@
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
-nsExecRef: perl?ds_viewlog.pl
+nsExecRef: viewlog
cn: ViewLog
dn: cn=ListBackups, cn=operation, cn=Tasks, %ds_sie%
16 years, 10 months
- 1
- 0
[Fedora-directory-commits] adminserver/admserv/cgi-src40 viewlog.c, 1.8, 1.9 viewlog.properties, 1.4, 1.5
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10464/admserv/cgi-src40
Modified Files:
viewlog.c viewlog.properties
Log Message:
Resolves: 246020
Summary: Modified viewlog CGI to work for Console.
Index: viewlog.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/viewlog.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- viewlog.c 15 May 2007 16:45:45 -0000 1.8
+++ viewlog.c 27 Jun 2007 22:24:59 -0000 1.9
@@ -67,7 +67,8 @@
#define DBT_NO_DIR_FOUND resource_key(RESOURCE_FILE, "9")
#define DBT_NO_ID resource_key(RESOURCE_FILE, "10")
#define DBT_NO_ID_DESC resource_key(RESOURCE_FILE, "11")
-
+#define DBT_INV_NOHTML resource_key(RESOURCE_FILE, "12")
+#define DBT_INV_NOHTML_DESC resource_key(RESOURCE_FILE, "13")
/* html resource */
#define DBT_DISPLAY_LOGFILE_SELECT_BEGIN resource_key(RESOURCE_FILE, "20")
@@ -262,6 +263,8 @@
char *qs = getenv("QUERY_STRING");
char line[BIG_LINE];
FILE *html = open_html_file(MY_PAGE);
+ char *method = NULL;
+ char *nohtml = NULL;
char *num=NULL;
char *str=NULL;
char *file;
@@ -270,37 +273,53 @@
char **logfiles = NULL;
char tmp[BIG_LINE];
int x;
+ int print_html = 1;
+ int proceed = 0;
char msg[BUFSIZ];
i18nInit();
fprintf(stdout, "Content-type: text/html;charset=utf-8\n\n");
- if(qs) {
- get_begin(qs);
+ method = getenv("REQUEST_METHOD");
+ if(method) {
+ if(!strcmp(method, "GET")) {
+ qs = getenv("QUERY_STRING");
+ if(qs && *qs) {
+ get_begin(qs);
+ proceed = 1;
+ }
+ } else if(!strcmp(method, "POST")) {
+ post_begin(stdin);
+ proceed = 1;
+ }
+ }
- num=get_cgi_var("num", NULL, NULL);
- str=get_cgi_var("str", NULL, NULL);
- file=get_cgi_var("file", NULL, NULL);
- id=get_cgi_var("id", NULL, NULL);
-
- if(!id)
- rpt_err(INCORRECT_USAGE,
- getResourceString(DBT_NO_ID),
- getResourceString(DBT_NO_ID_DESC), NULL);
-
- if(num) {
- for(x=0; num[x]; x++) {
- if(!isdigit(num[x]))
- rpt_err(INCORRECT_USAGE, getResourceString(DBT_INV_NUMBER),
- getResourceString(DBT_INV_NUMBER_DESC), NULL);
- }
- }
- }
- else
- rpt_err(INCORRECT_USAGE,
- getResourceString(DBT_NO_ID),
- getResourceString(DBT_NO_ID_DESC), NULL);
+ if(!proceed)
+ {
+ rpt_err(INCORRECT_USAGE,
+ getResourceString(DBT_NO_ID),
+ getResourceString(DBT_NO_ID_DESC), NULL);
+ }
+
+ num=get_cgi_var("num", NULL, NULL);
+ str=get_cgi_var("str", NULL, NULL);
+ file=get_cgi_var("file", NULL, NULL);
+ id=get_cgi_var("id", NULL, NULL);
+ nohtml=get_cgi_var("nohtml", NULL, NULL);
+
+ if(!id)
+ rpt_err(INCORRECT_USAGE,
+ getResourceString(DBT_NO_ID),
+ getResourceString(DBT_NO_ID_DESC), NULL);
+
+ if(num) {
+ for(x=0; num[x]; x++) {
+ if(!isdigit(num[x]))
+ rpt_err(INCORRECT_USAGE, getResourceString(DBT_INV_NUMBER),
+ getResourceString(DBT_INV_NUMBER_DESC), NULL);
+ }
+ }
if(!num) num=DEF_SIZE;
@@ -313,55 +332,89 @@
}
}
- while(next_html_line(html, line)) {
- if(parse_line(line, NULL)) {
- if(directive_is(line, "LOG_TO_VIEW")) {
- display_logfiles(logdir, file);
- }
- else if(directive_is(line, "NUM_TO_VIEW")) {
- output_input("text", "num", num, NULL);
- }
- else if(directive_is(line, "STRING_TO_VIEW")) {
- output_input("text", "str", str, NULL);
- }
- else if(directive_is(line, "HIDDEN_ID")) {
- /* keep hidden track of what the current id are */
- fprintf(stdout, (const char*)getResourceString(DBT_MAIN_HIDDEN_TRACK), id);
- }
- else if(directive_is(line, "ID_TITLE")) {
- fprintf(stdout, (const char*)getResourceString(DBT_MAIN_ID_TITLE), id);
- }
- else if(directive_is(line, "ACCESS_LOG")) {
- FILE *cmd;
- char full_path[PATH_MAX];
+ if(nohtml) {
+ for(x=0; nohtml[x]; x++) {
+ if(!isdigit(nohtml[x]))
+ rpt_err(INCORRECT_USAGE, getResourceString(DBT_INV_NUMBER),
+ getResourceString(DBT_INV_NUMBER_DESC), NULL);
+ }
+
+ if (atoi(nohtml) > 0) {
+ /* print raw log content only */
+ print_html = 0;
+ }
+ }
+
+ if (print_html ) {
+ while(next_html_line(html, line)) {
+ if(parse_line(line, NULL)) {
+ if(directive_is(line, "LOG_TO_VIEW")) {
+ display_logfiles(logdir, file);
+ }
+ else if(directive_is(line, "NUM_TO_VIEW")) {
+ output_input("text", "num", num, NULL);
+ }
+ else if(directive_is(line, "STRING_TO_VIEW")) {
+ output_input("text", "str", str, NULL);
+ }
+ else if(directive_is(line, "HIDDEN_ID")) {
+ /* keep hidden track of what the current id are */
+ fprintf(stdout, (const char*)getResourceString(DBT_MAIN_HIDDEN_TRACK), id);
+ }
+ else if(directive_is(line, "ID_TITLE")) {
+ fprintf(stdout, (const char*)getResourceString(DBT_MAIN_ID_TITLE), id);
+ }
+ else if(directive_is(line, "ACCESS_LOG")) {
+ FILE *cmd;
+ char full_path[PATH_MAX];
#ifdef AIX
- fflush(stdout);
+ fflush(stdout);
#endif
- if (!file || !*file ||
- !util_is_valid_path_string(file) ||
- !util_verify_file_or_dir(logdir, PR_FILE_DIRECTORY, file, -1, PR_FILE_FILE)) {
- continue;
- }
-
- PR_snprintf(full_path, sizeof(full_path), "%s%c%s", logdir, FILE_PATHSEP, file);
- form_unescape(full_path); /* bug 27409, 31807 */
- cmd = fopen(full_path, "r");
- fprintf(stdout, getResourceString(DBT_MAIN_WIDTH));
- PR_snprintf(tmp, sizeof(tmp), getResourceString(DBT_SUBTITLE), num, file, (str)? getResourceString(DBT_WITH) : "",
- (str)? str : "");
-
- fprintf(stdout, (const char*)getResourceString(DBT_MAIN_TABLE),
- tmp);
-
- /* begin search */
- if(cmd) {
- search_file(cmd, atoi(num), str);
- fclose(cmd);
- }
- } else
- fputs(line, stdout);
- }
+ if (!file || !*file ||
+ !util_is_valid_path_string(file) ||
+ !util_verify_file_or_dir(logdir, PR_FILE_DIRECTORY, file, -1, PR_FILE_FILE)) {
+ continue;
+ }
+
+ PR_snprintf(full_path, sizeof(full_path), "%s%c%s", logdir, FILE_PATHSEP, file);
+ form_unescape(full_path); /* bug 27409, 31807 */
+ cmd = fopen(full_path, "r");
+ fprintf(stdout, getResourceString(DBT_MAIN_WIDTH));
+ PR_snprintf(tmp, sizeof(tmp), getResourceString(DBT_SUBTITLE), num, file, (str)? getResourceString(DBT_WITH) : "",
+ (str)? str : "");
+
+ fprintf(stdout, (const char*)getResourceString(DBT_MAIN_TABLE), tmp);
+
+ /* begin search */
+ if(cmd) {
+ search_file(cmd, atoi(num), str);
+ fclose(cmd);
+ }
+ } else
+ fputs(line, stdout);
+ }
+ }
+ } else {
+ /* only print the raw log content */
+ FILE *cmd;
+ char full_path[PATH_MAX];
+
+#ifdef AIX
+ fflush(stdout);
+#endif
+ if (file || *file || util_is_valid_path_string(file) ||
+ util_verify_file_or_dir(logdir, PR_FILE_DIRECTORY, file, -1, PR_FILE_FILE)) {
+ PR_snprintf(full_path, sizeof(full_path), "%s%c%s", logdir, FILE_PATHSEP, file);
+ form_unescape(full_path); /* bug 27409, 31807 */
+ cmd = fopen(full_path, "r");
+
+ /* begin search */
+ if(cmd) {
+ search_file(cmd, atoi(num), str);
+ fclose(cmd);
+ }
+ }
}
return 0;
Index: viewlog.properties
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/viewlog.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- viewlog.properties 9 May 2007 00:26:30 -0000 1.4
+++ viewlog.properties 27 Jun 2007 22:24:59 -0000 1.5
@@ -34,6 +34,8 @@
viewlog9 { "Cannot find directories based on server id %s. You may need to start the configuration directory server." }
viewlog10 { "No server id specified." }
viewlog11 { "Please specify a server id." }
+viewlog12 { "Invalid nohtml option." }
+viewlog13 { "The nohtml option should be 0 or 1." }
viewlog20 { "<select name=file>\n" }
viewlog21 { "<option value=%s selected>%s\n" }
viewlog22 { "<option value=%s>%s\n" }
16 years, 10 months
- 1
- 0
[Fedora-directory-commits] adminserver/admserv/schema/ldif 14dsmonitor.mod.tmpl, NONE, 1.1
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/schema/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6549/admserv/schema/ldif
Added Files:
14dsmonitor.mod.tmpl
Log Message:
Resolves: #244749
Summary: Configure Pass Thru Auth (comment #21)
Description: adding ACI to cn=monitor
--- NEW FILE 14dsmonitor.mod.tmpl ---
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
#
# 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; either version 2
# of the License, or (at your option) any later version.
#
# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# END COPYRIGHT BLOCK
dn: cn=monitor
changetype: modify
add: aci
aci: (target ="ldap:///cn=monitor*")(targetattr != "aci || connection")(version 3.0; acl "monitor"; allow( read, search, compare ) userdn = "ldap:///anyone";)
16 years, 10 months
- 1
- 0
[Fedora-directory-commits] adminserver/admserv/newinst/src AdminUtil.pm.in, 1.4, 1.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6549/admserv/newinst/src
Modified Files:
AdminUtil.pm.in
Log Message:
Resolves: #244749
Summary: Configure Pass Thru Auth (comment #21)
Description: adding ACI to cn=monitor
Index: AdminUtil.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminUtil.pm.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AdminUtil.pm.in 25 Jun 2007 17:14:40 -0000 1.4
+++ AdminUtil.pm.in 27 Jun 2007 18:32:46 -0000 1.5
@@ -254,7 +254,8 @@
my @ldiffiles = ('@ldifdir(a)/01nsroot.ldif.tmpl',
'@ldifdir(a)/02globalpreferences.ldif.tmpl',
'@ldifdir(a)/12dsconfig.mod.tmpl',
- '@ldifdir(a)/13dsschema.mod.tmpl'
+ '@ldifdir(a)/13dsschema.mod.tmpl',
+ '@ldifdir(a)/14dsmonitor.mod.tmpl'
);
my $setupinf = new Inf("@infdir(a)/setup.inf");
my $admininf = new Inf("@infdir(a)/admin.inf");
16 years, 10 months
- 1
- 0
[Fedora-directory-commits] adminserver Makefile.in, 1.18, 1.19 aclocal.m4, 1.14, 1.15 configure, 1.17, 1.18 ltmain.sh, 1.4, 1.5 Makefile.am, 1.18, 1.19
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6549
Modified Files:
Makefile.in aclocal.m4 configure ltmain.sh Makefile.am
Log Message:
Resolves: #244749
Summary: Configure Pass Thru Auth (comment #21)
Description: adding ACI to cn=monitor
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.in 26 Jun 2007 18:34:46 -0000 1.18
+++ Makefile.in 27 Jun 2007 18:32:46 -0000 1.19
@@ -401,7 +401,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -579,6 +578,7 @@
admserv/schema/ldif/11dstasks.ldif.tmpl \
admserv/schema/ldif/12dsconfig.mod.tmpl \
admserv/schema/ldif/13dsschema.mod.tmpl \
+ admserv/schema/ldif/14dsmonitor.mod.tmpl \
admserv/schema/ldif/20asdata.ldif.tmpl \
admserv/schema/ldif/21astasks.ldif.tmpl \
admserv/schema/ldif/22ascommands.ldif.tmpl
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/adminserver/aclocal.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- aclocal.m4 25 Jun 2007 23:23:10 -0000 1.14
+++ aclocal.m4 27 Jun 2007 18:32:46 -0000 1.15
@@ -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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- configure 26 Jun 2007 18:34:46 -0000 1.17
+++ configure 27 Jun 2007 18:32:46 -0000 1.18
@@ -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
Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/adminserver/ltmain.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ltmain.sh 25 Jun 2007 23:23:10 -0000 1.4
+++ ltmain.sh 27 Jun 2007 18:32:46 -0000 1.5
@@ -46,16 +46,10 @@
VERSION=1.5.22
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-# 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+"$@"}'='"$@"'
+# 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
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.
@@ -111,14 +105,12 @@
# 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.
-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
+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
# Make sure IFS has a sensible default
lt_nl='
@@ -144,8 +136,6 @@
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
#####################################
# Shell function definitions:
@@ -337,17 +327,7 @@
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
- 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"
+ my_xdir="$my_gentop/$my_xlib"
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
@@ -778,7 +758,6 @@
*.f90) xform=f90 ;;
*.for) xform=for ;;
*.java) xform=java ;;
- *.obj) xform=obj ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1159,9 +1138,8 @@
for arg
do
case $arg in
- -all-static | -static | -static-libtool-libs)
- case $arg in
- -all-static)
+ -all-static | -static)
+ if test "X$arg" = "X-all-static"; then
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
@@ -1169,20 +1147,12 @@
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
- ;;
- -static)
+ else
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=built
- ;;
- -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
+ fi
build_libtool_libs=no
build_old_libs=yes
break
@@ -1742,7 +1712,7 @@
continue
;;
- -static | -static-libtool-libs)
+ -static)
# 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
@@ -2520,9 +2490,7 @@
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
- { { test "$prefer_static_libs" = no ||
- test "$prefer_static_libs,$installed" = "built,yes"; } ||
- test -z "$old_library"; }; then
+ { test "$prefer_static_libs" = no || 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.
@@ -3218,7 +3186,7 @@
# which has an extra 1 added just for fun
#
case $version_type in
- darwin|linux|osf|windows|none)
+ darwin|linux|osf|windows)
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
@@ -3442,11 +3410,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.
@@ -3547,12 +3515,13 @@
int main() { return 0; }
EOF
$rm conftest
- if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+ $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
+ if test "$?" -eq 0 ; 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" != "0"; then
+ if test "$name" != "" && test "$name" -ne "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -3591,7 +3560,9 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
- if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+ $LTCC $LTCFLAGS -o conftest conftest.c $i
+ # Did it work?
+ if test "$?" -eq 0 ; then
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
@@ -3623,7 +3594,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
@@ -4268,14 +4239,12 @@
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec and hope we can get by with
- # turning comma into space..
+ # -Wl from whole_archive_flag_spec
wl=
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
- eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
- reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+ eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@@ -4723,16 +4692,16 @@
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
- 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`
+ 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}%"`
else
- 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`
+ 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}%"`
fi
;;
* )
- 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`
+ 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}%"`
;;
esac
;;
@@ -4747,13 +4716,13 @@
# really was required.
# Nullify the symbol file.
- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
- finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
fi
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+ compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@@ -4840,7 +4809,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" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
else
# fast_install is set to needless
relink_command=
@@ -4877,7 +4846,7 @@
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
fi
# Quote $echo for shipping.
@@ -5284,18 +5253,6 @@
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
@@ -5438,7 +5395,7 @@
;;
esac
$echo >> $output "\
- \$echo \"\$0: cannot exec \$program \$*\"
+ \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
exit $EXIT_FAILURE
fi
else
@@ -5624,7 +5581,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" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -5969,9 +5926,9 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+ relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
else
- relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+ relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6180,7 +6137,7 @@
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
+ relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
$show "$relink_command"
if $run eval "$relink_command"; then :
@@ -6456,15 +6413,12 @@
fi
# Restore saved environment variables
- 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
-
+ 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
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
@@ -6821,9 +6775,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
@@ -6837,11 +6791,9 @@
-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 uninstalled libtool libraries
- -static-libtool-libs
- do not do any dynamic linking of libtool libraries
+ -static 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.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.am 26 Jun 2007 18:34:46 -0000 1.18
+++ Makefile.am 27 Jun 2007 18:32:46 -0000 1.19
@@ -139,6 +139,7 @@
admserv/schema/ldif/11dstasks.ldif.tmpl \
admserv/schema/ldif/12dsconfig.mod.tmpl \
admserv/schema/ldif/13dsschema.mod.tmpl \
+ admserv/schema/ldif/14dsmonitor.mod.tmpl \
admserv/schema/ldif/20asdata.ldif.tmpl \
admserv/schema/ldif/21astasks.ldif.tmpl \
admserv/schema/ldif/22ascommands.ldif.tmpl
16 years, 10 months
- 1
- 0
[Fedora-directory-commits] adminserver/admserv/schema/ldif 10dsdata.ldif.tmpl, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/schema/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17121
Modified Files:
10dsdata.ldif.tmpl
Log Message:
Resolves: bug 244749
Description: Configure Pass Thru Auth
Fix Description: use %domain% instead of real domain
Index: 10dsdata.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/10dsdata.ldif.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 10dsdata.ldif.tmpl 25 Jun 2007 18:23:53 -0000 1.7
+++ 10dsdata.ldif.tmpl 26 Jun 2007 18:50:28 -0000 1.8
@@ -80,7 +80,7 @@
aci: (targetattr=*)(version 3.0; acl "UserDNControl"; allow (all) userdnattr="creatorsname";)
ou: cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
-dn: ou="%rootdn%",ou=UserPreferences, ou=sfbay.redhat.com, o=NetscapeRoot
+dn: ou="%rootdn%",ou=UserPreferences, ou=%domain%, o=NetscapeRoot
objectClass: top
objectClass: organizationalUnit
aci: (targetattr=*)(version 3.0; acl "UserDNControl"; allow (all) userdnattr="creatorsname";)
16 years, 10 months
- 1
- 0
[Fedora-directory-commits] adminserver/lib/libdsa dsalib_conf.c, 1.2, 1.3 dsalib_db.c, 1.2, 1.3 dsalib_ldif.c, 1.1, 1.2 dsalib_location.c, 1.2, 1.3 dsalib_updown.c, 1.2, 1.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/adminserver/lib/libdsa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16109/lib/libdsa
Modified Files:
dsalib_conf.c dsalib_db.c dsalib_ldif.c dsalib_location.c
dsalib_updown.c
Log Message:
Resolves: 245665
Summary: Removed server root logic from dsalib.
Index: dsalib_conf.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_conf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dsalib_conf.c 25 Jun 2007 23:23:12 -0000 1.2
+++ dsalib_conf.c 26 Jun 2007 18:34:47 -0000 1.3
@@ -123,7 +123,6 @@
{"nsslapd-suffix"},
{"nsslapd-localuser"},
{"nsslapd-bakdir"},
-{"nsslapd-lockdir"},
{"nsslapd-tmpdir"},
{0}
};
Index: dsalib_db.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_db.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dsalib_db.c 25 Jun 2007 23:23:12 -0000 1.2
+++ dsalib_db.c 26 Jun 2007 18:34:47 -0000 1.3
@@ -112,7 +112,7 @@
char startup_line[BIG_LINE];
char statfile[PATH_MAX];
char *tmp_dir;
- char *root;
+ char *instdir;
int haderror = 0;
int error = -1;
int status;
@@ -126,8 +126,8 @@
if ( status == DS_SERVER_UP ) {
return DS_SERVER_MUST_BE_DOWN;
}
- if ( (root = ds_get_install_root()) == NULL ) {
- return DS_NO_SERVER_ROOT;
+ if ( (instdir = ds_get_instance_dir()) == NULL ) {
+ return DS_NO_INSTANCE_DIR;
}
if ( file[strlen(file) - 1] == '\n' ) /* strip out returns */
@@ -145,7 +145,7 @@
"%s%cbak2db "
"%s%s%s > "
"%s%s%s 2>&1",
- root, FILE_SEP,
+ instdir, FILE_SEP,
ENQUOTE, file, ENQUOTE,
ENQUOTE, statfile, ENQUOTE );
alter_startup_line(startup_line);
@@ -189,7 +189,7 @@
char startup_line[BIG_LINE];
char statfile[PATH_MAX];
char *tmp_dir;
- char *root;
+ char *instdir;
int haderror = 0;
int error = -1;
FILE *sf = NULL;
@@ -198,8 +198,8 @@
time_t ltime;
#endif
- if ( (root = ds_get_install_root()) == NULL ) {
- return DS_NO_SERVER_ROOT;
+ if ( (instdir = ds_get_instance_dir()) == NULL ) {
+ return DS_NO_INSTANCE_DIR;
}
if ( (file == NULL) || (strlen(file) == 0) )
@@ -245,7 +245,7 @@
"%s%cdb2bak "
"%s%s%s > "
"%s%s%s 2>&1",
- root, FILE_SEP,
+ instdir, FILE_SEP,
ENQUOTE,
(file == NULL) ? "" : file,
ENQUOTE,
@@ -347,22 +347,20 @@
ds_vlvindex(char **backendList, char **vlvList)
{
char startup_line[BIG_LINE];
- char *root;
- char *instroot;
+ char *instdir;
char **vlvc = NULL;
- root = ds_get_server_root();
- instroot = ds_get_install_root();
- if ( (root == NULL) || (instroot == NULL) ) {
- return DS_NO_SERVER_ROOT;
+ instdir = ds_get_instance_dir();
+ if ( instdir == NULL ) {
+ return DS_NO_INSTANCE_DIR;
}
- PR_snprintf(startup_line, sizeof(startup_line), "%s/bin/slapd/server/%s db2index "
+ PR_snprintf(startup_line, sizeof(startup_line), "%s/%s db2index "
"-D %s%s/%s "
"-n %s ",
- root, SLAPD_NAME,
- ENQUOTE, instroot, ENQUOTE,
+ CMDBINDIR, SLAPD_NAME,
+ ENQUOTE, instdir, ENQUOTE,
backendList[0]);
@@ -385,21 +383,19 @@
ds_addindex(char **attrList, char *backendName)
{
char startup_line[BIG_LINE];
- char *root;
- char *instroot;
+ char *instdir;
- root = ds_get_server_root();
- instroot = ds_get_install_root();
+ instdir = ds_get_instance_dir();
- if ( (root == NULL) || (instroot == NULL) ) {
- return DS_NO_SERVER_ROOT;
+ if ( instdir == NULL ) {
+ return DS_NO_INSTANCE_DIR;
}
- PR_snprintf(startup_line, sizeof(startup_line), "%s/bin/slapd/server/%s db2index "
+ PR_snprintf(startup_line, sizeof(startup_line), "%s/%s db2index "
"-D %s%s%s "
"-n %s",
- root, SLAPD_NAME,
- ENQUOTE, instroot, ENQUOTE,
+ CMDBINDIR, SLAPD_NAME,
+ ENQUOTE, instdir, ENQUOTE,
backendName);
while( *attrList != NULL ) {
Index: dsalib_ldif.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_ldif.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dsalib_ldif.c 13 Jun 2007 01:37:17 -0000 1.1
+++ dsalib_ldif.c 26 Jun 2007 18:34:47 -0000 1.2
@@ -154,7 +154,7 @@
importldif(char *file, int preserve, char *backend, char *subtree)
{
char startup_line[BIG_LINE];
- char *root;
+ char *instdir;
int haderror = 0;
int i = 0, error = -1;
int status;
@@ -178,11 +178,11 @@
#endif /* DEBUG_CGI */
return DS_SERVER_MUST_BE_DOWN;
}
- if ( (root = ds_get_install_root()) == NULL ) {
+ if ( (instdir = ds_get_instance_dir()) == NULL ) {
#ifdef DEBUG_CGI
- fprintf(stderr, "importldif: could not get server root\n");
+ fprintf(stderr, "importldif: could not get instance directory\n");
#endif /* DEBUG_CGI */
- return DS_NO_SERVER_ROOT;
+ return DS_NO_INSTANCE_DIR;
}
if ( file[strlen(file) - 1] == '\n' ) /* strip out returns */
@@ -203,21 +203,21 @@
if ( preserve ) {
PR_snprintf(startup_line, BIG_LINE, "%s%cldif2db%s -i %s%s%s",
- root, FILE_SEP, SCRIPT_SUFFIX,
+ instdir, FILE_SEP, SCRIPT_SUFFIX,
ENQUOTE, file, ENQUOTE);
} else if (backend) {
PR_snprintf(startup_line, BIG_LINE, "%s%cldif2db%s -n %s%s%s -i %s%s%s",
- root, FILE_SEP, SCRIPT_SUFFIX,
+ instdir, FILE_SEP, SCRIPT_SUFFIX,
ENQUOTE, backend, ENQUOTE,
ENQUOTE, file, ENQUOTE);
} else if (subtree) {
PR_snprintf(startup_line, BIG_LINE, "%s%cldif2db%s -s %s%s%s -i %s%s%s",
- root, FILE_SEP, SCRIPT_SUFFIX,
+ instdir, FILE_SEP, SCRIPT_SUFFIX,
ENQUOTE, subtree, ENQUOTE,
ENQUOTE, file, ENQUOTE);
} else {
PR_snprintf(startup_line, BIG_LINE, "%s%cldif2db%s -i %s%s%s -noconfig",
- root, FILE_SEP, SCRIPT_SUFFIX,
+ instdir, FILE_SEP, SCRIPT_SUFFIX,
ENQUOTE, file, ENQUOTE);
}
alter_startup_line(startup_line);
@@ -311,13 +311,13 @@
char outfile[PATH_MAX];
char scriptfile[PATH_MAX];
char *tmp_dir;
- char *root;
+ char *instdir;
int haderror = 0;
int error = -1;
FILE *sf = NULL;
- if ( (root = ds_get_install_root()) == NULL ) {
- return DS_NO_SERVER_ROOT;
+ if ( (instdir = ds_get_instance_dir()) == NULL ) {
+ return DS_NO_INSTANCE_DIR;
}
if ( (file == NULL) || (strlen(file) == 0) )
@@ -343,7 +343,7 @@
else
PL_strncpyz( outfile, file, sizeof(outfile) );
- PR_snprintf(scriptfile, PATH_MAX, "%s%cdb2ldif", root, FILE_SEP);
+ PR_snprintf(scriptfile, PATH_MAX, "%s%cdb2ldif", instdir, FILE_SEP);
PATH_FOR_PLATFORM( outfile );
PATH_FOR_PLATFORM( scriptfile );
Index: dsalib_location.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_location.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dsalib_location.c 25 Jun 2007 23:23:12 -0000 1.2
+++ dsalib_location.c 26 Jun 2007 18:34:47 -0000 1.3
@@ -51,44 +51,21 @@
#include "plstr.h"
/*
- * Returns the server root. Info is
- * returned in a static area. The caller must copy it
- * for reuse if needed.
- */
-DS_EXPORT_SYMBOL char *
-ds_get_server_root()
-{
- char *root;
-
- if ( (root = getenv("NETSITE_ROOT")) == NULL )
- return(NULL);
-
- /* WIN32: Needed to take care of embedded space, */
- /* otherwise system() call fails */
- root = ds_makeshort( root );
-
- return root;
-}
-
-/*
- * Returns the install location of the server. Info is
- * returned in a static area. The caller must copy it
- * for reuse if needed.
+ * Returns the instance directory path of the server.
+ * Info is returned in a static area. The caller must
+ * copy it for reuse if needed.
*/
DS_EXPORT_SYMBOL char *
-ds_get_install_root()
+ds_get_instance_dir()
{
- char *root;
char *ds_name;
- static char install_root[PATH_MAX];
+ static char instance_dir[PATH_MAX];
- if ( (root = ds_get_server_root()) == NULL )
- return(NULL);
if ( (ds_name = ds_get_server_name()) == NULL )
return(NULL);
- PR_snprintf(install_root, sizeof(install_root), "%s/%s", root, ds_name);
- return(install_root);
+ PR_snprintf(instance_dir, sizeof(instance_dir), "%s/%s", DSLIBDIR, ds_name);
+ return(instance_dir);
}
/*
@@ -136,9 +113,9 @@
char *rundir;
if (rundir = getenv("DS_RUN_DIR")) {
- return rundir;
+ return (rundir);
} else {
- return ds_get_config_value(DS_RUNDIR);
+ return (PIDDIR);;
}
}
@@ -231,6 +208,9 @@
return(install_root);
}
+/*
+ * Returns the Directory Server instance name.
+ */
DS_EXPORT_SYMBOL char *
ds_get_server_name()
{
Index: dsalib_updown.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_updown.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dsalib_updown.c 25 Jun 2007 23:23:12 -0000 1.2
+++ dsalib_updown.c 26 Jun 2007 18:34:47 -0000 1.3
@@ -156,7 +156,7 @@
configuration information in memory, we don't need to read it in
*/
DS_EXPORT_SYMBOL int
-ds_bring_up_server_install(int verbose, char *root, char *errorlog)
+ds_bring_up_server_install(int verbose, char *instdir, char *errorlog)
{
#if !defined( XP_WIN32 )
char startup_line[BIG_LINE];
@@ -174,7 +174,7 @@
status = ds_get_updown_status();
if ( status == DS_SERVER_UP )
return(DS_SERVER_ALREADY_UP);
- if (!root || !errorlog)
+ if (!instdir || !errorlog)
return(DS_SERVER_UNKNOWN);
if (verbose) {
@@ -187,7 +187,7 @@
PR_snprintf(statfile, PATH_MAX, "%s%cstartup.%d", tmp_dir, FILE_SEP, (int)getpid());
PR_snprintf(startup_line, BIG_LINE, "%s%c%s > %s 2>&1",
- root, FILE_SEP, START_SCRIPT, statfile);
+ instdir, FILE_SEP, START_SCRIPT, statfile);
alter_startup_line(startup_line);
error = system(startup_line);
if (error == -1)
@@ -304,21 +304,20 @@
DS_EXPORT_SYMBOL int
ds_bring_up_server(int verbose)
{
- char *root;
+ char *instdir;
int status;
- char *errorlog;
+ char *errorlog;
status = ds_get_updown_status();
if ( status == DS_SERVER_UP )
return(DS_SERVER_ALREADY_UP);
- /* NGK - Need to eliminate root */
- if ( (root = ds_get_install_root()) == NULL )
+ if ( (instdir = ds_get_instance_dir()) == NULL )
return(DS_SERVER_UNKNOWN);
errorlog = ds_get_config_value(DS_ERRORLOG);
if ( errorlog == NULL ) {
errorlog = ds_get_errors_name(); /* fallback */
}
- return ds_bring_up_server_install(verbose, root, errorlog);
+ return ds_bring_up_server_install(verbose, instdir, errorlog);
}
DS_EXPORT_SYMBOL int
@@ -530,7 +529,7 @@
StartNetscapeProgram()
{
char line[BIG_LINE], cmd[BIG_LINE];
- char *tmp = ds_get_install_root();
+ char *tmp = ds_get_instance_dir();
CHAR ErrorString[512];
STARTUPINFO siStartInfo;
16 years, 10 months
- 1
- 0