[Fedora-directory-commits] directoryconsole/help/en/help configtab_chaindb.html, 1.1, 1.2 configtab_chaindb2.html, 1.1, 1.2 configtab_chaindb3.html, 1.1, 1.2 configtab_chaindb5.html, 1.1, 1.2 configtab_db2.html, 1.1, 1.2 configtab_db5.html, 1.1, 1.2 configtab_ldbmdb.html, 1.1, 1.2 configtab_maptree.html, 1.1, 1.2 configtab_maptree4.html, 1.1, 1.2 configtab_rootnode6.html, 1.1, 1.2 configtab_rootnode7.html, 1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/directoryconsole/help/en/help
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2754/en/help
Modified Files:
configtab_chaindb.html configtab_chaindb2.html
configtab_chaindb3.html configtab_chaindb5.html
configtab_db2.html configtab_db5.html configtab_ldbmdb.html
configtab_maptree.html configtab_maptree4.html
configtab_rootnode6.html configtab_rootnode7.html
Log Message:
Resolves: #379191
Summary: Online help: Directory Console (ds-console) (comment #6)
Description: help pages referred from Directory Console | Configuration Tab
| Data tree
Index: configtab_chaindb.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_chaindb.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_chaindb.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_chaindb.html 19 Nov 2007 18:21:38 -0000 1.2
@@ -7,6 +7,15 @@
</p>
<p class="text">
+<b>New Database Link info</b>
+</p>
+
+<ul>
+<p class="text">
+<b>Database suffix.</b> Suffix the database link is created from.
+</p>
+
+<p class="text">
<b>Database link name.</b> Unique name of the database link.
</p>
@@ -22,6 +31,7 @@
<b>Remote server(s) information. </b>In this section you provide information about the remote data sources used by the database link.
</p>
+<ul>
<p class="text">
<b>Use a secure LDAP connection between servers.</b> Selecting this checkbox indicates that the connection between the server and the remote server is secure.
</p>
@@ -41,7 +51,9 @@
<p class="text">
<b>Port.</b> Port number of an alternative remote server.
</p>
+</ul>
<p class="text">
<b>LDAP URL. </b>This field contains a dynamically created LDAP URL that combines the server names and port numbers you specified in the remote server information fields.
</p>
+<ul>
Index: configtab_chaindb2.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_chaindb2.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_chaindb2.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_chaindb2.html 19 Nov 2007 18:21:38 -0000 1.2
@@ -12,19 +12,27 @@
<ul>
<li>
-Virtual list view (VLV) control. This control provides lists of parts of entries rather than returning all entry information. The OID of this control is 2.16.840.1.113730.3.4.9.
+<p class="text">
+Managed DSA control. This control returns smart referrals as entries rather than following the referral. This allows you to modify or delete the smart referral itself. The OID for this control is 2.16.840.1.113730.3.4.2.
+</p>
</li>
<li>
-Server side sorting control. This control sorts entries according to their attribute values. The OID for this control is 1.2.840.113556.1.4.473.
+<p class="text">
+Virtual list view (VLV) control. This control provides lists of parts of entries rather than returning all entry information. The OID of this control is 2.16.840.1.113730.3.4.9.
+</p>
</li>
<li>
-Managed DSA control. This control returns smart referrals as entries rather than following the referral. This allows you to modify or delete the smart referral itself. The OID for this control is 2.16.840.1.113730.3.4.2.
+<p class="text">
+Server side sorting control. This control sorts entries according to their attribute values. The OID for this control is 1.2.840.113556.1.4.473.
+</p>
</li>
<li>
+<p class="text">
Loop detection control. This control contains a count that is decremented each time the server tries to chain. When the server receives a count of 0 it determines that a loop has been detected and notifies the client application. The OID for this control is 1.3.6.1.4.1.1466.29539.12.
+</p>
</li>
</ul>
<p class="text">
Index: configtab_chaindb3.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_chaindb3.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_chaindb3.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_chaindb3.html 19 Nov 2007 18:21:38 -0000 1.2
@@ -31,19 +31,6 @@
<tr>
<td valign="top">
<p class="tabletext">
-2.16.840.1.113730.3.4.3
-</p></td>
-<td valign="top">
-<p class="tabletext">
-Persistent search control.
-</p><p class="tabletext">
-This control is used with a search request to indicate that the server should not complete the request when all the matching entries have been returned. Instead, the server should keep the operation active and send results to the client whenever an entry matching the search filter is added, deleted, or modified.
-</p></td>
-
-</tr>
-<tr>
-<td valign="top">
-<p class="tabletext">
2.16.840.1.113730.3.4.4
</p></td>
<td valign="top">
@@ -109,6 +96,43 @@
<tr>
<td valign="top">
<p class="tabletext">
+2.16.840.1.113730.3.4.19
+</p></td>
+<td valign="top">
+<p class="tabletext">
+Virtual attributes only request control.
+</p><p class="tabletext">
+This control requests that the server return only attributes generated by the roles and class of service features.
+</p></td>
+
+</tr>
+<tr>
+<td valign="top">
+<p class="tabletext">
+1.3.6.1.4.1.42.2.27.8.5.1
+</p></td>
+<td valign="top">
+<p class="tabletext">
+Password policy request control.
+</p>
+</td>
+
+</tr>
+<tr>
+<td valign="top">
+<p class="tabletext">
+1.3.6.1.4.1.42.2.27.9.5.2
+</p></td>
+<td valign="top">
+<p class="tabletext">
+Get effective rights request control.
+</p>
+</td>
+
+</tr>
+<tr>
+<td valign="top">
+<p class="tabletext">
2.16.840.1.113730.3.4.14
</p></td>
<td valign="top">
@@ -122,6 +146,19 @@
<tr>
<td valign="top">
<p class="tabletext">
+2.16.840.1.113730.3.4.20
+</p></td>
+<td valign="top">
+<p class="tabletext">
+Extended version of Search on specific database control.
+</p><p class="tabletext">
+This control can be used when the database name is supplied or not supplied. When it is not supplied,it retrieves the database name from the base of the search.
+</p></td>
+
+</tr>
+<tr>
+<td valign="top">
+<p class="tabletext">
2.16.840.1.113730.3.4.12
</p></td>
<td valign="top">
@@ -135,6 +172,19 @@
<tr>
<td valign="top">
<p class="tabletext">
+2.16.840.1.113730.3.4.18
+</p></td>
+<td valign="top">
+<p class="tabletext">
+Proxied authorization (new "version 2" specification) control.
+</p><p class="tabletext">
+Allows the client to assume another identity for the duration of a request
+</p></td>
+
+</tr>
+<tr>
+<td valign="top">
+<p class="tabletext">
2.16.840.1.113730.3.4.13
</p></td>
<td valign="top">
Index: configtab_chaindb5.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_chaindb5.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_chaindb5.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_chaindb5.html 19 Nov 2007 18:21:38 -0000 1.2
@@ -59,11 +59,11 @@
</li>
<li>
-<b>Timeout before abandon.</b> The number of seconds that pass before the server checks for abandon operations. The default value is 10 second The range is 0 to 2147483647.
+<b>Timeout before abandon.</b> The number of seconds that pass before the server checks for abandon operations. The default value is 1 second The range is 0 to 2147483647.
</li>
<li>
-<b>Maximum LDAP connection(s).</b> Maximum number of LDAP connections the database link establishes with the remote server. The default value is 10 connections. The range is 1 to 50.
+<b>Maximum LDAP connection(s).</b> Maximum number of LDAP connections the database link establishes with the remote server. The default value is 20 connections. The range is 1 to 50.
</li>
<li>
@@ -71,7 +71,7 @@
</li>
<li>
-<b>Maximum operations per connection.</b> Maximum number of outstanding operations per connection. The default value is 10 operations per second. The range is 0 to 50.
+<b>Maximum operations per connection.</b> Maximum number of outstanding operations per connection. The default value is 2 operations per second. The range is 0 to 50.
</li>
<li>
Index: configtab_db2.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_db2.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_db2.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_db2.html 19 Nov 2007 18:21:38 -0000 1.2
@@ -11,6 +11,11 @@
</p>
<p class="text">
+<b>User Password Change</b>
+</p>
+
+<ul>
+<p class="text">
<b>User must change password after reset. </b>When selected, users must change their passwords when they first log in or after the administrator resets the passwords.
</p>
@@ -29,8 +34,13 @@
<p class="text">
<b>Remember X passwords. </b>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.
</p>
+</ul>
<p class="text">
+<b>Password Expiration</b>
+</p>
+<ul>
+<p class="text">
<b>Password never expires.</b> Select this if you do not require users to change their passwords periodically.
</p>
@@ -51,37 +61,80 @@
</p>
<p class="text">
-<b>Allow up to X login attempt(s) after password expires.</b> Indicates the number of grace logins permitted after a user's password has expired. Grace logins are not permitted by default.
+<b>Allow up to X attempt(s) after password expires.</b> Indicates the number of grace logins permitted after a user's password has expired. Grace logins are not permitted by default.
</p>
+</ul>
<p class="text">
+<b>Password Syntax</b>
+</p>
+<ul>
+<p class="text">
<b>Check password syntax.</b> 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.
</p>
<p class="text">
-<b>Password minimum length. </b>If syntax checking is on, this option specifies the minimum number of characters that must be used in directory server passwords. The valid value range is from 2 to 512 characters. The default value is 6.
+<b>Password minimum length. </b>If syntax checking is on, this option specifies the minimum number of characters that must be used in directory server passwords. The valid value range is from 2 to 512 characters. The default value is 8.
+</p>
+
+<p class="text">
+<b>Minimum required digit characters. </b>If syntax checking is on, this option specifies the minimum number of digit characters that must be used in directory server passwords. The valid value range is from 0 to 64 characters. The default value is 0.
+</p>
+
+<p class="text">
+<b>Minimum required alpha characters. </b>If syntax checking is on, this option specifies the minimum number of alpha characters that must be used in directory server passwords. The valid value range is from 0 to 64 characters. The default value is 0.
+</p>
+
+<p class="text">
+<b>Minimum required uppercase characters. </b>If syntax checking is on, this option specifies the minimum number of uppercase characters that must be used in directory server passwords. The valid value range is from 0 to 64 characters. The default value is 0.
+</p>
+
+<p class="text">
+<b>Minimum required lowercase characters. </b>If syntax checking is on, this option specifies the minimum number of lowercase characters that must be used in directory server passwords. The valid value range is from 0 to 64 characters. The default value is 0.
+</p>
+
+<p class="text">
+<b>Minimum required special characters. </b>If syntax checking is on, this option specifies the minimum number of special characters that must be used in directory server passwords. The valid value range is from 0 to 64 characters. The default value is 0.
+</p>
+
+<p class="text">
+<b>Minimum required 8-bit characters. </b>If syntax checking is on, this option specifies the minimum number of 8-bit characters that must be used in directory server passwords. The valid value range is from 0 to 64 characters. The default value is 0.
+</p>
+
+<p class="text">
+<b>Maximum number of repeated characters. </b>If syntax checking is on, this option specifies the maximum number of repeated characters that is allowed to used in directory server passwords. The valid value range is from 0 to 64 characters. If 0 is set, the server does not check the repeated characters. The default value is 0.
+</p>
+
+<p class="text">
+<b>Minimum required character categories. </b>If syntax checking is on, this option specifies the minimum number of character categories that must be used in directory server passwords. The valid value range is from 1 to 5 characters. The default value is 3.
+</p>
+
+<p class="text">
+<b>Minimum token length. </b>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.
</p>
+</ul>
<p class="text">
<b>Password encryption. </b>Identifies how user passwords are stored in the directory. You can specify one of the following encryption formats:
</p>
<ul>
-<li>
-Salted Secure Hashing Algorithm (SSHA). This method is recommended as the most secure. SSHA is the default encryption method.
-</li>
-
-<li>
-UNIX crypt algorithm (CRYPT). Provided for compatibility with UNIX passwords.
-</li>
-
-<li>
-Secure Hashing Algorithm (SHA). A one-way has algorithm that is the default encryption schema in Directory Server 4.x.
-</li>
-
-<li>
-No encryption (CLEAR). This encryption type indicates that the password will appear in plain text.
-</li>
+<p class="text">
+<b>Salted Secure Hashing Algorithm (SSHA).</b> This method is recommended as the most secure. SSHA is the default encryption method.
+</p>
+
+<p class="text">
+<b>UNIX crypt algorithm (CRYPT).</b> Provided for compatibility with UNIX passwords.
+</p>
+
+<p class="text">
+<b>Secure Hashing Algorithm (SHA, SHA256, SHA384, SHA512).</b> One-way hash algorithms.
+</p>
+
+<p class="text">
+<b>No encryption (CLEAR).</b> This encryption type indicates that the password will appear in plain text.
+</p>
+
</ul>
<p class="text">
Index: configtab_db5.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_db5.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_db5.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_db5.html 19 Nov 2007 18:21:38 -0000 1.2
@@ -15,10 +15,6 @@
</p>
<p class="text">
-<b>Maximum entries in cache. </b>Maximum number of entries stored in the database cache for processing client search requests. A value of -1 indicates no limit. For performance tuning purposes.
-</p>
-
-<p class="text">
<b>Memory available for cache.</b> Maximum memory available to the database for storing cached entries, in bytes. For performance tuning purposes.
</p>
Index: configtab_ldbmdb.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_ldbmdb.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_ldbmdb.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_ldbmdb.html 19 Nov 2007 18:21:38 -0000 1.2
@@ -7,11 +7,12 @@
</p>
<p class="text">
-<b>Suffix Name.</b> This field appears only when you create a new database in an existing suffix. Gives the name of the suffix contained by the database.
+<b>Database information.</b> Use these options to specify the database name and location.
</p>
+<ul>
<p class="text">
-<b>Database information.</b> Use these options to specify the database name and location.
+<b>Suffix Name.</b> This field appears only when you create a new database in an existing suffix. Gives the name of the suffix contained by the database.
</p>
<p class="text">
@@ -21,3 +22,4 @@
<p class="text">
<b>Create database in. </b>Enter the full path to the location on your machine where you want the new database to reside. Click Browse to locate a directory.
</p>
+</ul>
Index: configtab_maptree.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_maptree.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_maptree.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_maptree.html 19 Nov 2007 18:21:38 -0000 1.2
@@ -18,6 +18,7 @@
<b>Suffix request processing. </b>These options help you configure how requests from client applications are managed by this suffix.
</p>
+<ul>
<p class="text">
<b>Use the Databases. </b>Select this option if you want the databases and database links to be used for processing all requests made by client applications.
</p>
@@ -29,3 +30,4 @@
<p class="text">
<b>Return Referrals for Update Operations. </b>Select this option to return a referral only during update requests. This is useful for redirecting client requests made to read-only databases.
</p>
+</ul>
Index: configtab_maptree4.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_maptree4.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_maptree4.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_maptree4.html 19 Nov 2007 18:21:38 -0000 1.2
@@ -7,9 +7,10 @@
</p>
<p class="text">
-<b>Enter a new referral. </b>Enter a referral in LDAP URL format, or click Construct to be guided through the process. Click Add to add the referral to the list.
+<b>Current referrals for this suffix. </b>Lists the referrals currently in place for this suffix. The entire list of referrals is returned to client applications in response to a request, when you select Referral or Referral on Update in the Suffix Settings tab. Click Delete to remove a referral from the list.
</p>
<p class="text">
-<b>Current referrals for this suffix. </b>Lists the referrals currently in place for this suffix. The entire list of referrals is returned to client applications in response to a request, when you select Referral or Referral on Update in the Suffix Settings tab. Click Delete to remove a referral from the list.
+<b>Enter a new referral. </b>Enter a referral in LDAP URL format, or click Construct to be guided through the process. Click Add to add the referral to the list.
</p>
+
Index: configtab_rootnode6.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_rootnode6.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_rootnode6.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_rootnode6.html 19 Nov 2007 18:21:38 -0000 1.2
@@ -24,7 +24,7 @@
</li>
<li>
-Secure Hashing Algorithm (SHA). A one-way has algorithm that is the default encryption schema in Directory Server 4.x.
+Secure Hashing Algorithm (SHA, SHA256, SHA384, SHA512) One-way hash algorithms.
</li>
<li>
Index: configtab_rootnode7.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_rootnode7.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_rootnode7.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_rootnode7.html 19 Nov 2007 18:21:38 -0000 1.2
@@ -12,20 +12,34 @@
<ul>
<li>
+<p class="text">
<b>Name.</b> The name of the SASL identity.
+</p>
+</p>
</li>
<li>
+<p class="text">
<b>Regular Expression.</b> A regular expression that maps the SASL identity.
+</p>
+</p>
</li>
<li>
+<p class="text">
<b>Search Base DN.</b> The base DN for the SASL mapping identity search.
+</p>
</li>
<li>
+<p class="text">
<b>Search Filter.</b> The search filter for the SASL mapping identity search.
+</p>
</li>
+
+<p class="text">
+Kerberos uid mapping, rfc 2829 dn syntax, rfc 2829 u syntax, and uid mapping are configured by default.
+</p>
</ul>
<p class="text">
16 years, 5 months
[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv/panel NewSuffixPanel.java, 1.1.1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2067/src/com/netscape/admin/dirserv/panel
Modified Files:
NewSuffixPanel.java
Log Message:
Resolves: #379191
Summary: Online help: Directory Console (ds-console) (Comment #5)
Description: if the suffix to be created is root, show the help of
"Creating a New Root Suffix".
Index: NewSuffixPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/NewSuffixPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- NewSuffixPanel.java 18 Jul 2005 00:56:02 -0000 1.1.1.1
+++ NewSuffixPanel.java 19 Nov 2007 18:17:12 -0000 1.2
@@ -50,10 +50,11 @@
public NewSuffixPanel(IDSModel model, LDAPEntry node, boolean isRoot) {
super( model, _section );
- _helpToken = "configuration-new-mapping-sub-suffix-dbox-help";
if( isRoot ) {
+ _helpToken = "configuration-new-mapping-node-dbox-help";
setTitle( DSUtil._resource.getString( _section, "new-root-title" ));
} else {
+ _helpToken = "configuration-new-mapping-sub-suffix-dbox-help";
setTitle( DSUtil._resource.getString( _section, "new-title" ));
}
_model = model;
16 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication cl5_api.c, 1.20, 1.21
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17078/ldapserver/ldap/servers/plugins/replication
Modified Files:
cl5_api.c
Log Message:
Resolves: bug 388021
Bug Description: MMR breaks from master that has been reinited
Reviewed by: nkinder (Thanks!)
Fix Description: This problem occurs when you have two or more masters, and you have updates that have originated at a master that have been sent to other masters (so that the other masters have a valid min/max csn for that replica in the ruv). If that master needs to be reinitialized for some reason (crash, etc.) the reinit will erase the changelog. The RUV for that master will now contain CSNs that are not in the changelog. If that master attempts to update another master, it will first look at the RUV from the consumer, which will contain the old CSNs, and it will look for those CSNs in the changelog, fail, and abort the update process, meaning this master can no longer send updates to other servers.
The solution is for the master to just use the min CSN in its own RUV as the new starting point, if it has not been purged. In the case of purging, if the CSN is not found, this means the consumer is too far behind and must be reinitialized.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
Index: cl5_api.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_api.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cl5_api.c 19 Oct 2007 02:09:24 -0000 1.20
+++ cl5_api.c 19 Nov 2007 17:23:50 -0000 1.21
@@ -5707,18 +5707,47 @@
to any consumers; that is, we can assume that no changes were lost due to
either changelog purging or database reload - bug# 603061 - richm(a)netscape.com
*/
- if (rc == 0 || (rc == DB_NOTFOUND && !ruv_has_csns(file->purgeRUV)))
+ if ((rc == DB_NOTFOUND) && !ruv_has_csns(file->purgeRUV))
{
+ /* use the supplier min csn for the buffer start csn - we know
+ this csn is in our changelog */
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
+ "%s: CSN %s not found and no purging, probably a reinit\n",
+ agmt_name, csnStr);
+ if ((RUV_SUCCESS == ruv_get_min_csn(supplierRuv, &startCSN)) &&
+ startCSN)
+ { /* must now free startCSN */
+ csn_as_string(startCSN, PR_FALSE, csnStr);
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
+ "%s: Will try to use supplier min CSN %s to load changelog\n",
+ agmt_name, csnStr);
+ rc = clcache_load_buffer (clcache, startCSN, DB_SET);
+ }
+ else
+ {
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
+ "%s: Could not get the min csn from the supplier RUV\n",
+ agmt_name);
+ }
+ }
+
+ if (rc == 0) {
haveChanges = PR_TRUE;
rc = CL5_SUCCESS;
- slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
"%s: CSN %s found, position set for replay\n", agmt_name, csnStr);
+ if (startCSN != csns[i]) {
+ csn_free(&startCSN);
+ }
break;
}
else if (rc == DB_NOTFOUND) /* entry not found */
{
/* check whether this csn should be present */
rc = _cl5CheckMissingCSN (startCSN, supplierRuv, file);
+ if (startCSN != csns[i]) {
+ csn_free(&startCSN);
+ }
if (rc == CL5_MISSING_DATA) /* we should have had the change but we don't */
{
slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
@@ -5735,6 +5764,9 @@
}
else
{
+ if (startCSN != csns[i]) {
+ csn_free(&startCSN);
+ }
/* db error */
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name_cl,
16 years, 5 months
[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv/panel ChainingSettingPanel.java, 1.1.1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2071
Modified Files:
ChainingSettingPanel.java
Log Message:
Resolves: #386041
Summary: "Select control OID(s) to add" dialog shows redundant OIDs at the end
Description: changed to initialize _possibleControls before copying the new list
(removed _knownUnsupportedControls from original _possibleControls) into
_possibleControls.
Index: ChainingSettingPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/ChainingSettingPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ChainingSettingPanel.java 18 Jul 2005 00:55:54 -0000 1.1.1.1
+++ ChainingSettingPanel.java 16 Nov 2007 21:22:46 -0000 1.2
@@ -426,12 +426,12 @@
Vector tmpControls = new Vector(_possibleControls.length);
for (int ii = 0; ii < _knownUnsupportedControls.length; ++ii) {
for (int jj = 0; jj < _possibleControls.length; ++jj) {
- if (!_possibleControls[jj].
- equals(_knownUnsupportedControls[ii])) {
+ if (!_possibleControls[jj].equals(_knownUnsupportedControls[ii])) {
tmpControls.addElement(_possibleControls[jj]);
}
}
}
+ _possibleControls = new String[tmpControls.size()];
tmpControls.copyInto(_possibleControls);
}
16 years, 5 months
[Fedora-directory-commits] coolkey/applet Makefile,1.3,1.4
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/coolkey/applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28730
Modified Files:
Makefile
Log Message:
Minor change to the Windows classpath separator char, from ";" to "\;" since Cygwin eats the sem if not escaped. Rev. rrelyea.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/coolkey/applet/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 5 Oct 2006 00:57:36 -0000 1.3
+++ Makefile 16 Nov 2007 01:48:47 -0000 1.4
@@ -83,7 +83,7 @@
endif
ifdef windir
-SEP=";"
+SEP="\;"
else
SEP=":"
endif
16 years, 5 months
[Fedora-directory-commits] directoryconsole/help/en/help adv_search.html, 1.1, 1.2 configtab_rootnode.html, 1.1, 1.2 configtab_rootnode3.html, 1.1, 1.2 dir_browser2.html, 1.1, 1.2 dir_browser3.html, 1.1, 1.2 dirtab_cos2.html, 1.1, 1.2 dirtab_role.html, 1.1, 1.2 property_editor.html, 1.1, 1.2 statustab_performance.html, 1.1, 1.2 statustab_performance2.html, 1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/directoryconsole/help/en/help
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8588
Modified Files:
adv_search.html configtab_rootnode.html
configtab_rootnode3.html dir_browser2.html dir_browser3.html
dirtab_cos2.html dirtab_role.html property_editor.html
statustab_performance.html statustab_performance2.html
Log Message:
Resolves: #379191
Summary: Online help: Directory Console (ds-console)
Details: Comment #1 & #2 with the fixes suggested by Rich.
Index: adv_search.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/adv_search.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- adv_search.html 13 Aug 2007 22:28:09 -0000 1.1
+++ adv_search.html 15 Nov 2007 18:28:07 -0000 1.2
@@ -9,3 +9,11 @@
<p class="text">
<b>Search Filter. </b>Enter the search filter you want to use in this text box and then click OK.
</p>
+
+<p class="text">
+<b>Search (button).</b> Click to begin searching.
+</p>
+
+<p class="text">
+<b>Basic (button).</b> Click to go back to the basic search.
+</p>
Index: configtab_rootnode.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_rootnode.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_rootnode.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_rootnode.html 15 Nov 2007 18:28:07 -0000 1.2
@@ -7,6 +7,11 @@
</p>
<p class="text">
+<b>Network Settings</b>
+</p>
+
+<ul>
+<p class="text">
<b>Port.</b> Port number used for non-SSL communications. By default, the port number is 389.
</p>
@@ -17,6 +22,7 @@
<p class="text">
<b>Referrals to.</b> LDAP URL of the default referral returned to client applications who submit requests based at a DN not maintained by your directory.
</p>
+</ul>
<p class="text">
<b>Make entire server read-only.</b> 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.
Index: configtab_rootnode3.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_rootnode3.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_rootnode3.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_rootnode3.html 15 Nov 2007 18:28:07 -0000 1.2
@@ -14,6 +14,7 @@
<b>Use this cipher family. </b>Select the checkbox next to the cipher family or families you want the server to use for SSL communications.
</p>
+<ul>
<p class="text">
<b>Security Device.</b> Select the device you want the server to use.
</p>
@@ -25,8 +26,7 @@
<p class="text">
<b>Cipher settings. </b>Opens the Encryption Preferences dialog box, where you can select which ciphers you want the server to use from the cipher families you have already selected. By default, Directory Server comes with the following SSL ciphers:
</p>
-<br />
-<br/>
+
<table width="90%" border="1" cellspacing="0" cellpadding="4">
<tr>
<td valign="top">
@@ -128,10 +128,14 @@
</tr>
</table>
+</ul>
+
-<br />
-<br />
+<p class="text">
+<b>Client Authentication</b>
+</p>
+<ul>
<p class="text">
<b>Do not allow client authentication.</b> Select this option if you want client applications to connect to the server using only simple authentication.
</p>
@@ -155,6 +159,7 @@
<p class="text">
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.
</p>
+</ul>
<p class="text">
<b>Check hostname against name in certificate for outbound SSL connections. </b>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.
Index: dir_browser2.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/dir_browser2.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dir_browser2.html 13 Aug 2007 22:28:09 -0000 1.1
+++ dir_browser2.html 15 Nov 2007 18:28:07 -0000 1.2
@@ -11,6 +11,11 @@
</p>
<p class="text">
+<b>User Password Change</b>
+</p>
+
+<ul>
+<p class="text">
<b>User must change password after reset. </b>When selected, users must change their passwords when they first log in or after the administrator resets the passwords.
</p>
@@ -29,8 +34,13 @@
<p class="text">
<b>Remember X passwords. </b>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.
</p>
+</ul>
<p class="text">
+<b>Password Expiration</b>
+</p>
+<ul>
+<p class="text">
<b>Password never expires.</b> Select this if you do not require users to change their passwords periodically.
</p>
@@ -53,35 +63,78 @@
<p class="text">
<b>Allow up to X attempt(s) after password expires.</b> Indicates the number of grace logins permitted after a user's password has expired. Grace logins are not permitted by default.
</p>
+</ul>
<p class="text">
+<b>Password Syntax</b>
+</p>
+<ul>
+<p class="text">
<b>Check password syntax.</b> 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.
</p>
<p class="text">
-<b>Password minimum length. </b>If syntax checking is on, this option specifies the minimum number of characters that must be used in directory server passwords. The valid value range is from 2 to 512 characters. The default value is 6.
+<b>Password minimum length. </b>If syntax checking is on, this option specifies the minimum number of characters that must be used in directory server passwords. The valid value range is from 2 to 512 characters. The default value is 8.
+</p>
+
+<p class="text">
+<b>Minimum required digit characters. </b>If syntax checking is on, this option specifies the minimum number of digit characters that must be used in directory server passwords. The valid value range is from 0 to 64 characters. The default value is 0.
+</p>
+
+<p class="text">
+<b>Minimum required alpha characters. </b>If syntax checking is on, this option specifies the minimum number of alpha characters that must be used in directory server passwords. The valid value range is from 0 to 64 characters. The default value is 0.
+</p>
+
+<p class="text">
+<b>Minimum required uppercase characters. </b>If syntax checking is on, this option specifies the minimum number of uppercase characters that must be used in directory server passwords. The valid value range is from 0 to 64 characters. The default value is 0.
+</p>
+
+<p class="text">
+<b>Minimum required lowercase characters. </b>If syntax checking is on, this option specifies the minimum number of lowercase characters that must be used in directory server passwords. The valid value range is from 0 to 64 characters. The default value is 0.
+</p>
+
+<p class="text">
+<b>Minimum required special characters. </b>If syntax checking is on, this option specifies the minimum number of special characters that must be used in directory server passwords. The valid value range is from 0 to 64 characters. The default value is 0.
+</p>
+
+<p class="text">
+<b>Minimum required 8-bit characters. </b>If syntax checking is on, this option specifies the minimum number of 8-bit characters that must be used in directory server passwords. The valid value range is from 0 to 64 characters. The default value is 0.
+</p>
+
+<p class="text">
+<b>Maximum number of repeated characters. </b>If syntax checking is on, this option specifies the maximum number of repeated characters that is allowed to used in directory server passwords. The valid value range is from 0 to 64 characters. If 0 is set, the server does not check the repeated characters. The default value is 0.
+</p>
+
+<p class="text">
+<b>Minimum required character categories. </b>If syntax checking is on, this option specifies the minimum number of character categories that must be used in directory server passwords. The valid value range is from 1 to 5 characters. The default value is 3.
+</p>
+
+<p class="text">
+<b>Minimum token length. </b>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.
</p>
+</ul>
<p class="text">
<b>Password encryption. </b>Identifies how user passwords are stored in the directory. You can specify one of the following encryption formats:
</p>
<ul>
-<li>
-Salted Secure Hashing Algorithm (SSHA). This method is recommended as the most secure. SSHA is the default encryption method.
-</li>
-
-<li>
-UNIX crypt algorithm (CRYPT). Provided for compatibility with UNIX passwords.
-</li>
-
-<li>
-Secure Hashing Algorithm (SHA). A one-way has algorithm that is the default encryption schema in Directory Server 4.x.
-</li>
-
-<li>
-No encryption (CLEAR). This encryption type indicates that the password will appear in plain text.
-</li>
+<p class="text">
+<b>Salted Secure Hashing Algorithm (SSHA).</b> This method is recommended as the most secure. SSHA is the default encryption method.
+</p>
+
+<p class="text">
+<b>UNIX crypt algorithm (CRYPT).</b> Provided for compatibility with UNIX passwords.
+</p>
+
+<p class="text">
+<b>Secure Hashing Algorithm (SHA, SHA256, SHA384, SHA512).</b> One-way hash algorithms.
+</p>
+
+<p class="text">
+<b>No encryption (CLEAR).</b> This encryption type indicates that the password will appear in plain text.
+</p>
+
</ul>
<p class="text">
Index: dir_browser3.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/dir_browser3.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dir_browser3.html 13 Aug 2007 22:28:09 -0000 1.1
+++ dir_browser3.html 15 Nov 2007 18:28:07 -0000 1.2
@@ -11,6 +11,10 @@
</p>
<p class="text">
+<b>Password Lockout</b>
+</p>
+<ul>
+<p class="text">
<b>Lockout account after X login failures.</b> 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.
</p>
@@ -25,3 +29,4 @@
<p class="text">
<b>Lockout duration X minutes. </b>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.
</p>
+</ul>
Index: dirtab_cos2.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/dirtab_cos2.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dirtab_cos2.html 13 Aug 2007 22:28:09 -0000 1.1
+++ dirtab_cos2.html 15 Nov 2007 18:28:07 -0000 1.2
@@ -11,5 +11,5 @@
</p>
<p class="text">
-<b>Description. </b>Enter a description of your class of service.
+<b>Description (Optional). </b>Enter a description of your class of service.
</p>
Index: dirtab_role.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/dirtab_role.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dirtab_role.html 13 Aug 2007 22:28:09 -0000 1.1
+++ dirtab_role.html 15 Nov 2007 18:28:07 -0000 1.2
@@ -7,30 +7,12 @@
</p>
<p class="text">
-<b>LDAP filter. </b>Enter the filter in this text field or click Construct to be guided through the construction of an LDAP filter. The Construct dialog box contains the following fields:
+<b>LDAP filter. </b>Enter the filter in this text field or click Construct to be guided through the construction of an LDAP filter.
</p>
-<ul>
-<li>
-<b>Search. </b>Select whether to search for entries within the base DN, one level below the base DN, or the whole subtree beneath the base DN.
-</li>
-
-<li>
-<b>For. </b>Select the types of entries you want to filter from this list. You can choose between users, groups, or both.
-</li>
-
-<li>
-<b>Where. </b>Select an attribute from this drop-down list. The two fields following it allow you to refine your search by selecting one of the qualifiers from the drop-down list (such as contains, does not contain, is, is not). Enter an attribute value in the text box.
-</li>
-
-<li>
-<b>More. </b>Click this button to add additional filters.
-</li>
-
-<li>
-<b>Fewer. </b>Click this button to remove unnecessary filters.
-</li>
-</ul>
+<p class="text">
+<b>Construct... (button).</b> Click to use the Construct dialog box to generate a filter.
+</p>
<p class="text">
<b>Test. </b>Click this button to try your filter. The entries matching your filter appear in the table. The following information is displayed:
Index: property_editor.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/property_editor.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- property_editor.html 13 Aug 2007 22:28:09 -0000 1.1
+++ property_editor.html 15 Nov 2007 18:28:07 -0000 1.2
@@ -7,6 +7,8 @@
</p>
<p class="text">
+<b>View</b>
+<p class="text">
<b>Show Attribute Names. </b>Select this option if you want the property editor to display the names of the attributes as they appear in the schema. For example, <code>mail</code> instead of <code>Email address</code>.
</p>
@@ -23,6 +25,14 @@
</p>
<p class="text">
+<b>Show Effective Rights. </b>Select this checkbox if you want to view the entry's effective rights.
+</p>
+</p>
+
+<p class="text">
+<b>Edit</b>
+
+<p class="text">
<b>Add Value. </b>If the currently selected attribute is not the <code>objectclass</code> attribute or a binary attribute, you can use this command to insert a blank text box for the currently selected attribute. Enter the new value in the text box.
</p>
@@ -41,3 +51,4 @@
<p class="text">
<b>Delete Attribute. </b>Use this command to delete the currently selected attribute from the entry.
</p>
+</p>
Index: statustab_performance.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/statustab_performance.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- statustab_performance.html 13 Aug 2007 22:28:09 -0000 1.1
+++ statustab_performance.html 15 Nov 2007 18:28:07 -0000 1.2
@@ -7,6 +7,11 @@
</p>
<p class="text">
+<b>General Information</b>
+</p>
+
+<ul>
+<p class="text">
<b>Server version. </b>Identifies the current server version.
</p>
@@ -17,9 +22,10 @@
<p class="text">
<b>Current time on server. </b>Displays the current date and time on the server.
</p>
+</ul>
<p class="text">
-<b>Refresh. </b>Click refresh to update the current display.
+<b>Refresh (button). </b>Click refresh to update the current display.
</p>
<p class="text">
@@ -31,25 +37,25 @@
</p>
<ul>
-<li>
-Connections. Gives the total number of connections to this server since startup and the average number of connections per minute since startup.
-</li>
-
-<li>
-Operations Initiated. Gives the total number of operations initiated since server startup and the average number of operations per minute since startup.
-</li>
-
-<li>
-Operations Completed. Gives the total number of operations completed by the server since startup and the average number of operations per minute since server startup.
-</li>
-
-<li>
-Entries Sent To Clients. Gives the total number of entries sent to client applications since server startup in response to search requests and the average number of entries sent to client application per minute since server startup.
-</li>
-
-<li>
-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.
-</li>
+<p class="text">
+<b>Connections.</b> Gives the total number of connections to this server since startup and the average number of connections per minute since startup.
+</p>
+
+<p class="text">
+<b>Operations Initiated.</b> Gives the total number of operations initiated since server startup and the average number of operations per minute since startup.
+</p>
+
+<p class="text">
+<b>Operations Completed.</b> Gives the total number of operations completed by the server since startup and the average number of operations per minute since server startup.
+</p>
+
+<p class="text">
+<b>Entries Sent To Clients.</b> Gives the total number of entries sent to client applications since server startup in response to search requests and the average number of entries sent to client application per minute since server startup.
+</p>
+
+<p class="text">
+<b>Bytes Sent To Clients.</b> Gives the total number of bytes sent to client applications and the average number of bytes sent to client applications since server startup.
+</p>
</ul>
<p class="text">
@@ -57,25 +63,25 @@
</p>
<ul>
-<li>
-Active Threads. Current number of active threads used for handling requests.
-</li>
-
-<li>
-Open Connections. Total number of open connections.
-</li>
-
-<li>
-Remaining Available Connections. Total number of remaining connections that the server can concurrently open.
-</li>
-
-<li>
-Threads Waiting To Read From Client. Provides the current total. This condition occurs when the server starts to receive a request from a client application and then the transmission is halted. This total generally indicates a slow network or client application.
-</li>
-
-<li>
-Database In Use. Total number of databases being used by the server.
-</li>
+<p class="text">
+<b>Active Threads.</b> Current number of active threads used for handling requests.
+</p>
+
+<p class="text">
+<b>Open Connections.</b> Total number of open connections.
+</p>
+
+<p class="text">
+<b>Remaining Available Connections.</b> Total number of remaining connections that the server can concurrently open.
+</p>
+
+<p class="text">
+<b>Threads Waiting To Read From Client.</b> Provides the current total. This condition occurs when the server starts to receive a request from a client application and then the transmission is halted. This total generally indicates a slow network or client application.
+</p>
+
+<p class="text">
+<b>Database In Use.</b> Total number of databases being used by the server.
+</p>
</ul>
<p class="text">
@@ -83,25 +89,25 @@
</p>
<ul>
-<li>
-Time opened. Indicates when the connection was opened.
-</li>
-
-<li>
-Started. Indicates the number of operations initiated by this connection.
-</li>
-
-<li>
-Completed. Indicates the number of operations completed by the server for this connection.
-</li>
-
-<li>
-Bound As. Indicates the DN used by the client application to connect to the server.
-</li>
-
-<li>
-Read/Write. Indicates whether the server is currently blocked for read or write access by the client application.
-</li>
+<p class="text">
+<b>Time opened.</b> Indicates when the connection was opened.
+</p>
+
+<p class="text">
+<b>Started.</b> Indicates the number of operations initiated by this connection.
+</p>
+
+<p class="text">
+<b>Completed.</b> Indicates the number of operations completed by the server for this connection.
+</p>
+
+<p class="text">
+<b>Bound As.</b> Indicates the DN used by the client application to connect to the server.
+</p>
+
+<p class="text">
+<b>Read/Write.</b> Indicates whether the server is currently blocked for read or write access by the client application.
+</p>
</ul>
<p class="text">
@@ -109,35 +115,32 @@
</p>
<ul>
-<li>
-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.
-</li>
-
-<li>
-Tries. The total number of requests performed on your directory since server startup.
-</li>
-
-<li>
-Hit Ratio. The ratio of cache tries to successful cache lookups. The closer this number is to 100% the better.
-</li>
-
-<li>
-Pages read in. Indicates the number of pages read from disk into the cache.
-</li>
-
-<li>
-Pages written out. Indicates the number of pages written from the cache back to disk.
-</li>
-
-<li>
-Read-only page evicts. Indicates the number of read-only pages discarded from the cache to make room for new pages. Pages discarded from the cache have to be written to disk, possibly affecting server performance. The lower the number of page evicts the better.
-</li>
-
-<li>
-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.
-</li>
- <dl>
- <dt>
+<p class="text">
+<b>Hits.</b> Indicates the number of times the server could process a request by obtaining data from the cache rather than by going to the disk.
+</p>
+
+<p class="text">
+<b>Tries.</b> The total number of requests performed on your directory since server startup.
+</p>
+
+<p class="text">
+<b>Hit Ratio.</b> The ratio of cache tries to successful cache lookups. The closer this number is to 100% the better.
+</p>
+
+<p class="text">
+<b>Pages read in.</b> Indicates the number of pages read from disk into the cache.
+</p>
+
+<p class="text">
+<b>Pages written out.</b> Indicates the number of pages written from the cache back to disk.
+</p>
+
+<p class="text">
+<b>Read-only page evicts.</b> Indicates the number of read-only pages discarded from the cache to make room for new pages. Pages discarded from the cache have to be written to disk, possibly affecting server performance. The lower the number of page evicts the better.
+</p>
+
+<p class="text">
+<b>Read-write page evicts.</b> 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.
-<br /> </dt> </dl>
+</p>
</ul>
Index: statustab_performance2.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/statustab_performance2.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- statustab_performance2.html 13 Aug 2007 22:28:09 -0000 1.1
+++ statustab_performance2.html 15 Nov 2007 18:28:07 -0000 1.2
@@ -7,15 +7,21 @@
</p>
<p class="text">
+<b>General Information. </b>
+</p>
+
+<ul>
+<p class="text">
<b>Database. </b>Identifies the type of database being monitored.
</p>
<p class="text">
<b>Configuration DN. </b>Identifies the distinguished name you can use to obtain these results using the <code>ldapsearch</code> command-line utility.
</p>
+</ul>
<p class="text">
-<b>Refresh. </b>Click refresh to update the current display.
+<b>Refresh (button). </b>Click refresh to update the current display.
</p>
<p class="text">
@@ -27,29 +33,29 @@
</p>
<ul>
-<li>
-Read-only status. Indicates whether the database is currently in read-only mode.
-</li>
-
-<li>
-Entry cache hits. Indicates the number of times the server could process a search request by obtaining data from the cache rather than by going to the disk.
-</li>
-
-<li>
-Entry cache tries. The total number of search operations performed against your server since server startup.
-</li>
-
-<li>
-Entry cache hit ratio. The ratio of entry cache tries to successful entry cache lookups. The closer this number is to 100% the better.
-</li>
-
-<li>
-Current size of entry cache (in bytes). Total number of bytes currently used by the entry cache.
-</li>
-
-<li>
-Maximum size of entry cache (in bytes). Maximum number of bytes available to the entry cache.
-</li>
+<p class="text">
+<b>Read-only status.</b> Indicates whether the database is currently in read-only mode.
+</p>
+
+<p class="text">
+<b>Entry cache hits.</b> Indicates the number of times the server could process a search request by obtaining data from the cache rather than by going to the disk.
+</p>
+
+<p class="text">
+<b>Entry cache tries.</b> The total number of search operations performed against your server since server startup.
+</p>
+
+<p class="text">
+<b>Entry cache hit ratio.</b> The ratio of entry cache tries to successful entry cache lookups. The closer this number is to 100% the better.
+</p>
+
+<p class="text">
+<b>Current size of entry cache (in bytes).</b> Total number of bytes currently used by the entry cache.
+</p>
+
+<p class="text">
+<b>Maximum size of entry cache (in bytes).</b> Maximum number of bytes available to the entry cache.
+</p>
</ul>
<p class="text">
@@ -57,19 +63,19 @@
</p>
<ul>
-<li>
-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.
-</li>
-
-<li>
-Cache misses. Number of times the cache does not contain the information being requested by the client application.
-</li>
-
-<li>
-Pages read in. Number of pages read from disk into the database cache.
-</li>
-
-<li>
-Pages written out. Number of pages written from the cache back to disk.
-</li>
+<p class="text">
+<b>Cache hits.</b> Indicates the number of times the server could process a request by obtaining data from the cache rather than by going to the disk.
+</p>
+
+<p class="text">
+<b>Cache misses.</b> Number of times the cache does not contain the information being requested by the client application.
+</p>
+
+<p class="text">
+<b>Pages read in.</b> Number of pages read from disk into the database cache.
+</p>
+
+<p class="text">
+<b>Pages written out.</b> Number of pages written from the cache back to disk.
+</p>
</ul>
16 years, 5 months
[Fedora-directory-commits] adminserver/admserv/cgi-src40 config.c, 1.13, 1.14 config.properties, 1.3, 1.4
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31123/adminserver/admserv/cgi-src40
Modified Files:
config.c config.properties
Log Message:
Resolves: bug 368481
Bug Description: Unable to change Admin Server log paths in Console
Reviewed by: nkinder (Thanks!)
Fix Description: This is for the CGI part. The CGI will now return one error if the input is not a valid filename (i.e. it is a path), and return a different error if the filename could not be opened.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: config.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/config.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- config.c 13 Jul 2007 19:47:15 -0000 1.13
+++ config.c 15 Nov 2007 17:32:22 -0000 1.14
@@ -84,13 +84,13 @@
#define DBT_PORT_INUSE resource_key(RESOURCE_FILE, "20")
#define DBT_PORT_EACCESS resource_key(RESOURCE_FILE, "21")
#define DBT_PORT_NOT_AVAIL resource_key(RESOURCE_FILE, "22")
-#define DBT_ACCESSLOG_INVALID resource_key(RESOURCE_FILE, "23")
-#define DBT_ERRORLOG_INVALID resource_key(RESOURCE_FILE, "24")
+#define DBT_ERROR_OPENING_LOG resource_key(RESOURCE_FILE, "23")
+#define DBT_LOG_INVALID resource_key(RESOURCE_FILE, "24")
static char * read_conf(char *file, char *name);
static int update_conf(char *file, char *name, char *val);
static int validate_addr(char* ip);
-static int validate_logfile(char* name);
+static int validate_logfile(char *logdir, char* name);
#ifdef XP_UNIX
static int rename_pidlog_file(PsetHndl pset, char* newname);
static int change_uid_all(char *dir, int curuid, int newuid);
@@ -538,15 +538,28 @@
/* Check if access log file is being changed */
if (strcasecmp(nameptr,"configuration.nsaccesslog") == 0) {
- if (!validate_logfile(valptr)) {
+ int rc = validate_logfile(logdir, valptr);
+ if (rc == 2) {
/* report error */
psetDelete(pset);
if (i18nResource)
PR_snprintf(error_info, sizeof(error_info),
- res_getstring(i18nResource, DBT_ACCESSLOG_INVALID,
+ res_getstring(i18nResource, DBT_LOG_INVALID,
acceptLanguage, msgbuf, sizeof(msgbuf), NULL),
- nameptr);
- else PR_snprintf(error_info, sizeof(error_info), "Invalid access log file specified");
+ "Access", nameptr);
+ else PR_snprintf(error_info, sizeof(error_info), "%s log file name must be a valid file name and must not include the path. [%s] is invalid.",
+ "Access", nameptr);
+ rpt_err(APP_ERROR, error_info, NULL, NULL);
+ } else if (rc == 0) {
+ /* report error */
+ psetDelete(pset);
+ if (i18nResource)
+ PR_snprintf(error_info, sizeof(error_info),
+ res_getstring(i18nResource, DBT_ERROR_OPENING_LOG,
+ acceptLanguage, msgbuf, sizeof(msgbuf), NULL),
+ "access", nameptr, strerror(errno));
+ else PR_snprintf(error_info, sizeof(error_info), "Could not open %s log file [%s]. Error: %s",
+ "access", nameptr, strerror(errno));
rpt_err(APP_ERROR, error_info, NULL, NULL);
}
else {
@@ -558,15 +571,28 @@
/* Check if error log file is being changed */
if (strcasecmp(nameptr,"configuration.nserrorlog") == 0) {
- if (!validate_logfile(valptr)) {
+ int rc = validate_logfile(logdir, valptr);
+ if (rc == 2) {
/* report error */
psetDelete(pset);
if (i18nResource)
PR_snprintf(error_info, sizeof(error_info),
- res_getstring(i18nResource, DBT_ERRORLOG_INVALID,
+ res_getstring(i18nResource, DBT_LOG_INVALID,
acceptLanguage, msgbuf, sizeof(msgbuf), NULL),
- nameptr);
- else PR_snprintf(error_info, sizeof(error_info), "Invalid error log file specified");
+ "Error", nameptr);
+ else PR_snprintf(error_info, sizeof(error_info), "%s log file name must be a valid file name and must not include the path. [%s] is invalid.",
+ "Error", nameptr);
+ rpt_err(APP_ERROR, error_info, NULL, NULL);
+ } else if (rc == 0) {
+ /* report error */
+ psetDelete(pset);
+ if (i18nResource)
+ PR_snprintf(error_info, sizeof(error_info),
+ res_getstring(i18nResource, DBT_ERROR_OPENING_LOG,
+ acceptLanguage, msgbuf, sizeof(msgbuf), NULL),
+ "error", nameptr, strerror(errno));
+ else PR_snprintf(error_info, sizeof(error_info), "Could not open %s log file [%s]. Error: %s",
+ "error", nameptr, strerror(errno));
rpt_err(APP_ERROR, error_info, NULL, NULL);
}
else {
@@ -1042,16 +1068,16 @@
* 0 error
*
*/
-static int validate_logfile(char *name) {
+static int validate_logfile(char *logdir, char *name) {
FILE *f;
char *fullname;
if (!name || !*name ||
!util_is_valid_path_string(name)) {
- return 0; /* error */
+ return 2; /* error */
}
- fullname = PR_smprintf("%s/%s", LOGDIR, name);
+ fullname = PR_smprintf("%s/%s", logdir, name);
f = fopen(fullname, "a+");
PR_smprintf_free(fullname);
Index: config.properties
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/config.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config.properties 18 Aug 2005 18:59:03 -0000 1.3
+++ config.properties 15 Nov 2007 17:32:22 -0000 1.4
@@ -46,7 +46,7 @@
config20 { "Port is already in use" }
config21 { "Inadequate permission. Port is protected." }
config22 { "Port is not available" }
-config23 { "Invalid access log file specified" }
-config24 { "Invalid error log file specified" }
+config23 { "Could not open %s log file [%s]. Error: %s" }
+config24 { "%s log file name must be a valid file name and must not include the path. [%s] is invalid." }
}
16 years, 5 months
[Fedora-directory-commits] adminserver/admserv/html admserv_dsgw.html, NONE, 1.1 admserv_orgchart.html, NONE, 1.1 admserv_phonebook.html, NONE, 1.1 admserv.html, 1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/html
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27530/adminserver/admserv/html
Modified Files:
admserv.html
Added Files:
admserv_dsgw.html admserv_orgchart.html admserv_phonebook.html
Log Message:
Resolves: bug 383301
Bug Description: Admin Server main html page refers to dsgw, org
Reviewed by: nhosoi (Thanks!)
Fix Description: Introduce a new directive - INCLUDEIFEXISTS. This will include the html file specified if it exists, or just skip it if not found. When dsgw, org, etc. are ready, we can just plug in the appropriate html file.
I added the html excerpts to the data directory so we can have them in case we want to use them - just copy them to the html directory and reload the main admin server page.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
--- NEW FILE admserv_dsgw.html ---
<tr valign="top">
<td><img src="../icons/goto.gif" width="10" height="15"> </td>
<td><font face="Verdana, sans-serif"><a href="/clients/dsgw/bin/lang?context=dsgw">
Directory Server Gateway</a></font><font size="-1" face="Verdana, sans-serif"><br>
Search for and edit directory entries.</font><font size="-1" face="Verdana, sans-serif">
</font></td>
</tr>
<tr valign="top">
<td> </td>
<td> </td>
</tr>
--- NEW FILE admserv_orgchart.html ---
<tr valign="top">
<td><img src="../icons/goto.gif" width="10" height="15"> </td>
<td><font face="Verdana, sans-serif"><a href="/clients/orgchart/html/index.html">
Directory Server Org Charts</a></font><font size="-1" face="Verdana, sans-serif"><br>
Browse org charts of your organization.</font><font size="-1" face="Verdana, sans-serif">
</font></td>
</tr>
<tr valign="TOP">
<td> </td>
<td> </td>
</tr>
--- NEW FILE admserv_phonebook.html ---
<tr valign="top">
<td><img src="../icons/goto.gif" width="10" height="15"> </td>
<td><font face="Verdana, sans-serif"><a href="/clients/dsgw/bin/lang?context=pb">
Directory Server Express</a></font><font size="-1" face="Verdana, sans-serif"><br>
Search for users by name, user ID or extension.</font><font size="-1" face="Verdana, sans-serif">
</font></td>
</tr>
<tr valign="top">
<td> </td>
<td> </td>
</tr>
Index: admserv.html
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/html/admserv.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- admserv.html 9 May 2007 00:26:31 -0000 1.1
+++ admserv.html 15 Nov 2007 17:02:02 -0000 1.2
@@ -49,28 +49,8 @@
<td><img src="../icons/spacer.gif" width="6" height="6"></td>
<td></td>
</tr>
- <tr valign="top">
- <td><img src="../icons/goto.gif" width="10" height="15"> </td>
- <td><font face="Verdana, sans-serif"><a href="/clients/dsgw/bin/lang?context=pb">
- Directory Server Express</a></font><font size="-1" face="Verdana, sans-serif"><br>
- Search for users by name, user ID or extension.</font><font size="-1" face="Verdana, sans-serif">
- </font></td>
- </tr>
- <tr valign="top">
- <td> </td>
- <td> </td>
- </tr>
- <tr valign="top">
- <td><img src="../icons/goto.gif" width="10" height="15"> </td>
- <td><font face="Verdana, sans-serif"><a href="/clients/orgchart/html/index.html">
- Directory Server Org Charts</a></font><font size="-1" face="Verdana, sans-serif"><br>
- Browse org charts of your organization.</font><font size="-1" face="Verdana, sans-serif">
- </font></td>
- </tr>
- <tr valign="TOP">
- <td> </td>
- <td> </td>
- </tr>
+<!-- INCLUDEIFEXISTS admserv_phonebook.html -->
+<!-- INCLUDEIFEXISTS admserv_orgchart.html -->
</table>
</td>
<td> </td>
@@ -89,17 +69,7 @@
<td><img src="../icons/spacer.gif" width="6" height="6"></td>
<td></td>
</tr>
- <tr valign="top">
- <td><img src="../icons/goto.gif" width="10" height="15"> </td>
- <td><font face="Verdana, sans-serif"><a href="/clients/dsgw/bin/lang?context=dsgw">
- Directory Server Gateway</a></font><font size="-1" face="Verdana, sans-serif"><br>
- Search for and edit directory entries.</font><font size="-1" face="Verdana, sans-serif">
- </font></td>
- </tr>
- <tr valign="top">
- <td> </td>
- <td> </td>
- </tr>
+<!-- INCLUDEIFEXISTS admserv_dsgw.html -->
<tr valign="TOP">
<td><img src="../icons/goto.gif" width="10" height="15"> </td>
<td><font face="Verdana, sans-serif"><a href='http://fedora.redhat.com/'>Fedora Home Page</a></font><font size="-1" face="Verdana, sans-serif"><br>
16 years, 5 months
[Fedora-directory-commits] adminserver/admserv/cgi-src40 download.c, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27530/adminserver/admserv/cgi-src40
Modified Files:
download.c
Log Message:
Resolves: bug 383301
Bug Description: Admin Server main html page refers to dsgw, org
Reviewed by: nhosoi (Thanks!)
Fix Description: Introduce a new directive - INCLUDEIFEXISTS. This will include the html file specified if it exists, or just skip it if not found. When dsgw, org, etc. are ready, we can just plug in the appropriate html file.
I added the html excerpts to the data directory so we can have them in case we want to use them - just copy them to the html directory and reload the main admin server page.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: download.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/download.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- download.c 9 May 2007 00:26:30 -0000 1.7
+++ download.c 15 Nov 2007 17:02:02 -0000 1.8
@@ -71,9 +71,6 @@
#define MYHTMLFILE "admserv.html"
-#define DSGW_BLOCK "<dsgw_menu_block>"
-#define DSGW_BLOCK_CLOSE "</dsgw_menu_block>"
-
static int
safe_snprintf(char *buf, size_t size, const char *fmt, ...)
{
@@ -99,11 +96,9 @@
{
char line[PATH_LENGTH];
FILE *html;
- int i, dsgwblock, has_dsgw;
+ int i;
char *acceptLanguage = NULL;
char *loc;
-
- has_dsgw = 1; /* hardcoded for now until we can figure out a better mechanism */
acceptLanguage = getenv("HTTP_ACCEPT_LANGUAGE");
if (acceptLanguage == NULL)
@@ -121,6 +116,7 @@
HTMLDIR, FILE_SEP, loc[0],loc[1], FILE_SEP, MYHTMLFILE);
if ((html = fopen(line, "r")) != NULL)
{
+ loc[2] = '\0';
break;
}
else
@@ -134,6 +130,7 @@
{
error_exit(MYHTMLFILE " not found");
}
+ loc = "";
break;
}
}
@@ -141,30 +138,32 @@
printf("Content-type: text/html\n\n");
- dsgwblock = 0;
-
while (fgets(line, PATH_LENGTH, html))
{
- if (!STRNCASECMP(line, DSGW_BLOCK, strlen(DSGW_BLOCK)))
- {
- dsgwblock = 1;
- continue;
- }
-
- if (!STRNCASECMP(line, DSGW_BLOCK_CLOSE, strlen(DSGW_BLOCK_CLOSE)))
- {
- dsgwblock =0;
+#define INCLUDEIFEXISTS "<!-- INCLUDEIFEXISTS "
+ if (!strncmp(line, INCLUDEIFEXISTS, strlen(INCLUDEIFEXISTS))) {
+ char *p = line + strlen(INCLUDEIFEXISTS);
+ char *end = strstr(line, " -->");
+ if (p && *p && end) {
+ char includefile[PATH_LENGTH];
+ FILE *includedhtml = NULL;
+ *end = '\0';
+ safe_snprintf(includefile, sizeof(includefile),
+ "%s%c%s%s%s",
+ HTMLDIR, FILE_SEP, loc ? loc : "",
+ loc ? "/" : "", p);
+ includedhtml = fopen(includefile, "r");
+ while (includedhtml && fgets(line, PATH_LENGTH, includedhtml)) {
+ printf("%s", line);
+ }
+ if (includedhtml) {
+ fclose(includedhtml);
+ includedhtml = NULL;
+ }
+ }
continue;
}
-
- if (!dsgwblock)
- {
- printf("%s", line);
- continue;
- }
-
- if (dsgwblock && has_dsgw)
- printf("%s", line);
+ printf("%s", line);
}
fflush(stdout);
16 years, 5 months
[Fedora-directory-commits] adminserver Makefile.am, 1.35, 1.36 aclocal.m4, 1.34, 1.35 configure, 1.38, 1.39 missing, 1.24, 1.25 install-sh, 1.24, 1.25 Makefile.in, 1.41, 1.42 depcomp, 1.24, 1.25 config.sub, 1.24, 1.25 config.guess, 1.24, 1.25 compile, 1.23, 1.24
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27530/adminserver
Modified Files:
Makefile.am aclocal.m4 configure missing install-sh
Makefile.in depcomp config.sub config.guess compile
Log Message:
Resolves: bug 383301
Bug Description: Admin Server main html page refers to dsgw, org
Reviewed by: nhosoi (Thanks!)
Fix Description: Introduce a new directive - INCLUDEIFEXISTS. This will include the html file specified if it exists, or just skip it if not found. When dsgw, org, etc. are ready, we can just plug in the appropriate html file.
I added the html excerpts to the data directory so we can have them in case we want to use them - just copy them to the html directory and reload the main admin server page.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Makefile.am 14 Nov 2007 17:51:55 -0000 1.35
+++ Makefile.am 15 Nov 2007 17:02:02 -0000 1.36
@@ -162,7 +162,10 @@
admserv/schema/ldif/20asdata.ldif.tmpl \
admserv/schema/ldif/21astasks.ldif.tmpl \
admserv/schema/ldif/22ascommands.ldif.tmpl \
- admserv/schema/ldif/asmigrate.ldif.tmpl
+ admserv/schema/ldif/asmigrate.ldif.tmpl \
+ admserv/html/admserv_phonebook.html \
+ admserv/html/admserv_orgchart.html \
+ admserv/html/admserv_dsgw.html
inf_DATA = admserv/newinst/src/admin.inf \
admserv/newinst/src/setup.inf \
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Makefile.in 14 Nov 2007 17:51:55 -0000 1.41
+++ Makefile.in 15 Nov 2007 17:02:02 -0000 1.42
@@ -556,7 +556,10 @@
admserv/schema/ldif/20asdata.ldif.tmpl \
admserv/schema/ldif/21astasks.ldif.tmpl \
admserv/schema/ldif/22ascommands.ldif.tmpl \
- admserv/schema/ldif/asmigrate.ldif.tmpl
+ admserv/schema/ldif/asmigrate.ldif.tmpl \
+ admserv/html/admserv_phonebook.html \
+ admserv/html/admserv_orgchart.html \
+ admserv/html/admserv_dsgw.html
inf_DATA = admserv/newinst/src/admin.inf \
admserv/newinst/src/setup.inf \
16 years, 5 months