389-commits February 2011

389-commits@lists.fedoraproject.org

5 participants
88 discussions

Branch '389-ds-base-1.2.8' - ldap/servers
by Richard Allen Megginson 28 Feb '11

28 Feb '11

ldap/servers/plugins/replication/repl5.h | 1 + ldap/servers/plugins/replication/repl5_protocol.c | 8 ++++++-- ldap/servers/plugins/replication/windowsrepl.h | 1 - 3 files changed, 7 insertions(+), 3 deletions(-) New commits: commit 9eb6f1b913555948f0251d4b7a494c989fb3ebf8 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Mon Feb 28 15:15:27 2011 -0700 Bug 676655 - winsync stops working after server restart https://bugzilla.redhat.com/show_bug.cgi?id=676655 Resolves: bug 676655 Bug Description: winsync stops working after server restart Reviewed by: nhosoi (Thanks!) Branch: 389-ds-base-1.2.8 Fix Description: The problem really is that the server does not shutdown. You have to kill -9 the server. When it restarts, the sync agreement is no longer working. The problem was only observed on 32-bit platforms. The size of the mmr Repl_Connection structure is different than the size of the winsync Repl_Connection structure. The code was calling conn_delete() on the winsync Repl_Connection*. We have to use windows_conn_delete instead. The repl protocol code did not have a place to do that, so I added a new delete_conn function pointer so that prot_free can call the right conn_delete function. Platforms tested: RHEL5 i386, RHEL6 x86_64 Flag Day: no Doc impact: no (cherry picked from commit 11f265bdd03832c6255cbf5ba3b79510346a3be0) diff --git a/ldap/servers/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h index 54d3952..d59169d 100644 --- a/ldap/servers/plugins/replication/repl5.h +++ b/ldap/servers/plugins/replication/repl5.h @@ -604,6 +604,7 @@ void windows_init_agreement_from_entry(Repl_Agmt *ra, Slapi_Entry *e); int windows_handle_modify_agreement(Repl_Agmt *ra, const char *type, Slapi_Entry *e); void windows_agreement_delete(Repl_Agmt *ra); Repl_Connection *windows_conn_new(Repl_Agmt *agmt); +void windows_conn_delete(Repl_Connection *conn); /* repl_session_plugin.c */ void repl_session_plugin_init(); diff --git a/ldap/servers/plugins/replication/repl5_protocol.c b/ldap/servers/plugins/replication/repl5_protocol.c index 8243688..c6aaba9 100644 --- a/ldap/servers/plugins/replication/repl5_protocol.c +++ b/ldap/servers/plugins/replication/repl5_protocol.c @@ -68,6 +68,7 @@ typedef struct repl_protocol Private_Repl_Protocol *prp_active_protocol; /* Pointer to active protocol */ Repl_Agmt *agmt; /* The replication agreement we're servicing */ Repl_Connection *conn; /* Connection to remote server */ + void (*delete_conn)(Repl_Connection *conn); /* mmr conn is different than winsync conn */ Object *replica_object; /* Local replica. If non-NULL, replica object is acquired */ int state; int next_state; @@ -127,11 +128,13 @@ prot_new(Repl_Agmt *agmt, int protocol_state) { rp->prp_incremental = private_protocol_factory(rp, PROTOCOL_5_INCREMENTAL); rp->prp_total = private_protocol_factory(rp, PROTOCOL_5_TOTAL); + rp->delete_conn = conn_delete; } else if (get_agmt_agreement_type(agmt) == REPLICA_TYPE_WINDOWS) { rp->prp_incremental = private_protocol_factory(rp, PROTOCOL_WINDOWS_INCREMENTAL); rp->prp_total = private_protocol_factory(rp, PROTOCOL_WINDOWS_TOTAL); + rp->delete_conn = windows_conn_delete; } /* XXXggood register callback handlers for entries updated, and @@ -192,9 +195,10 @@ prot_free(Repl_Protocol **rpp) { object_release(rp->replica_object); } - if (NULL != rp->conn) + if ((NULL != rp->conn) && (NULL != rp->delete_conn)) { - conn_delete(rp->conn); + rp->delete_conn(rp->conn); + rp->conn = NULL; } rp->prp_active_protocol = NULL; PR_Unlock(rp->lock); diff --git a/ldap/servers/plugins/replication/windowsrepl.h b/ldap/servers/plugins/replication/windowsrepl.h index 9ecf75d..158b0d1 100644 --- a/ldap/servers/plugins/replication/windowsrepl.h +++ b/ldap/servers/plugins/replication/windowsrepl.h @@ -90,7 +90,6 @@ void windows_private_set_one_way(const Repl_Agmt *ra, PRBool value); /* in windows_connection.c */ ConnResult windows_conn_connect(Repl_Connection *conn); void windows_conn_disconnect(Repl_Connection *conn); -void windows_conn_delete(Repl_Connection *conn); void windows_conn_get_error(Repl_Connection *conn, int *operation, int *error); void windows_conn_set_error(Repl_Connection *conn, int error); ConnResult windows_conn_send_add(Repl_Connection *conn, const char *dn, LDAPMod **attrs,

1 0

ldap/servers
by Richard Allen Megginson 28 Feb '11

28 Feb '11

ldap/servers/plugins/replication/repl5.h | 1 + ldap/servers/plugins/replication/repl5_protocol.c | 8 ++++++-- ldap/servers/plugins/replication/windowsrepl.h | 1 - 3 files changed, 7 insertions(+), 3 deletions(-) New commits: commit 11f265bdd03832c6255cbf5ba3b79510346a3be0 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Mon Feb 28 15:15:27 2011 -0700 Bug 676655 - winsync stops working after server restart https://bugzilla.redhat.com/show_bug.cgi?id=676655 Resolves: bug 676655 Bug Description: winsync stops working after server restart Reviewed by: nhosoi (Thanks!) Branch: master Fix Description: The problem really is that the server does not shutdown. You have to kill -9 the server. When it restarts, the sync agreement is no longer working. The problem was only observed on 32-bit platforms. The size of the mmr Repl_Connection structure is different than the size of the winsync Repl_Connection structure. The code was calling conn_delete() on the winsync Repl_Connection*. We have to use windows_conn_delete instead. The repl protocol code did not have a place to do that, so I added a new delete_conn function pointer so that prot_free can call the right conn_delete function. Platforms tested: RHEL5 i386, RHEL6 x86_64 Flag Day: no Doc impact: no diff --git a/ldap/servers/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h index 54d3952..d59169d 100644 --- a/ldap/servers/plugins/replication/repl5.h +++ b/ldap/servers/plugins/replication/repl5.h @@ -604,6 +604,7 @@ void windows_init_agreement_from_entry(Repl_Agmt *ra, Slapi_Entry *e); int windows_handle_modify_agreement(Repl_Agmt *ra, const char *type, Slapi_Entry *e); void windows_agreement_delete(Repl_Agmt *ra); Repl_Connection *windows_conn_new(Repl_Agmt *agmt); +void windows_conn_delete(Repl_Connection *conn); /* repl_session_plugin.c */ void repl_session_plugin_init(); diff --git a/ldap/servers/plugins/replication/repl5_protocol.c b/ldap/servers/plugins/replication/repl5_protocol.c index 8243688..c6aaba9 100644 --- a/ldap/servers/plugins/replication/repl5_protocol.c +++ b/ldap/servers/plugins/replication/repl5_protocol.c @@ -68,6 +68,7 @@ typedef struct repl_protocol Private_Repl_Protocol *prp_active_protocol; /* Pointer to active protocol */ Repl_Agmt *agmt; /* The replication agreement we're servicing */ Repl_Connection *conn; /* Connection to remote server */ + void (*delete_conn)(Repl_Connection *conn); /* mmr conn is different than winsync conn */ Object *replica_object; /* Local replica. If non-NULL, replica object is acquired */ int state; int next_state; @@ -127,11 +128,13 @@ prot_new(Repl_Agmt *agmt, int protocol_state) { rp->prp_incremental = private_protocol_factory(rp, PROTOCOL_5_INCREMENTAL); rp->prp_total = private_protocol_factory(rp, PROTOCOL_5_TOTAL); + rp->delete_conn = conn_delete; } else if (get_agmt_agreement_type(agmt) == REPLICA_TYPE_WINDOWS) { rp->prp_incremental = private_protocol_factory(rp, PROTOCOL_WINDOWS_INCREMENTAL); rp->prp_total = private_protocol_factory(rp, PROTOCOL_WINDOWS_TOTAL); + rp->delete_conn = windows_conn_delete; } /* XXXggood register callback handlers for entries updated, and @@ -192,9 +195,10 @@ prot_free(Repl_Protocol **rpp) { object_release(rp->replica_object); } - if (NULL != rp->conn) + if ((NULL != rp->conn) && (NULL != rp->delete_conn)) { - conn_delete(rp->conn); + rp->delete_conn(rp->conn); + rp->conn = NULL; } rp->prp_active_protocol = NULL; PR_Unlock(rp->lock); diff --git a/ldap/servers/plugins/replication/windowsrepl.h b/ldap/servers/plugins/replication/windowsrepl.h index 9ecf75d..158b0d1 100644 --- a/ldap/servers/plugins/replication/windowsrepl.h +++ b/ldap/servers/plugins/replication/windowsrepl.h @@ -90,7 +90,6 @@ void windows_private_set_one_way(const Repl_Agmt *ra, PRBool value); /* in windows_connection.c */ ConnResult windows_conn_connect(Repl_Connection *conn); void windows_conn_disconnect(Repl_Connection *conn); -void windows_conn_delete(Repl_Connection *conn); void windows_conn_get_error(Repl_Connection *conn, int *operation, int *error); void windows_conn_set_error(Repl_Connection *conn, int error); ConnResult windows_conn_send_add(Repl_Connection *conn, const char *dn, LDAPMod **attrs,

1 0

admserv/cfgstuff admserv/cgi-src40 admserv/html include/libadmin include/libdsa lib/libadmin mod_restartd/mod_restartd-2.2.c
by Noriko Hosoi 28 Feb '11

28 Feb '11

admserv/cfgstuff/httpd-2.2.conf.in | 2 - admserv/cfgstuff/httpd.conf.in | 2 - admserv/cgi-src40/head.html | 1 admserv/cgi-src40/help.c | 2 - admserv/cgi-src40/htmladmin.c | 2 + admserv/cgi-src40/htmladmin.properties | 42 +++++++++++++++---------------- admserv/cgi-src40/repl-monitor-cgi.pl.in | 37 ++++++++++++++++++--------- admserv/cgi-src40/viewdata.properties | 2 - admserv/cgi-src40/viewlog.c | 7 ++++- admserv/cgi-src40/viewlog.properties | 6 ++-- admserv/html/admserv.html.in | 11 ++++---- admserv/html/htmladmin.html.in | 13 ++------- admserv/html/monreplication.html | 20 ++++++++++---- admserv/html/viewdata.html | 6 +--- admserv/html/viewlog.html | 14 ++-------- include/libadmin/libadmin.h | 2 - include/libdsa/dsalib.h | 2 - lib/libadmin/referer.c | 4 +- lib/libadmin/template.c | 29 ++++++++------------- lib/libadmin/util.c | 3 -- mod_restartd/mod_restartd-2.2.c | 2 - 21 files changed, 111 insertions(+), 98 deletions(-) New commits: commit 95916e3cfbc1f3e30b3f43464456135e9b437712 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Fri Feb 25 17:06:41 2011 -0800 Bug 211296 - Clean up all HTML pages (Admin Express, Repl Monitor, etc) https://bugzilla.redhat.com/show_bug.cgi?id=211296 Description: 1) Using HTML Validator, reviewed html pages (static as well as the generated ones) and fixed the errors and warnings. 2) To allow execute perl cgi script repl-monitor-cgi.pl, enabled AddHandler cgi-script for the extention .pl. 3) repl-monitor-cgi.pl did not pass the parameters sent from the caller cgi monreplication. This patch fixes the bug. diff --git a/admserv/cfgstuff/httpd-2.2.conf.in b/admserv/cfgstuff/httpd-2.2.conf.in index 4561f0b..c9ef421 100644 --- a/admserv/cfgstuff/httpd-2.2.conf.in +++ b/admserv/cfgstuff/httpd-2.2.conf.in @@ -551,7 +551,7 @@ AddType application/x-gzip .gz .tgz # To use CGI scripts outside of ScriptAliased directories: # (You will also need to add "ExecCGI" to the "Options" directive.) # -#AddHandler cgi-script .cgi +AddHandler cgi-script .pl # # For files that include their own HTTP headers: diff --git a/admserv/cfgstuff/httpd.conf.in b/admserv/cfgstuff/httpd.conf.in index 197eead..a66eb21 100644 --- a/admserv/cfgstuff/httpd.conf.in +++ b/admserv/cfgstuff/httpd.conf.in @@ -561,7 +561,7 @@ AddType application/x-gzip .gz .tgz # To use CGI scripts outside of ScriptAliased directories: # (You will also need to add "ExecCGI" to the "Options" directive.) # -#AddHandler cgi-script .cgi +AddHandler cgi-script .pl # # For files that include their own HTTP headers: diff --git a/admserv/cgi-src40/head.html b/admserv/cgi-src40/head.html index b5a72da..5ae12fc 100644 --- a/admserv/cgi-src40/head.html +++ b/admserv/cgi-src40/head.html @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"> <html> \n</SCRIPT>\n\n" } -htmladmin61 { "<table border=0 cellpadding=0 cellspacing=0 cols=2 width=100%% bgcolor=\"#CCCCCC\">\n" } +htmladmin60 { "<SCRIPT type=\"text/javascript\">\n\n</SCRIPT>\n\n" } +htmladmin61 { "<table border=0 cellpadding=0 cellspacing=0 width=100%% bgcolor=\"#CCCCCC\"><colgroup><col><col span=\"2\"></colgroup>\n" } htmladmin62 { "<tr>\n<td colspan=2 BGCOLOR=\"#666699\"><img src=\"/icons/domain16.gif\" BORDER=0 height=16 width=16> %s</td>\n</tr>\n\n" } htmladmin63 { "<tr>\n<td colspan=2 BGCOLOR=\"#999999\"><img src=\"/icons/host.gif\" BORDER=0 height=16 width=16> %s</td>\n</tr>\n\n" } htmladmin64 { "<tr>\n<td colspan=2><img src=\"/icons/16space.gif\" BORDER=0 height=16 width=16><img src=\"/icons/group2.gif\" BORDER=0 height=16 width=16> %s</td>\n</tr>\n\n" } htmladmin65 { "<tr>\n<td colspan=2><img src=\"/icons/16space.gif\" BORDER=0 height=16 width=32><img src=\"/icons/%s\" BORDER=0 height=16 width=16> %s%s</td>\n</tr>\n\n" } htmladmin66 { "<tr>\n<td><img src=\"/icons/16space.gif\" BORDER=0 height=16 width=48>\n* %s</td>\n<td> <A HREF=\"%s\" target=_new>Server Manager</A></td>\n</tr>\n\n\"" } htmladmin67 { "<tr>\n<td><img src=\"/icons/16space.gif\" BORDER=0 height=16 width=48>\n* %s</td>\n\n<td>\n\n\n" } -htmladmin68 { " <A HREF=\"%s/admin-serv/tasks/operation/Stop?return_format=html\" onclick=\"return confirm_admin_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" } -htmladmin69 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_admin_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" } +htmladmin68 { " <A HREF=\"%s/admin-serv/tasks/operation/Stop?return_format=html\" onclick=\"return confirm_admin_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 style=\"vertical-align: center;\"></A>" } +htmladmin69 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_admin_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 style=\"vertical-align: center;\"></A>" } htmladmin70 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\" target=\"main\">Server Info</A> |\n" } htmladmin71 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\" target=\"main\">Logs</A> |\n" } htmladmin72 { "%s%s Status=%s%s\n\n" } htmladmin73 { "On" } htmladmin74 { "Off" } htmladmin75 { "Unknown" } -htmladmin76 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_directory_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" } -htmladmin77 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" } +htmladmin76 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_directory_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 style=\"vertical-align: center;\"></A>" } +htmladmin77 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 style=\"vertical-align: center;\"></A>" } htmladmin78 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\" target=\"main\">Server Info</A> |\n" } htmladmin79 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\" target=\"main\">Logs</A> |\n" } htmladmin80 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\" target=\"main\">Server Info</A> |\n" } htmladmin81 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\" target=\"main\">Logs</A>\n" } htmladmin82 { "%s%s\n\n" } htmladmin83 { "<tr>\n<td>\n<table BORDER=0 CELLSPACING=0 CELLPADDING=0>\n<tr>\n<td><img src=\"/icons/16space.gif\" BORDER=0 height=16 width=64></td>\n\n<td>\n<table BORDER=0 CELLSPACING=0 CELLPADDING=0 COLS=1 WIDTH=\"100%%\">\n<tr>\n<td>*b %s</td>\n</tr>\n</table>\n</td>\n\n" } -htmladmin84 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" } -htmladmin85 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" } +htmladmin84 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 style=\"vertical-align: center;\"></A>" } +htmladmin85 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 style=\"vertical-align: center;\"></A>" } htmladmin86 { " Status=%s%s\n\n" } -htmladmin87 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" } -htmladmin88 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" } +htmladmin87 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 style=\"vertical-align: center;\"></A>" } +htmladmin88 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 style=\"vertical-align: center;\"></A>" } htmladmin89 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\" target=\"main\">Server Info</A> |\n" } htmladmin90 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\" target=\"main\">Logs</A> |\n" } -htmladmin91 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" } -htmladmin92 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" } +htmladmin91 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 style=\"vertical-align: center;\"></A>" } +htmladmin92 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 style=\"vertical-align: center;\"></A>" } htmladmin93 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\" target=\"main\">Server Info</A> |\n" } htmladmin94 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\" target=\"main\">Logs</A> |\n" } -htmladmin95 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" } -htmladmin96 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" } +htmladmin95 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 style=\"vertical-align: center;\"></A>" } +htmladmin96 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 style=\"vertical-align: center;\"></A>" } htmladmin97 { "<td><A HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\" target=\"main\">Server Info</A> |</td>\n" } htmladmin98 { "<td><A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\" target=\"main\">Logs</A> |</td>\n" } htmladmin99 { "\n</td>\n</tr>\n\n" } htmladmin100 { "%s%s%s Status=%s%s\n\n" } -htmladmin101 { "<A HREF=\"%s/admin-serv/tasks/configuration/MonReplication?servhost=%s&servport=%d&admurl=%s\" target=\"main\">Replication Status</A> |\n" } +htmladmin101 { "<A HREF=\"%s/admin-serv/tasks/configuration/MonReplication?servhost=%s&servport=%d&admurl=%s\" target=\"main\">Replication Status</A> |\n" } } diff --git a/admserv/cgi-src40/repl-monitor-cgi.pl.in b/admserv/cgi-src40/repl-monitor-cgi.pl.in index b379ab6..5529454 100755 --- a/admserv/cgi-src40/repl-monitor-cgi.pl.in +++ b/admserv/cgi-src40/repl-monitor-cgi.pl.in @@ -43,24 +43,37 @@ use CGI; my $query = CGI->new; @ARGV = (); # clear it out -my $configfile; -if ($ENV{DS_CONFIG_DIR} and -d $ENV{DS_CONFIG_DIR}) { - $configfile = "$ENV{DS_CONFIG_DIR}/@instancename@/replmon.conf"; -} elsif ("@instconfigdir@" and -d "@instconfigdir@") { - $configfile = "@instconfigdir@/replmon.conf"; +if ( $query->url_param('configfile') eq "" ) { + my $configfile; + if ($ENV{DS_CONFIG_DIR} and -d $ENV{DS_CONFIG_DIR}) { + $configfile = "$ENV{DS_CONFIG_DIR}/@instancename@/replmon.conf"; + } elsif ("@instconfigdir@" and -d "@instconfigdir@") { + $configfile = "@instconfigdir@/replmon.conf"; + } + push @ARGV, '-f', $configfile; +} else { + push @ARGV, '-f', $query->url_param('configfile'); } -push @ARGV, '-f', $configfile; - my $refreshinterval = $query->url_param('refreshinterval') ? int($query->url_param('refreshinterval')) : "300"; push @ARGV, '-t', $refreshinterval; -my $admurl = "http://"; -if ($ENV{HTTPS} and (lc($ENV{HTTPS}) eq "on")) { - $admurl = "https://"; +if ( $query->url_param('admurl') eq "" ) { + my $admurl = "http://"; + if ($ENV{HTTPS} and (lc($ENV{HTTPS}) eq "on")) { + $admurl = "https://"; + } + $admurl .= $ENV{HTTP_HOST} . $ENV{SCRIPT_NAME} . "?refreshinterval=$refreshinterval"; + push @ARGV, '-u', $admurl; +} else { + push @ARGV, '-u', $query->url_param('admurl'); +} +if ( $query->url_param('servhost') ne "" ) { + push @ARGV, '-h', $query->url_param('servhost'); +} +if ( $query->url_param('servport') ne "" ) { + push @ARGV, '-p', $query->url_param('servport'); } -$admurl .= $ENV{HTTP_HOST} . $ENV{SCRIPT_NAME} . "?refreshinterval=$refreshinterval"; -push @ARGV, '-u', $admurl; # Now the real work require "@bindir@/repl-monitor.pl"; diff --git a/admserv/cgi-src40/viewdata.properties b/admserv/cgi-src40/viewdata.properties index fd1a57e..d04742f 100644 --- a/admserv/cgi-src40/viewdata.properties +++ b/admserv/cgi-src40/viewdata.properties @@ -37,7 +37,7 @@ viewdata29 { "<tr>\n<td>\n<div align=right>\n<td>\n<div align=right>Description:</div>\n</td>\n<td>%s</td>\n</tr>\n" } viewdata31 { "<table BORDER=0 CELLSPACING=6 CELLPADDING=0>\n" } viewdata32 { "</table>\n" } -viewdata33 { "<tr>\n<td>%s</td>\n</tr>\n<tr>\n<td BACKGROUND=\"/icons/hr.gif\"> </td>\n</tr>\n<tr><td>" } +viewdata33 { "<tr>\n<td>%s</td>\n</tr>\n<tr>\n<td style=\"background-image:url(/icons/hr.gif)\"> </td>\n</tr>\n<tr><td>" } viewdata34 { "<A HREF=\"%s\" target=\"new\">Upgrade Available</A>\n" } viewdata35 { "No Upgrade Available\n" } viewdata36 { "<A HREF=\"%s\" target=\"new\">%s</A>\n" } diff --git a/admserv/cgi-src40/viewlog.c b/admserv/cgi-src40/viewlog.c index 6ec93f2..2eff9c2 100644 --- a/admserv/cgi-src40/viewlog.c +++ b/admserv/cgi-src40/viewlog.c @@ -84,6 +84,8 @@ #define DBT_MAIN_ID_TITLE resource_key(RESOURCE_FILE, "26") #define DBT_MAIN_WIDTH resource_key(RESOURCE_FILE, "27") #define DBT_MAIN_TABLE resource_key(RESOURCE_FILE, "28") +#define DBT_MAIN_TABLE_FONT resource_key(RESOURCE_FILE, "29") +#define DBT_MAIN_TABLE_FONT_CLOSE resource_key(RESOURCE_FILE, "30") static char *acceptLanguage = (char*)"en"; static Resource *i18nResource = NULL; @@ -442,13 +444,16 @@ int main(int argc, char *argv[]) fprintf(stdout, (const char*)getResourceString(DBT_MAIN_TABLE), tmp); + fprintf(stdout, getResourceString(DBT_MAIN_TABLE_FONT)); /* begin search */ if(cmd) { search_file(cmd, atoi(num), str); fclose(cmd); } - } else + fprintf(stdout, getResourceString(DBT_MAIN_TABLE_FONT_CLOSE)); + } else { fputs(line, stdout); + } } } } else { diff --git a/admserv/cgi-src40/viewlog.properties b/admserv/cgi-src40/viewlog.properties index 6409d12..da77cc4 100644 --- a/admserv/cgi-src40/viewlog.properties +++ b/admserv/cgi-src40/viewlog.properties @@ -42,8 +42,10 @@ viewlog22 { "<option value=%s>%s\n" } viewlog23 { "<option value=No log files>No log files\n" } viewlog24 { "</select>" } viewlog25 { "<input type=\"hidden\" name=\"id\" value=\"%s\">\n" } -viewlog26 { "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%%\">\n<tr>\n<td>%s Logs</td>\n</tr>\n<tr>\n<td BACKGROUND=\"/icons/hr.gif\"> </td>\n</tr>\n<tr><td></table>\n" } +viewlog26 { "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%%\">\n<tr>\n<td>%s Logs</td>\n</tr>\n<tr>\n<td style=\"background-image:url(/icons/hr.gif)\"> </td>\n</tr>\n<tr><td></table>\n" } viewlog27 { "<hr width=50%%>\n" } -viewlog28 { "<table border=1 width=100%%><tr><th>%s</th></tr></table>\n" } +viewlog28 { "<table border=1 width=100%%><tr><th>%s</th></tr></table>\n" } +viewlog29 { "<pre>\n" } +viewlog30 { "</pre>\n" } } diff --git a/admserv/html/admserv.html.in b/admserv/html/admserv.html.in index f01bf17..6b4ecdd 100644 --- a/admserv/html/admserv.html.in +++ b/admserv/html/admserv.html.in @@ -20,10 +20,11 @@ END COPYRIGHT BLOCK --> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"> <html> <head> <title>@capbrand@ Management Console</title> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366"> @@ -73,8 +74,8 @@ <tr valign="TOP"> <td><img src="/icons/goto.gif" width="10" height="15"> </td> <td><a href='@vendorurl@'>@vendor@ Home Page</a> - Check for upgrades and information about @capbrand@ server products. - </td> + Check for upgrades and information about @capbrand@ server products. + </td> </tr> <tr valign="TOP"> <td> </td> @@ -84,8 +85,8 @@ <td><img src="/icons/goto.gif" width="10" height="15"> </td> <td><a href='/admin-serv/tasks/configuration/HTMLAdmin?op=index'>@capbrand@ Administration Express</a> - View server status and configuration/log data. - </td> + View server status and configuration/log data. + </td> </tr> <tr valign="TOP"> <td> </td> diff --git a/admserv/html/htmladmin.html.in b/admserv/html/htmladmin.html.in index 95822b6..42dc57b 100644 --- a/admserv/html/htmladmin.html.in +++ b/admserv/html/htmladmin.html.in @@ -20,11 +20,8 @@ END COPYRIGHT BLOCK --> -<html> -<head> -<title></title> -</head> -<SCRIPT language="javascript"> +<body text="#FFFFFF" bgcolor="#666699" link="#FFFFFF" vlink="#FFFFFF" alink="#333366"> +<SCRIPT TYPE="text/javascript">  </SCRIPT> -<body text="#FFFFFF" bgcolor="#666699" link="#FFFFFF" vlink="#FFFFFF" alink="#333366"> <table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BGCOLOR="#666699" > <tr> <td WIDTH="100%"> @@ -65,7 +61,7 @@ function home_onMouseDown(evt) Express</td> <td ALIGN=RIGHT NOWRAP> -<table BORDER=0 CELLSPACING=0 CELLPADDING=0 COLS=1 WIDTH="100%" > +<table BORDER=0 CELLSPACING=0 CELLPADDING=0 STYLE="COLS: 1" WIDTH="100%" > <tr> <td ALIGN=RIGHT WIDTH="100"></td> </tr> @@ -80,10 +76,9 @@ Express</td> <td>  -<img SRC="/icons/help.gif" height=25 width=27 align=TEXTTOP border=0> Help</A> +<img SRC="/icons/help.gif" height=25 width=27 border=0> Help</A> </td> </tr> </table> </body> -</html> diff --git a/admserv/html/monreplication.html b/admserv/html/monreplication.html index e69c53c..cfc4fe9 100644 --- a/admserv/html/monreplication.html +++ b/admserv/html/monreplication.html @@ -20,8 +20,10 @@ END COPYRIGHT BLOCK --> +<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"> <HTML> <HEAD> +<TITLE>monreplication</TITLE> <META HTTP-EQUIV="Content-type" CONTENT="text/html;charset=utf-8"> </HEAD> <body text="#000000" bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366"> @@ -32,25 +34,31 @@ <form method=GET action=repl-monitor-cgi.pl> +<table border="0" cellpadding="3" cellspacing="2"> +<tr> +<td width=15% nowrap> -<table border="0" cellpadding="3" cellspacing="2" cols="2"> -<tr><td width=15% nowrap>  + <td nowrap> +  -<tr><td width=15% nowrap> + +<tr> +<td width=15% nowrap> +  + <td> +  + </table> -      - -</form> </body> </HTML> diff --git a/admserv/html/viewdata.html b/admserv/html/viewdata.html index f1e564f..2780de6 100644 --- a/admserv/html/viewdata.html +++ b/admserv/html/viewdata.html @@ -20,8 +20,10 @@ END COPYRIGHT BLOCK --> +<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"> <HTML> <HEAD> +<TITLE>viewdata</TITLE> <META HTTP-EQUIV="Content-type" CONTENT="text/html;charset=utf-8"> </HEAD> <body text="#000000" bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366"> @@ -29,13 +31,9 @@ <table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">  -  - Additional Information: -  -  </table> diff --git a/admserv/html/viewlog.html b/admserv/html/viewlog.html index da56144..b161f55 100644 --- a/admserv/html/viewlog.html +++ b/admserv/html/viewlog.html @@ -20,40 +20,34 @@ END COPYRIGHT BLOCK --> +<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"> <HTML> <HEAD> +<TITLE>viewlog</TITLE> <META HTTP-EQUIV="Content-type" CONTENT="text/html;charset=utf-8"> </HEAD> <body text="#000000" bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366"> -  - <table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%"> <tr> <td> <form method=GET action=ViewLog> -  +       +    - -</form> - - -<pre>  -</pre> - </td> </tr> diff --git a/include/libadmin/libadmin.h b/include/libadmin/libadmin.h index a29c2fe..7a47f95 100644 --- a/include/libadmin/libadmin.h +++ b/include/libadmin/libadmin.h @@ -189,7 +189,7 @@ NSAPI_PUBLIC char *GetQueryNT(void); #define HTML_ERRCOLOR "#AA0000" -#define MOCHA_NAME "JavaScript" +#define MOCHA_NAME "javascript" /* Internationalization stuffs. If we define MSG_RETURN, then create a * function which will return a string of the given identifier. If we diff --git a/include/libdsa/dsalib.h b/include/libdsa/dsalib.h index d6ffc80..de97b95 100644 --- a/include/libdsa/dsalib.h +++ b/include/libdsa/dsalib.h @@ -131,7 +131,7 @@ #define SLAPD_NAME "ns-slapd" #endif -#define MOCHA_NAME "JavaScript" +#define MOCHA_NAME "javascript" /* * Return values from ds_get_updown_status() diff --git a/lib/libadmin/referer.c b/lib/libadmin/referer.c index 35380b3..ef120f2 100644 --- a/lib/libadmin/referer.c +++ b/lib/libadmin/referer.c @@ -70,7 +70,7 @@ redirect_to_referer( char *addition ) url = fixAddition(ref, addition ); fprintf( stderr, "Content-type: text/html\n\n" - "<SCRIPT language="MOCHA_NAME">\n" + "<SCRIPT type=\"text/"MOCHA_NAME"\">\n" "window.location='%s';\n" "</SCRIPT>\n", url ); FREE( url ); @@ -84,7 +84,7 @@ js_open_referer( void ) ref = cookieValue( REFER_VAR, NULL ); fprintf( stdout, - "<SCRIPT language="MOCHA_NAME">\n" + "<SCRIPT type=\"text/"MOCHA_NAME"\">\n" "window.location='%s'\n" "</SCRIPT>\n", ref ); } diff --git a/lib/libadmin/template.c b/lib/libadmin/template.c index 49e478d..4cf61bd 100644 --- a/lib/libadmin/template.c +++ b/lib/libadmin/template.c @@ -382,7 +382,7 @@ NSAPI_PUBLIC char *helpJavaScriptForTopic( char *topic ) * URL changed to add new "mapfile" parameter for 5.0 help system - Adam */ util_snprintf( line, sizeof(line), - "window.open('%s/manual/help/help?helpdir=admin&token=%s&mapfile=tokens.map', '" + "window.open('%s/manual/help/help?helpdir=admin&token=%s&mapfile=tokens.map', '" INFO_IDX_NAME"_%s', " HELP_WIN_OPTIONS");", getenv("SERVER_URL"), topic, @@ -411,7 +411,7 @@ void submit(int verify, char **vars) char outline[BIG_LINE]; if(verify) { - util_snprintf(line, sizeof(line), "<SCRIPT language="MOCHA_NAME">\n" + util_snprintf(line, sizeof(line), "<SCRIPT type=\"text/"MOCHA_NAME"\">\n" "function verify(form) {\n" " if(confirm('Do you really want to %s?'))\n" " form.submit();\n" @@ -453,9 +453,6 @@ void submit(int verify, char **vars) output("</tr></table></center>\n"); output("</form>\n"); - - output("<SCRIPT language="MOCHA_NAME">\n"); - output("</SCRIPT>\n"); } @@ -488,12 +485,12 @@ void helplink() */ util_snprintf( line, sizeof(line), "<A HREF=\"javascript:" - "if ( top.helpwin ) {" - " top.helpwin.focus();" - " top.helpwin.infotopic.location='%s/manual/help/help?helpdir=admin&token=%s&mapfile=tokens.map';" - "} else {" - " window.open('%s/manual/help/help?helpdir=admin&token=%s&mapfile=tokens.map', '" - INFO_IDX_NAME"_%s', " + "if(top.helpwin){" + "top.helpwin.focus();" + "top.helpwin.infotopic.location='%s/manual/help/help?helpdir=admin&token=%s&mapfile=tokens.map';" + "}else{" + "window.open('%s/manual/help/help?helpdir=admin&token=%s&mapfile=tokens.map','" + INFO_IDX_NAME"_%s'," HELP_WIN_OPTIONS");}" "\" target=\"messagewin\">", getenv("SERVER_URL"), sn, @@ -505,12 +502,10 @@ void helplink() void helpbutton(char *topic) { - output("<form><div align=right><table width=33%% border=2>" + output("<div align=right><table width=33%% border=2>" "<tr><td align=center>"); output(_get_help_button(topic)); - output("</td></tr></table></div></form>\n"); - output("<SCRIPT language="MOCHA_NAME">\n"); - output("</SCRIPT>\n"); + output("</td></tr></table></div>\n"); } void dialogsubmit(char *topic) @@ -543,7 +538,7 @@ void dialogsubmit(char *topic) output("</form>\n"); - output("<SCRIPT language="MOCHA_NAME">\n"); + output("<SCRIPT type=\"text/"MOCHA_NAME"\">\n"); output("</SCRIPT>\n"); } @@ -551,7 +546,7 @@ void link_referer(char **input, char **vars) { char line[BIG_LINE]; - PR_snprintf(line, sizeof(line), "<SCRIPT language="MOCHA_NAME">\n" + PR_snprintf(line, sizeof(line), "<SCRIPT type=\"text/"MOCHA_NAME"\">\n" "document.writeln( '%s'.link( '%s' ) );\n" "</SCRIPT>\n", ( vars[0] ? vars[0] : getenv( "SCRIPT_NAME" ) ), cookieValue( "adminReferer", NULL ) ); diff --git a/lib/libadmin/util.c b/lib/libadmin/util.c index 91bfb43..4b8f326 100644 --- a/lib/libadmin/util.c +++ b/lib/libadmin/util.c @@ -1875,9 +1875,8 @@ util_ldap_init( (rc = ldapssl_set_option(myld, SSL_ENABLE_SSL2, PR_FALSE)) || (rc = ldapssl_set_option(myld, SSL_ENABLE_SSL3, PR_TRUE)) || (rc = ldapssl_set_option(myld, SSL_ENABLE_TLS, PR_TRUE))) { - int prerr = PR_GetError(); - #ifdef DEBUG + int prerr = PR_GetError(); fprintf(stderr, "util_ldap_init: " "failed: unable to set SSL options (" "error %d - %s)\n", diff --git a/mod_restartd/mod_restartd-2.2.c b/mod_restartd/mod_restartd-2.2.c index 67a96d5..a4e73fb 100644 --- a/mod_restartd/mod_restartd-2.2.c +++ b/mod_restartd/mod_restartd-2.2.c @@ -1376,7 +1376,7 @@ static int cgid_handler(request_rec *r) return DECLINED; /* One final check. We only want to run Start/Stop/Restart */ - if ((ap_regexec(&uriPat, r->uri, 0, NULL,0) != 0)) { + if ((rv = ap_regexec(&uriPat, r->uri, 0, NULL,0)) != 0) { ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, "mod_restartd: attempt to run unknown program at %s. Bailing out.", r->uri); return DECLINED;

1 0

help/en
by Noriko Hosoi 28 Feb '11

28 Feb '11

help/en/header.html | 1 + help/en/help/account_mgmt.html | 2 +- help/en/help/adv_search.html | 2 +- help/en/help/configtab_chaindb.html | 4 ++-- help/en/help/configtab_chaindb2.html | 2 +- help/en/help/configtab_chaindb3.html | 4 ++-- help/en/help/configtab_chaindb4.html | 4 ++-- help/en/help/configtab_chaindb5.html | 10 ++-------- help/en/help/configtab_db2.html | 16 ++++++++-------- help/en/help/configtab_ldbmdb.html | 4 ++-- help/en/help/configtab_maptree.html | 4 ++-- help/en/help/configtab_replication.html | 4 ++-- help/en/help/configtab_replication2.html | 4 ++-- help/en/help/configtab_replication3.html | 12 ++++++------ help/en/help/configtab_rootnode.html | 4 ++-- help/en/help/configtab_rootnode3.html | 8 ++++---- help/en/help/configtab_schema3.html | 1 - help/en/help/dir_browser2.html | 16 ++++++++-------- help/en/help/dir_browser3.html | 4 ++-- help/en/help/replication_wizard.html | 7 ++++--- help/en/help/statustab_performance.html | 20 ++++++++++---------- help/en/help/statustab_performance2.html | 12 ++++++------ help/en/help/synchronization_wizard2.html | 8 ++++---- 23 files changed, 74 insertions(+), 79 deletions(-) New commits: commit 35194d52f45434b6e18c2b3632ae22a2aae47d02 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Fri Feb 25 17:30:27 2011 -0800 Bug 211296 - Clean up all HTML pages (Admin Express, Repl Monitor, etc) https://bugzilla.redhat.com/show_bug.cgi?id=211296 Description: Using HTML Validator, reviewed help pages and fixed the errors and warnings. diff --git a/help/en/header.html b/help/en/header.html index 54161f4..da62049 100644 --- a/help/en/header.html +++ b/help/en/header.html @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"> <html> <head> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" /> diff --git a/help/en/help/account_mgmt.html b/help/en/help/account_mgmt.html index fe7c51a..7765b6e 100644 --- a/help/en/help/account_mgmt.html +++ b/help/en/help/account_mgmt.html @@ -1,5 +1,5 @@ -<a name="User Account"> </a> +<a id="User_Account"> </a> User Account diff --git a/help/en/help/adv_search.html b/help/en/help/adv_search.html index 26e3761..e695d7e 100644 --- a/help/en/help/adv_search.html +++ b/help/en/help/adv_search.html @@ -1,5 +1,5 @@ -<a name="Advanced Search"> </a> +<a id="Advanced_Search"> </a> Advanced Search diff --git a/help/en/help/configtab_chaindb.html b/help/en/help/configtab_chaindb.html index b23613b..3f3ac46 100644 --- a/help/en/help/configtab_chaindb.html +++ b/help/en/help/configtab_chaindb.html @@ -10,7 +10,7 @@ The database link contacts other servers on behalf of a client application and r New Database Link info -<ul> +<blockquote> Database suffix. Suffix the database link is created from. @@ -112,4 +112,4 @@ Configure a SASL mapping on your remote server to map the local server's Kerbero LDAP URL. This field contains a dynamically created LDAP URL that combines the server names and port numbers you specified in the remote server information fields. -<ul> +</blockquote> diff --git a/help/en/help/configtab_chaindb2.html b/help/en/help/configtab_chaindb2.html index 308be4f..486d945 100644 --- a/help/en/help/configtab_chaindb2.html +++ b/help/en/help/configtab_chaindb2.html @@ -1,5 +1,5 @@ -<a name="Database Link Settings"> </a> +<a id="Database_Link_Settings"> </a> Database Link Settings diff --git a/help/en/help/configtab_chaindb3.html b/help/en/help/configtab_chaindb3.html index 32934c1..a72c3c9 100644 --- a/help/en/help/configtab_chaindb3.html +++ b/help/en/help/configtab_chaindb3.html @@ -1,5 +1,5 @@ -<a name="Select Controls to Add"> </a> +<a id="Select_Controls_to_Add"> </a> Select Controls to Add @@ -8,7 +8,7 @@ Select an OID from the list and click OK. The following table describes the OIDs -<a name="LDAP Control OIDs  "> </a> +<a id="LDAP_Control_OIDs"> </a> Table 1    LDAP Control OIDs   diff --git a/help/en/help/configtab_chaindb4.html b/help/en/help/configtab_chaindb4.html index 6b894fd..2f08e7c 100644 --- a/help/en/help/configtab_chaindb4.html +++ b/help/en/help/configtab_chaindb4.html @@ -1,5 +1,5 @@ -<a name="Select Components to Add"> </a> +<a id="Select_Components_to_Add"> </a> Select Components to Add @@ -8,7 +8,7 @@ Select a component from the list. By default, the list contains the following co -<a name="Components Available for Chaining  "> </a> +<a id="Components_Available_for_Chaining"> </a> Table 2    Components Available for Chaining   diff --git a/help/en/help/configtab_chaindb5.html b/help/en/help/configtab_chaindb5.html index 8205275..52455e6 100644 --- a/help/en/help/configtab_chaindb5.html +++ b/help/en/help/configtab_chaindb5.html @@ -34,11 +34,8 @@ Use this dialog box to set the default attributes for all of your database links <li> Maximum hops. Specifies the number of hops, or times one database link contacts another, allowed. When one database link connects to another, this count decrements. Each subsequent database link contacted further decrements the count. If a server receives a count of 0 it determines that a loop has been detected and notifies the client application. The range is 0 to 20. -</li> - <dl> - <dt> The default maximum hops value is 10. -  </dt> </dl> +</li> </ul> @@ -76,9 +73,6 @@ The default maximum hops value is 10. <li> Connection life (sec). You can keep connections between the database link and the remote database open for an unspecified time, or you can close them after a specific period. It is faster to keep the connections open, but it uses more resources. -</li> - <dl> - <dt> A value of 0 indicates that there is no limit. By default, the value is set to 0. The range is 0 to 2147483647 seconds. -  </dt> </dl> +</li> </ul> diff --git a/help/en/help/configtab_db2.html b/help/en/help/configtab_db2.html index 72293d1..5edbb91 100644 --- a/help/en/help/configtab_db2.html +++ b/help/en/help/configtab_db2.html @@ -14,7 +14,7 @@ Use this tab to set up a password policy for the directory. User Password Change -<ul> +<blockquote> User must change password after reset. When selected, users must change their passwords when they first log in or after the administrator resets the passwords. @@ -34,12 +34,12 @@ Use this tab to set up a password policy for the directory. Remember X passwords. If the server is keeping a password history, this option specifies how many old passwords the server should store in the history list. The valid value range is from 2 to 24. The default value is 6. -</ul> +</blockquote> Password Expiration -<ul> +<blockquote> Password never expires. Select this if you do not require users to change their passwords periodically. @@ -63,12 +63,12 @@ A common policy is to have passwords expire every 30 to 90 days. By default, the Allow up to X attempt(s) after password expires. Indicates the number of grace logins permitted after a user's password has expired. Grace logins are not permitted by default. -</ul> +</blockquote> Password Syntax -<ul> +<blockquote> Check password syntax. Select this checkbox to enforce password syntax checking. Syntax checking ensures that the password strings conform to the syntax guidelines, such as minimum password length. @@ -112,13 +112,13 @@ A common policy is to have passwords expire every 30 to 90 days. By default, the Minimum token length. If syntax checking is on, this option specifies the minimum token length that must be used in directory server passwords. The valid value range is from 1 to 64 characters. The default value is 3. -</ul> +</blockquote> Password encryption. Identifies how user passwords are stored in the directory. You can specify one of the following encryption formats: -<ul> +<blockquote> Salted Secure Hashing Algorithm (SSHA). This method is recommended as the most secure. SSHA is the default encryption method. @@ -135,7 +135,7 @@ A common policy is to have passwords expire every 30 to 90 days. By default, the No encryption (CLEAR). This encryption type indicates that the password will appear in plain text. -</ul> +</blockquote> Passwords stored using SSHA, CRYPT, or SHA formats cannot be used for secure login through SASL Digest MD5. diff --git a/help/en/help/configtab_ldbmdb.html b/help/en/help/configtab_ldbmdb.html index 2376156..874c742 100644 --- a/help/en/help/configtab_ldbmdb.html +++ b/help/en/help/configtab_ldbmdb.html @@ -10,7 +10,7 @@ Use this dialog box to create a new database. Database information. Use these options to specify the database name and location. -<ul> +<blockquote> Suffix Name. This field appears only when you create a new database in an existing suffix. Gives the name of the suffix contained by the database. @@ -22,4 +22,4 @@ Use this dialog box to create a new database. Create database in. Enter the full path to the location on your machine where you want the new database to reside. Click Browse to locate a directory. -</ul> +</blockquote> diff --git a/help/en/help/configtab_maptree.html b/help/en/help/configtab_maptree.html index a9ce831..9aa2e6b 100644 --- a/help/en/help/configtab_maptree.html +++ b/help/en/help/configtab_maptree.html @@ -18,7 +18,7 @@ Use this tab to specify settings for a particular root or sub suffix. Suffix request processing. These options help you configure how requests from client applications are managed by this suffix. -<ul> +<blockquote> Use the Databases. Select this option if you want the databases and database links to be used for processing all requests made by client applications. @@ -30,4 +30,4 @@ Use this tab to specify settings for a particular root or sub suffix. Return Referrals for Update Operations. Select this option to return a referral only during update requests. This is useful for redirecting client requests made to read-only databases. -</ul> +</blockquote> diff --git a/help/en/help/configtab_replication.html b/help/en/help/configtab_replication.html index 2c7776e..ef38c4c 100644 --- a/help/en/help/configtab_replication.html +++ b/help/en/help/configtab_replication.html @@ -14,7 +14,7 @@ The replication model used in Directory Server 4.1x and the current replication Authentication -<ul> +<blockquote> Supplier DN. Use this field to specify the distinguished name that any supplier server must use to bind to this consumer server to send replication updates. The supplier DN must correspond to an entry that is stored on the consumer server. This entry must not be part of the replicated database. @@ -26,4 +26,4 @@ The replication model used in Directory Server 4.1x and the current replication Confirm new supplier password. Confirms that the password entered in the "New supplier password" field is correct. -</ul> +</blockquote> diff --git a/help/en/help/configtab_replication2.html b/help/en/help/configtab_replication2.html index a6618cd..18ba271 100644 --- a/help/en/help/configtab_replication2.html +++ b/help/en/help/configtab_replication2.html @@ -14,7 +14,7 @@ Use this tab to configure a server as a supplier server. This applies to any se Replication Changelog -<ul> +<blockquote> Changelog database directory. The directory in which the supplier server stores the change log. @@ -34,7 +34,7 @@ Use this tab to configure a server as a supplier server. This applies to any se Max changelog age. When an entry in the change log reaches the age specified here, the server removes the entry from the change log. If you select the Unlimited checkbox, the server does not remove entries from the change log based on age. -</ul> +</blockquote> To remove a change log database that has grown too big, you must manually delete it. diff --git a/help/en/help/configtab_replication3.html b/help/en/help/configtab_replication3.html index 974914f..e71f4e2 100644 --- a/help/en/help/configtab_replication3.html +++ b/help/en/help/configtab_replication3.html @@ -14,7 +14,7 @@ Use this tab to configure replication settings for the database selected in the Replica Role. Select one of the replica roles -<ul> +<blockquote> Single Master. Select this radio button if you want this Directory Server to act as the single supplier server for this database. @@ -30,13 +30,13 @@ Use this tab to configure replication settings for the database selected in the Dedicated Consumer. Select this radio button if you want this Directory Server to accept updates from a supplier server. A dedicated consumer can service search operations but not update operations. Update operations will be referred to a supplier server. -</ul> +</blockquote> Common Settings. -<ul> +<blockquote> Replica ID. An integer between 1 and 65534 that identifies the replica. The replica IDs of the master replicas must be unique. In other words, master replicas involved in the same multi-master configuration must have different replica IDs. However, two master replicas (corresponding to different suffixes) on the same server can have the same replica ID. @@ -52,13 +52,13 @@ If the ID is incorrect, the field labels turn red and the Save button is disable Updatable by a 4.x Replica. Check this checkbox if you want this Directory Server to act as a legacy consumer of a 4.x supplier server. -</ul> +</blockquote> Update Settings. -<ul> +<blockquote> Current Supplier DNs. This field lists the supplier bind DNs that supplier servers must use to update this replica. You can specify multiple supplier bind DNs per replica, but only one supplier DN per replication agreement. Use the "Enter a new Supplier DN" field to specify a new supplier DN and click Add to add it to this list. If you have configured replication over SSL, specify the DN of the entry that contains the supplier's certificate in the "Enter a new Supplier DN" field and click Add to add it to this list. @@ -66,4 +66,4 @@ If the ID is incorrect, the field labels turn red and the Save button is disable Current URLs for referrals (Optional). Directory Server uses the information contained in the replication agreement to create referrals from the consumer server to the appropriate supplier servers. This field lists the URLs you specify in addition to the automatic URLs which will be set up automatically. If you want the consumer to return an <code>ldaps://</code> URL, so that clients will bind to the supplier servers using SSL, enter the URL in the "Enter a new URL" field and click Add to add it to this list of current URLs. In the same way, if you have a cascading replication scenario and you want the referral returned to clients to point to the original supplier instead of the hub supplier, enter the corresponding URL in the "Enter a new URL" field and click Add to add it to this list of current URLs. -</ul> +</blockquote> diff --git a/help/en/help/configtab_rootnode.html b/help/en/help/configtab_rootnode.html index 2223b29..4f02db3 100644 --- a/help/en/help/configtab_rootnode.html +++ b/help/en/help/configtab_rootnode.html @@ -10,7 +10,7 @@ Use this tab to configure the basic LDAP and network settings for your directory Network Settings -<ul> +<blockquote> Port. Port number used for non-SSL communications. By default, the port number is 389. @@ -22,7 +22,7 @@ Use this tab to configure the basic LDAP and network settings for your directory Referrals to. LDAP URL of the default referral returned to client applications who submit requests based at a DN not maintained by your directory. -</ul> +</blockquote> Make entire server read-only. Causes the server to be placed in read-only mode. Selecting this option also places all databases managed by the server into read-only mode, meaning you cannot create, modify, or delete any entries. diff --git a/help/en/help/configtab_rootnode3.html b/help/en/help/configtab_rootnode3.html index 1ac9d27..26dd8e1 100644 --- a/help/en/help/configtab_rootnode3.html +++ b/help/en/help/configtab_rootnode3.html @@ -14,7 +14,7 @@ Use this tab to configure SSL for your directory. Use this cipher family. Select the checkbox next to the cipher family or families you want the server to use for SSL communications. -<ul> +<blockquote> Security Device. Select the device you want the server to use. @@ -128,14 +128,14 @@ FIPS Triple DES with 168-bit encryption and SHA message authentication. This cip </tr> </table> -</ul> +</blockquote> Client Authentication -<ul> +<blockquote> Do not allow client authentication. Select this option if you want client applications to connect to the server using only simple authentication. @@ -159,7 +159,7 @@ If you are using certificate-based authentication with replication, then you mus If you use this option with client authentication, communication between the Management Console and the server will take place over a secure channel, but without client authentication. -</ul> +</blockquote> Check hostname against name in certificate for outbound SSL connections. Select this check box if you want an SSL-enabled Directory Server (with certificate based client authentication turned on) to verify authenticity of a request by matching the hostname against the value assigned to the Common Name (CN) attribute of the subject name in the certificate being presented. diff --git a/help/en/help/configtab_schema3.html b/help/en/help/configtab_schema3.html index 8bd68d3..598d38a 100644 --- a/help/en/help/configtab_schema3.html +++ b/help/en/help/configtab_schema3.html @@ -37,7 +37,6 @@ MultiDefines whether the attribute is multi-valued. If the checkbox in thi -<a name="28772"> </a> Edit. Click this button to edit the currently selected attribute in the tables above. diff --git a/help/en/help/dir_browser2.html b/help/en/help/dir_browser2.html index 2f75de5..d479c5c 100644 --- a/help/en/help/dir_browser2.html +++ b/help/en/help/dir_browser2.html @@ -14,7 +14,7 @@ Use this tab to set up a password policy for the currently selected subtree or u User Password Change -<ul> +<blockquote> User must change password after reset. When selected, users must change their passwords when they first log in or after the administrator resets the passwords. @@ -34,12 +34,12 @@ Use this tab to set up a password policy for the currently selected subtree or u Remember X passwords. If the server is keeping a password history, this option specifies how many old passwords the server should store in the history list. The valid value range is from 2 to 24. The default value is 6. -</ul> +</blockquote> Password Expiration -<ul> +<blockquote> Password never expires. Select this if you do not require users to change their passwords periodically. @@ -63,12 +63,12 @@ A common policy is to have passwords expire every 30 to 90 days. By default, the Allow up to X attempt(s) after password expires. Indicates the number of grace logins permitted after a user's password has expired. Grace logins are not permitted by default. -</ul> +</blockquote> Password Syntax -<ul> +<blockquote> Check password syntax. Select this checkbox to enforce password syntax checking. Syntax checking ensures that the password strings conform to the syntax guidelines, such as minimum password length. @@ -112,13 +112,13 @@ A common policy is to have passwords expire every 30 to 90 days. By default, the Minimum token length. If syntax checking is on, this option specifies the minimum token length that must be used in directory server passwords. The valid value range is from 1 to 64 characters. The default value is 3. -</ul> +</blockquote> Password encryption. Identifies how user passwords are stored in the directory. You can specify one of the following encryption formats: -<ul> +<blockquote> Salted Secure Hashing Algorithm (SSHA). This method is recommended as the most secure. SSHA is the default encryption method. @@ -135,7 +135,7 @@ A common policy is to have passwords expire every 30 to 90 days. By default, the No encryption (CLEAR). This encryption type indicates that the password will appear in plain text. -</ul> +</blockquote> Passwords stored using SSHA, CRYPT, or SHA formats cannot be used for secure login through SASL Digest MD5. diff --git a/help/en/help/dir_browser3.html b/help/en/help/dir_browser3.html index a402b58..9a50394 100644 --- a/help/en/help/dir_browser3.html +++ b/help/en/help/dir_browser3.html @@ -13,7 +13,7 @@ You can set up a account lockout policy for the directory using the Account Lock Password Lockout -<ul> +<blockquote> Lockout account after X login failures. Specify the number of times a user can fail to bind before they are locked out of the directory. Valid values are 1 to 32,767 attempts. This option is available only if account lockout is enabled. @@ -29,4 +29,4 @@ You can set up a account lockout policy for the directory using the Account Lock Lockout duration X minutes. Select this option to indicate the amount of time a user will be locked out of the directory after a series of failed bind attempts. If you select this option, you must enter a number of minutes in the text box. Valid values are 1 to 35,791,394 minutes. This option is available only if account lockout is enabled. -</ul> +</blockquote> diff --git a/help/en/help/replication_wizard.html b/help/en/help/replication_wizard.html index 5b8f58c..657d06e 100644 --- a/help/en/help/replication_wizard.html +++ b/help/en/help/replication_wizard.html @@ -18,7 +18,7 @@ Use this dialog box to identify the consumer to which you will replicate directo Connection -<ul> +<blockquote> Use LDAP (no encryption). If you want the supplier and consumer servers to use plain LDAP with no security, select this radio button. This option must be selected to use SASL/GSSAPI authentication (see below). @@ -31,12 +31,12 @@ Use this dialog box to identify the consumer to which you will replicate directo Use StartTLS (TLS/SSL encryption with LDAP). If you want the supplier and consumer servers to use TLS/SSL for secure communication using StartTLS to start an encrypted channel using LDAP, select this radio button. To use this option, you must have first configured your servers to use TLS/SSL. -</ul> +</blockquote> Authentication Mechanism -<ul> +<blockquote> Server TLS/SSL Certificate (requires TLS/SSL server set up). Select this option if you want the supplier to use its TLS/SSL server certificate for authentication. You cannot use certificate authentication unless the "Use TLS/SSL" or the "Use StartTLS" radio button in the Connection section is selected. Otherwise, this option will be disabled. The "Bind As" and Password fields are unavailable with this option because the server will use its certificate to authenticate. @@ -97,3 +97,4 @@ Configure a SASL mapping on your consumer server to map the supplier's server Ke When you are creating a new replication agreement from the Replication folder, you can choose the subtree you want to replicate. If you are creating a new replication agreement from a database under the Replication folder, the subtree is the same as that contained by the database and cannot be changed. +</blockquote> diff --git a/help/en/help/statustab_performance.html b/help/en/help/statustab_performance.html index 27aafd0..ddc52df 100644 --- a/help/en/help/statustab_performance.html +++ b/help/en/help/statustab_performance.html @@ -10,7 +10,7 @@ Use this tab to monitor your server's current activities. If the server is not r General Information -<ul> +<blockquote> Server version. Identifies the current server version. @@ -22,7 +22,7 @@ Use this tab to monitor your server's current activities. If the server is not r Current time on server. Displays the current date and time on the server. -</ul> +</blockquote> Refresh (button). Click refresh to update the current display. @@ -36,7 +36,7 @@ Use this tab to monitor your server's current activities. If the server is not r Resource Summary. This table provides the following resource information: -<ul> +<blockquote> Connections. Gives the total number of connections to this server since startup and the average number of connections per minute since startup. @@ -56,13 +56,13 @@ Use this tab to monitor your server's current activities. If the server is not r Bytes Sent To Clients. Gives the total number of bytes sent to client applications and the average number of bytes sent to client applications since server startup. -</ul> +</blockquote> Current Resource Usage. This table provides the following resource usage information: -<ul> +<blockquote> Active Threads. Current number of active threads used for handling requests. @@ -82,13 +82,13 @@ Use this tab to monitor your server's current activities. If the server is not r Database In Use. Total number of databases being used by the server. -</ul> +</blockquote> Connection Status. This table provides information on the amount of resources in use by each currently open connection. The table contains the following information: -<ul> +<blockquote> Time opened. Indicates when the connection was opened. @@ -108,13 +108,13 @@ Use this tab to monitor your server's current activities. If the server is not r Read/Write. Indicates whether the server is currently blocked for read or write access by the client application. -</ul> +</blockquote> Global Database Cache Information. -<ul> +<blockquote> Hits. Indicates the number of times the server could process a request by obtaining data from the cache rather than by going to the disk. @@ -143,4 +143,4 @@ Use this tab to monitor your server's current activities. If the server is not r Read-write page evicts. Indicates the number of read-write pages discarded from the cache to make room for new pages. This value differs from Pages Written Out in that these are discarded read-write pages that have not been modified. Pages discarded from the cache have to be written to disk, possibly affecting server performance. The lower the number of page evicts the better. -</ul> +</blockquote> diff --git a/help/en/help/statustab_performance2.html b/help/en/help/statustab_performance2.html index e009980..567b179 100644 --- a/help/en/help/statustab_performance2.html +++ b/help/en/help/statustab_performance2.html @@ -10,7 +10,7 @@ Use this tab to monitor the current activities of a particular database or datab General Information. -<ul> +<blockquote> Database. Identifies the type of database being monitored. @@ -18,7 +18,7 @@ Use this tab to monitor the current activities of a particular database or datab Configuration DN. Identifies the distinguished name you can use to obtain these results using the <code>ldapsearch</code> command-line utility. -</ul> +</blockquote> Refresh (button). Click refresh to update the current display. @@ -32,7 +32,7 @@ Use this tab to monitor the current activities of a particular database or datab Summary Information. This table provides the following information: -<ul> +<blockquote> Read-only status. Indicates whether the database is currently in read-only mode. @@ -56,13 +56,13 @@ Use this tab to monitor the current activities of a particular database or datab Maximum size of entry cache (in bytes). Maximum number of bytes available to the entry cache. -</ul> +</blockquote> Index Information. These tables provide information about the indexes you use for each database. The tables contain the following information: -<ul> +<blockquote> Cache hits. Indicates the number of times the server could process a request by obtaining data from the cache rather than by going to the disk. @@ -78,4 +78,4 @@ Use this tab to monitor the current activities of a particular database or datab Pages written out. Number of pages written from the cache back to disk. -</ul> +</blockquote> diff --git a/help/en/help/synchronization_wizard2.html b/help/en/help/synchronization_wizard2.html index a082b37..838c2d6 100644 --- a/help/en/help/synchronization_wizard2.html +++ b/help/en/help/synchronization_wizard2.html @@ -14,7 +14,7 @@ Use this dialog box to identify the Windows synchronization peer with which you Windows Domain Information -<ul> +<blockquote> Windows Domain Name. This is the name of the Windows domain that contains the Windows subtree which you are synchronizing with the Directory Server subtree. For example: example.com @@ -42,13 +42,13 @@ Use this dialog box to identify the Windows synchronization peer with which you Port Num. The Windows domain controller port number. By default, this is 389; this is automatically reset to 636 if you check the "Use TLS/SSL (TLS/SSL encryption with LDAPS)." checkbox (even if you had previously set a different value). It is better to choose the connection type first, then change this port number field if necessary. -</ul> +</blockquote> Connection -<ul> +<blockquote> Use LDAP (no encryption). If you want the supplier and consumer servers to use plain LDAP with no security, select this radio button. @@ -68,7 +68,7 @@ Use this dialog box to identify the Windows synchronization peer with which you Password. Enter the supplier DN password in the Password field. -</ul> +</blockquote> When you are creating a new synchronization agreement from the Replication folder, you can choose the subtree you want to synchronize. If you are creating a new synchronization agreement from a database under the Replication folder, the subtree is the same as that contained by the database and cannot be changed.

1 0

help/en
by Noriko Hosoi 28 Feb '11

28 Feb '11

help/en/header.html | 1 + help/en/help/add_users_and_groups.html | 4 ++-- help/en/help/administration_express_logs.html | 2 +- help/en/help/list_crl_ckl.html | 8 ++++---- help/en/help/search_users_and_groups_advanced.html | 8 ++++---- help/en/help/set_security_device_password_change_security_device_password.html | 4 ++-- 6 files changed, 14 insertions(+), 13 deletions(-) New commits: commit 5d31980b9350b0e57922b79074a9edf032a0cb21 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Fri Feb 25 17:42:36 2011 -0800 Bug 211296 - Clean up all HTML pages (Admin Express, Repl Monitor, etc) https://bugzilla.redhat.com/show_bug.cgi?id=211296 Description: Using HTML Validator, reviewed help pages and fixed the errors and warnings. diff --git a/help/en/header.html b/help/en/header.html index 8ab6c7f..4af8c5d 100644 --- a/help/en/header.html +++ b/help/en/header.html @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"> <html> <head> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" /> diff --git a/help/en/help/add_users_and_groups.html b/help/en/help/add_users_and_groups.html index caa17f9..619d9de 100644 --- a/help/en/help/add_users_and_groups.html +++ b/help/en/help/add_users_and_groups.html @@ -9,7 +9,6 @@ Use this dialog box to add users, groups, and roles that have access to this res <ul> <li> First, search for users, groups, roles, or administrators to grant access to: -</li> <dl> <dt> Search Area. Select a set of entries in which you want to search. You can choose Administrators, Users, Groups, Roles, or "Special Rights." @@ -20,10 +19,10 @@ First, search for users, groups, roles, or administrators to grant access to:  </dt> <dt> The center frame of the "Add Users" dialog displays the results of your search. This is called the results list. The bottom frame shows the users that you've granted access to. This is called the access list.  </dt> </dl> +</li> <li> Then, grant access: -</li> <dl> <dt> Click an entry in the results list to select it. You can select multiple entries by pressing Control and clicking the desired entries. @@ -32,6 +31,7 @@ Click an entry in the results list to select it. You can select multiple entries  </dt> <dt> Remove. Removes all selected entries from the access list.  </dt> </dl> +</li> </ul> diff --git a/help/en/help/administration_express_logs.html b/help/en/help/administration_express_logs.html index 6c31fb6..7c04914 100644 --- a/help/en/help/administration_express_logs.html +++ b/help/en/help/administration_express_logs.html @@ -14,7 +14,6 @@ To View Log Entries <li value="1"> Indicate your viewing preferences. -</li> <dl> <dt> Log to view. Use the drop-down list to select the type of log you want to view. The Administration Server generates the drop-down list based on the files that exist in a server's log directory. The Administration Server uses two logs: an access log and an error log. @@ -35,6 +34,7 @@ The error log displays errors the server has encountered since the log file was  </dt> <dt> Reset. Click to reset the fields on this screen to their default values.  </dt> </dl> +</li> <li value="2"> Click OK. diff --git a/help/en/help/list_crl_ckl.html b/help/en/help/list_crl_ckl.html index 96ad8dc..36c85a7 100644 --- a/help/en/help/list_crl_ckl.html +++ b/help/en/help/list_crl_ckl.html @@ -6,7 +6,7 @@ Certificate Information - Detail General -<ul> +<blockquote> This panel lists detailed information about the selected certificate. @@ -34,14 +34,14 @@ This panel lists detailed information about the selected certificate. Next Update. Shows when an updated CRL or CKL will be available. -</ul> +</blockquote> Revocation List -<ul> +<blockquote> This panel lists serial numbers and dates revoked by the CA. -</ul> +</blockquote> diff --git a/help/en/help/search_users_and_groups_advanced.html b/help/en/help/search_users_and_groups_advanced.html index 0a3cce0..af0462d 100644 --- a/help/en/help/search_users_and_groups_advanced.html +++ b/help/en/help/search_users_and_groups_advanced.html @@ -15,7 +15,7 @@ This dialog box provides additional fields for focusing your search. Use the pul where. Choose an attribute and operator. The following attributes are available: -<ul> <ul> +<ul> <li> <code>cn</code>. The user or group's full name (common name). </li> @@ -45,14 +45,14 @@ This dialog box provides additional fields for focusing your search. Use the pul </li> <li> <code>telephonenumber</code>. A telephone number. -</li> </ul> +</li> </ul> The following operators are available: -<ul> <ul> +<ul> <li> <code>contains</code>. The value of the selected attribute contains the search term. </li> @@ -61,7 +61,7 @@ The following operators are available: </li> <li> <code>does not equal</code>. The value of the selected attribute does not match the search term. -</li> </ul> +</li> </ul> diff --git a/help/en/help/set_security_device_password_change_security_device_password.html b/help/en/help/set_security_device_password_change_security_device_password.html index af3145d..a6655bb 100644 --- a/help/en/help/set_security_device_password_change_security_device_password.html +++ b/help/en/help/set_security_device_password_change_security_device_password.html @@ -13,17 +13,16 @@ The first time you use Administration Server's security features, you are prompt <ul class="text"> <li> If you are setting the password for the internal security device for the first time, enter information for the following fields: -</li> <dl> <dt> New Password. Enter a password for the device. Passwords should be at least eight characters long and should contain one or more non-alphanumeric symbols.  </dt> <dt> New Password (again). Enter the password again to confirm it.  </dt> </dl> +</li> <li> If you are changing the password for a selected security device, enter information for the following fields: -</li> <dl> <dt> Old Password. Enter the current password for the device. @@ -32,4 +31,5 @@ If you are changing the password for a selected security device, enter informati  </dt> <dt> New Password (again). Enter the new password again to confirm it.  </dt> </dl> +</li> </ul>

1 0

Branch '389-ds-base-1.2.8' - 2 commits - ldap/admin VERSION.sh
by Richard Allen Megginson 24 Feb '11

24 Feb '11

VERSION.sh | 2 ldap/admin/src/scripts/ds-logpipe.py | 95 ++++++++++++++++++----------------- 2 files changed, 52 insertions(+), 45 deletions(-) New commits: commit 1e5fbb5b9bb97b2bbaea98c313106df92cacd457 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Thu Feb 24 15:05:40 2011 -0700 Bug 677705 - ds-logpipe.py script is failing to validate "-s" and "--serverpid" options with "-t". https://bugzilla.redhat.com/show_bug.cgi?id=677705 Resolves: bug 677705 Bug Description: ds-logpipe.py script is failing to validate "-s" and "--serverpid" options with "-t". Reviewed by: nkinder (Thanks!) Branch: 389-ds-base-1.2.8 Fix Description: When reading from the access log, there may be no output for quite some time, much longer than the timeout. In addition, the server may take a long time to write its serverpid file. This meant we would open the pipe, and the read would hang waiting to read from the server. This would eventually timeout and exit because we did not turn off the timer, because we did not yet get the serverpid file. The fix is to just assume the server is running if open_pipe succeeds, and turn off the alarm. If the server is running, the read from the pipe will block until either there is some output to read, or the server exits. I used setitimer because in the case where the server starts up and daemonizes, it will close and reopen the pipe. If this is not the case, the short timer will ensure that the script exits quickly if the server is no longer running. NOTE: If using the script in an initconfig file, a sleep 2 will need to be added after starting the log pipe script, for two reasons * give the script time to create the log pipe before the server does * when a restart is issued, this gives the running log pipe script a chance to exit cleanly before another one is started Platforms tested: RHEL6 x86_64 Flag Day: no Doc impact: Yes - will need to document the required initconfig changes (cherry picked from commit e05a918b7e9563bfcbc334c524de17d0bd9ca146) diff --git a/ldap/admin/src/scripts/ds-logpipe.py b/ldap/admin/src/scripts/ds-logpipe.py index 6c448f1..11546d3 100644 --- a/ldap/admin/src/scripts/ds-logpipe.py +++ b/ldap/admin/src/scripts/ds-logpipe.py @@ -50,6 +50,8 @@ def sighandler(signum, frame): #signal.signal(signal.SIGPIPE, signal.SIG_DFL) signal.signal(signal.SIGTERM, signal.SIG_DFL) signal.signal(signal.SIGALRM, signal.SIG_DFL) + if signum == signal.SIGALRM and debug: + print "script timed out waiting to open pipe" finish() else: printbuffer() @@ -311,60 +313,65 @@ signal.signal(signal.SIGALRM, sighandler) if options.serverpidfile: # start the timer to wait for the pid file to be available - signal.alarm(options.servertimeout) + signal.setitimer(signal.ITIMER_REAL, options.servertimeout) done = False while not done: # open the pipe - will hang until # 1. something opens the other end - # 2. alarm goes off + # 2. alarm goes off - will just exit logf = open_pipe(logfname) + # if we get here, logf is not None + if debug: + print "opened pipe", logf - if serverpid: - if not is_proc_alive(serverpid): - done = True - if debug: - print "Server pid [%d] is not alive - exiting" % serverpid - else: # cancel the timer - signal.alarm(0) # cancel timer - got pid + if options.serverpidfile: + # cancel the timer - the open succeeded + signal.setitimer(signal.ITIMER_REAL, 0) - innerdone = False lines = 0 - while not innerdone and not done: - # read and process the next line in the pipe - # if server exits while we are reading, we will get - # EOF and innerdone will be True - # we may have to read some number of lines until - # we can get the pid file - innerdone = read_and_process_line(logf, plgfuncs) - if not serverpid and options.serverpidfile: - serverpid = get_pid_from_file(options.serverpidfile) - if serverpid: - signal.alarm(0) # cancel timer - got pid - if not innerdone: lines += 1 - - if logf: - logf.close() - logf = None + # read and process the next line in the pipe + # if server exits while we are reading, we will get + # EOF and the func will return True - will also + # return True if a plugin returns failure + while not read_and_process_line(logf, plgfuncs): + lines += 1 + + # the other end of the pipe closed - we close our end too + logf.close() + logf = None + if not serverpid and not options.serverpidfile: + # no server to deal with - we're done + done = True; + elif not serverpid and options.serverpidfile: + # see if the server has written its server pid file yet + # it may take a "long time" for the server to actually + # write its pid file + serverpid = get_pid_from_file(options.serverpidfile) + + # if the server is no longer running, just finish + if serverpid and not is_proc_alive(serverpid): + done = True + if not done: - if serverpid: - if not lines: - # the server will sometimes close the log and reopen it - # when it does this lines will be 0 - this means we need - # immediately attempt to reopen the log pipe and read it - # however, at shutdown, the server will close the log before - # the process has exited - so is_proc_alive will return - # true for a short time - if we then attempt to open the - # pipe, the open will hang forever - to avoid this situation - # we set the alarm again to wake up the open - use a short - # timeout so we don't wait a long time if the server - # really is exiting - signal.alarm(5) - else: - # pipe closed - usually when server shuts down - done = True - if not done and debug: - print "log pipe", logfname, "closed - reopening - read", totallines, "total lines" + if not lines: + # at startup the server will close the log and reopen it + # when it does this lines will be 0 - this means we need + # immediately attempt to reopen the log pipe and read it + # however, at shutdown, the server will close the log before + # the process has exited - so is_proc_alive will return + # true for a short time - if we then attempt to open the + # pipe, the open will hang forever - to avoid this situation + # we set the alarm again to wake up the open - use a short + # timeout so we don't wait a long time if the server + # really is exiting + signal.setitimer(signal.ITIMER_REAL, 0.25) + else: # we read something + # pipe closed - usually when server shuts down + done = True + + if not done and debug: + print "log pipe", logfname, "closed - reopening - read", totallines, "total lines" finish() commit 01b0773a4138a3b17a003d835abd28a34c93c669 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Wed Feb 23 07:19:04 2011 -0700 bump version to 1.2.8.a4 diff --git a/VERSION.sh b/VERSION.sh index 5c248d8..4df6c9f 100644 --- a/VERSION.sh +++ b/VERSION.sh @@ -14,7 +14,7 @@ VERSION_MAINT=8 # if this is a PRERELEASE, set VERSION_PREREL # otherwise, comment it out # be sure to include the dot prefix in the prerel -VERSION_PREREL=.a3 +VERSION_PREREL=.a4 # NOTES on VERSION_PREREL # use aN for an alpha release e.g. a1, a2, etc. # use rcN for a release candidate e.g. rc1, rc2, etc.

1 0

ldap/admin
by Richard Allen Megginson 24 Feb '11

24 Feb '11

ldap/admin/src/scripts/ds-logpipe.py | 95 ++++++++++++++++++----------------- 1 file changed, 51 insertions(+), 44 deletions(-) New commits: commit e05a918b7e9563bfcbc334c524de17d0bd9ca146 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Thu Feb 24 15:05:40 2011 -0700 Bug 677705 - ds-logpipe.py script is failing to validate "-s" and "--serverpid" options with "-t". https://bugzilla.redhat.com/show_bug.cgi?id=677705 Resolves: bug 677705 Bug Description: ds-logpipe.py script is failing to validate "-s" and "--serverpid" options with "-t". Reviewed by: nkinder (Thanks!) Branch: master Fix Description: When reading from the access log, there may be no output for quite some time, much longer than the timeout. In addition, the server may take a long time to write its serverpid file. This meant we would open the pipe, and the read would hang waiting to read from the server. This would eventually timeout and exit because we did not turn off the timer, because we did not yet get the serverpid file. The fix is to just assume the server is running if open_pipe succeeds, and turn off the alarm. If the server is running, the read from the pipe will block until either there is some output to read, or the server exits. I used setitimer because in the case where the server starts up and daemonizes, it will close and reopen the pipe. If this is not the case, the short timer will ensure that the script exits quickly if the server is no longer running. NOTE: If using the script in an initconfig file, a sleep 2 will need to be added after starting the log pipe script, for two reasons * give the script time to create the log pipe before the server does * when a restart is issued, this gives the running log pipe script a chance to exit cleanly before another one is started Platforms tested: RHEL6 x86_64 Flag Day: no Doc impact: Yes - will need to document the required initconfig changes diff --git a/ldap/admin/src/scripts/ds-logpipe.py b/ldap/admin/src/scripts/ds-logpipe.py index 6c448f1..11546d3 100644 --- a/ldap/admin/src/scripts/ds-logpipe.py +++ b/ldap/admin/src/scripts/ds-logpipe.py @@ -50,6 +50,8 @@ def sighandler(signum, frame): #signal.signal(signal.SIGPIPE, signal.SIG_DFL) signal.signal(signal.SIGTERM, signal.SIG_DFL) signal.signal(signal.SIGALRM, signal.SIG_DFL) + if signum == signal.SIGALRM and debug: + print "script timed out waiting to open pipe" finish() else: printbuffer() @@ -311,60 +313,65 @@ signal.signal(signal.SIGALRM, sighandler) if options.serverpidfile: # start the timer to wait for the pid file to be available - signal.alarm(options.servertimeout) + signal.setitimer(signal.ITIMER_REAL, options.servertimeout) done = False while not done: # open the pipe - will hang until # 1. something opens the other end - # 2. alarm goes off + # 2. alarm goes off - will just exit logf = open_pipe(logfname) + # if we get here, logf is not None + if debug: + print "opened pipe", logf - if serverpid: - if not is_proc_alive(serverpid): - done = True - if debug: - print "Server pid [%d] is not alive - exiting" % serverpid - else: # cancel the timer - signal.alarm(0) # cancel timer - got pid + if options.serverpidfile: + # cancel the timer - the open succeeded + signal.setitimer(signal.ITIMER_REAL, 0) - innerdone = False lines = 0 - while not innerdone and not done: - # read and process the next line in the pipe - # if server exits while we are reading, we will get - # EOF and innerdone will be True - # we may have to read some number of lines until - # we can get the pid file - innerdone = read_and_process_line(logf, plgfuncs) - if not serverpid and options.serverpidfile: - serverpid = get_pid_from_file(options.serverpidfile) - if serverpid: - signal.alarm(0) # cancel timer - got pid - if not innerdone: lines += 1 - - if logf: - logf.close() - logf = None + # read and process the next line in the pipe + # if server exits while we are reading, we will get + # EOF and the func will return True - will also + # return True if a plugin returns failure + while not read_and_process_line(logf, plgfuncs): + lines += 1 + + # the other end of the pipe closed - we close our end too + logf.close() + logf = None + if not serverpid and not options.serverpidfile: + # no server to deal with - we're done + done = True; + elif not serverpid and options.serverpidfile: + # see if the server has written its server pid file yet + # it may take a "long time" for the server to actually + # write its pid file + serverpid = get_pid_from_file(options.serverpidfile) + + # if the server is no longer running, just finish + if serverpid and not is_proc_alive(serverpid): + done = True + if not done: - if serverpid: - if not lines: - # the server will sometimes close the log and reopen it - # when it does this lines will be 0 - this means we need - # immediately attempt to reopen the log pipe and read it - # however, at shutdown, the server will close the log before - # the process has exited - so is_proc_alive will return - # true for a short time - if we then attempt to open the - # pipe, the open will hang forever - to avoid this situation - # we set the alarm again to wake up the open - use a short - # timeout so we don't wait a long time if the server - # really is exiting - signal.alarm(5) - else: - # pipe closed - usually when server shuts down - done = True - if not done and debug: - print "log pipe", logfname, "closed - reopening - read", totallines, "total lines" + if not lines: + # at startup the server will close the log and reopen it + # when it does this lines will be 0 - this means we need + # immediately attempt to reopen the log pipe and read it + # however, at shutdown, the server will close the log before + # the process has exited - so is_proc_alive will return + # true for a short time - if we then attempt to open the + # pipe, the open will hang forever - to avoid this situation + # we set the alarm again to wake up the open - use a short + # timeout so we don't wait a long time if the server + # really is exiting + signal.setitimer(signal.ITIMER_REAL, 0.25) + else: # we read something + # pipe closed - usually when server shuts down + done = True + + if not done and debug: + print "log pipe", logfname, "closed - reopening - read", totallines, "total lines" finish()

1 0

Changes to 'refs/tags/389-admin-console-1.1.6'
by Richard Allen Megginson 23 Feb '11

23 Feb '11

Changes since the dawn of time: Endi S. Dewata (1): Bug 368481 - Unable to change Admin Server log paths in Console Nathan Kinder (8): Resolves: 247525 Resolves: 250699 Resolves: 251427 Related: 251427 Added ldapjdk default path as well as settable path. Use less restrictive version of Open Publication License for online help docs. Resolves: 379211 Bug 668950 - Add posix group support to Console Noriko Hosoi (6): [191832] Admin Server password always remembers initial password on (part 2) Resolves: #379191 Resolves: #159011 Resolves: #416311 Resolves: #400341 Bug 151705 - Need to update Console Cipher Preferences with new ciphers Rich Megginson (22): Initial import of admin server console into its own module use admserv instead of as for jar file names remove improperly added binary files correctly add binary files bump version to 1.0.3 fix symlinks Resolves: bug 400361 updated spec for Fedora DS 1.1 release Resolves: bug 428364 Bug 428364 bump version to 1.1.2 - disable sslv2 in the ui this is the 1.1.2 release Resolves: bug 452596 Resolves: bug 429514 Resolves: bug 166230 change version to 1.1.3 for the 1.1.3 release Rename to 389 these files should be mode 644 change version to 1.1.4 - add doc subpackage - relicense under plain gplv2 bump version to 1.1.5 bump version to 1.1.6

1 0

Branch '389-ds-base-1.2.8' - ldap/admin
by Noriko Hosoi 23 Feb '11

23 Feb '11

ldap/admin/src/scripts/repl-monitor.pl.in | 75 ++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 10 deletions(-) New commits: commit 4d56dcdd03b4e6e9ce2686d4bc642a87cfb23df9 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Wed Feb 23 15:18:45 2011 -0800 Bug 625424 - repl-monitor.pl doesn't work in hub node https://bugzilla.redhat.com/show_bug.cgi?id=625424 Description: repl-monitor.pl has been designed to display the entire replication topology. This patch allows to show the subset of the topology starting from the specified hub. diff --git a/ldap/admin/src/scripts/repl-monitor.pl.in b/ldap/admin/src/scripts/repl-monitor.pl.in index b8e6d2d..89b777c 100755 --- a/ldap/admin/src/scripts/repl-monitor.pl.in +++ b/ldap/admin/src/scripts/repl-monitor.pl.in @@ -511,28 +511,45 @@ sub process_suppliers my ($ridx, $mid, $maxcsn); $mid = ""; + $ismaster = 0; $last_sidx = -1; # global variable for print html page for ($ridx = 0; $ridx <= $#allreplicas; $ridx++) { - # Skip consumers and hubs - next if $allreplicas[$ridx] !~ /:master:(\d+):/i; - $mid = $1; + # Handle masters and hubs + if ($allreplicas[$ridx] =~ /:master:(\d+):/i) { + $mid = $1; - # Skip replicas without agreements defined yet - next if (! grep {$_->{ridx} == $ridx} @allagreements); + # Skip replicas without agreements defined yet + next if (! grep {$_->{ridx} == $ridx} @allagreements); - $maxcsn = &print_master_header ($ridx, $mid); - if ( "$maxcsn" != "none" ) { - &print_consumer_header (); - &print_consumers ($ridx, $mid); + $maxcsn = &print_master_header ($ridx, $mid); + if ( "$maxcsn" != "none" ) { + &print_consumer_header (); + &print_consumers ($ridx, $mid); + } + $ismaster = 1; + } elsif (($ismaster == 0) && ($allreplicas[$ridx] =~ /:hub:(\d+):/i)) { + $mid = $1; + + # Skip replicas without agreements defined yet + next if (! grep {$_->{ridx} == $ridx} @allagreements); + + foreach $key (keys %allruvs) { + if ( $key =~ /$ridx:/) { + my ($myridx, $mymid) = split ( /:/, "$key" ); + $maxcsn = &print_hub_header($myridx, $mymid); + &print_consumer_header (); + &print_consumers ($myridx, $mymid); + } + } } &print_supplier_end; } if ($mid eq "") { - print "The server is not a master or it has no replication agreement\n"; + print "The server is not a master or a hub or it has no replication agreement\n"; } } @@ -544,6 +561,10 @@ sub print_master_header my ($maxcsn) = &to_string_csn ($maxcsnval); my ($sidx, $replicaroot, $replicatype, $serverid) = split (/:/, $allreplicas[$ridx]); + if ( $maxcsn == "" ) { + return $maxcsn; + } + # Print the master name if ( $last_sidx != $sidx ) { my ($ldapurl) = &get_ldap_url ($sidx, $sidx); @@ -570,6 +591,40 @@ sub print_master_header return $maxcsn; } +sub print_hub_header +{ + my ($ridx, $mid) = @_; + my ($myruv) = $allruvs {"$ridx:$mid"}; + my ($maxcsnval) = split ( /;/, "$myruv" ); + my ($maxcsn) = &to_string_csn ($maxcsnval); + my ($sidx, $replicaroot, $replicatype, $serverid) = split (/:/, $allreplicas[$ridx]); + + # Print the master name + if ( $last_sidx != $sidx ) { + my ($ldapurl) = &get_ldap_url ($sidx, $sidx); + &print_legend if ( $last_sidx < 0); + print "<hr>\n"; + print "\n<center class=page-subtitle>\n"; + print "Hub:&nbsp $ldapurl</center>\n"; + $last_sidx = $sidx; + } + + # Print the current replica info onthe master + print "\n<table border=0 cellspacing=1 cellpadding=6 cols=10 width=100% class=bgColor9>\n"; + + print "\n<tr><td colspan=10><center>\n"; + print "Replica ID: "; + print "$serverid\n"; + + print "Replica Root: "; + print "$replicaroot\n"; + + print "Max CSN: "; + print "$maxcsn\n"; + + return $maxcsn; +} + sub print_consumer_header { #Print the header of consumer

1 0

ldap/admin
by Noriko Hosoi 23 Feb '11

23 Feb '11

ldap/admin/src/scripts/repl-monitor.pl.in | 75 ++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 10 deletions(-) New commits: commit 4d96b793803337cc53d254b38a65f95831b6c525 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Wed Feb 23 15:18:45 2011 -0800 Bug 625424 - repl-monitor.pl doesn't work in hub node https://bugzilla.redhat.com/show_bug.cgi?id=625424 Description: repl-monitor.pl has been designed to display the entire replication topology. This patch allows to show the subset of the topology starting from the specified hub. diff --git a/ldap/admin/src/scripts/repl-monitor.pl.in b/ldap/admin/src/scripts/repl-monitor.pl.in index b8e6d2d..89b777c 100755 --- a/ldap/admin/src/scripts/repl-monitor.pl.in +++ b/ldap/admin/src/scripts/repl-monitor.pl.in @@ -511,28 +511,45 @@ sub process_suppliers my ($ridx, $mid, $maxcsn); $mid = ""; + $ismaster = 0; $last_sidx = -1; # global variable for print html page for ($ridx = 0; $ridx <= $#allreplicas; $ridx++) { - # Skip consumers and hubs - next if $allreplicas[$ridx] !~ /:master:(\d+):/i; - $mid = $1; + # Handle masters and hubs + if ($allreplicas[$ridx] =~ /:master:(\d+):/i) { + $mid = $1; - # Skip replicas without agreements defined yet - next if (! grep {$_->{ridx} == $ridx} @allagreements); + # Skip replicas without agreements defined yet + next if (! grep {$_->{ridx} == $ridx} @allagreements); - $maxcsn = &print_master_header ($ridx, $mid); - if ( "$maxcsn" != "none" ) { - &print_consumer_header (); - &print_consumers ($ridx, $mid); + $maxcsn = &print_master_header ($ridx, $mid); + if ( "$maxcsn" != "none" ) { + &print_consumer_header (); + &print_consumers ($ridx, $mid); + } + $ismaster = 1; + } elsif (($ismaster == 0) && ($allreplicas[$ridx] =~ /:hub:(\d+):/i)) { + $mid = $1; + + # Skip replicas without agreements defined yet + next if (! grep {$_->{ridx} == $ridx} @allagreements); + + foreach $key (keys %allruvs) { + if ( $key =~ /$ridx:/) { + my ($myridx, $mymid) = split ( /:/, "$key" ); + $maxcsn = &print_hub_header($myridx, $mymid); + &print_consumer_header (); + &print_consumers ($myridx, $mymid); + } + } } &print_supplier_end; } if ($mid eq "") { - print "The server is not a master or it has no replication agreement\n"; + print "The server is not a master or a hub or it has no replication agreement\n"; } } @@ -544,6 +561,10 @@ sub print_master_header my ($maxcsn) = &to_string_csn ($maxcsnval); my ($sidx, $replicaroot, $replicatype, $serverid) = split (/:/, $allreplicas[$ridx]); + if ( $maxcsn == "" ) { + return $maxcsn; + } + # Print the master name if ( $last_sidx != $sidx ) { my ($ldapurl) = &get_ldap_url ($sidx, $sidx); @@ -570,6 +591,40 @@ sub print_master_header return $maxcsn; } +sub print_hub_header +{ + my ($ridx, $mid) = @_; + my ($myruv) = $allruvs {"$ridx:$mid"}; + my ($maxcsnval) = split ( /;/, "$myruv" ); + my ($maxcsn) = &to_string_csn ($maxcsnval); + my ($sidx, $replicaroot, $replicatype, $serverid) = split (/:/, $allreplicas[$ridx]); + + # Print the master name + if ( $last_sidx != $sidx ) { + my ($ldapurl) = &get_ldap_url ($sidx, $sidx); + &print_legend if ( $last_sidx < 0); + print "<hr>\n"; + print "\n<center class=page-subtitle>\n"; + print "Hub:&nbsp $ldapurl</center>\n"; + $last_sidx = $sidx; + } + + # Print the current replica info onthe master + print "\n<table border=0 cellspacing=1 cellpadding=6 cols=10 width=100% class=bgColor9>\n"; + + print "\n<tr><td colspan=10><center>\n"; + print "Replica ID: "; + print "$serverid\n"; + + print "Replica Root: "; + print "$replicaroot\n"; + + print "Max CSN: "; + print "$maxcsn\n"; + + return $maxcsn; +} + sub print_consumer_header { #Print the header of consumer

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits February 2011