[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts template-verify-db.pl.in, 1.9, 1.10
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1822
Modified Files:
template-verify-db.pl.in
Log Message:
Resolves: #371751
Summary: verify-db.pl : can't find dbverify
Index: template-verify-db.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-verify-db.pl.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- template-verify-db.pl.in 6 Nov 2007 18:13:57 -0000 1.9
+++ template-verify-db.pl.in 28 Nov 2007 18:06:14 -0000 1.10
@@ -169,7 +169,7 @@
my $dbdirs = getDbDir($startpoint);
my $prefix = "{{DS-ROOT}}";
-$ENV{'PATH'} = "{{SERVER-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}:$prefix@db_bindir@:$prefix/usr/bin:@db_bindir@:/usr/bin";
+$ENV{'PATH'} = "{{INST-DIR}}:$prefix@db_bindir@:$prefix/usr/bin:@db_bindir@:/usr/bin";
$ENV{'LD_LIBRARY_PATH'} = "@db_libdir@:@libdir@";
$ENV{'SHLIB_PATH'} = "@db_libdir@:@libdir@";
16 years, 4 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/tools dbscan.c, 1.18, 1.19
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25334
Modified Files:
dbscan.c
Log Message:
Resolves: #345671
Summary: clu test failures (Comment #7)
Description: 1) Removing obsolete PATH info from Usage
2) Replacing "idl" with "ID list" following the suggestion from Doc.
Index: dbscan.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/dbscan.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dbscan.c 18 Oct 2007 00:08:34 -0000 1.18
+++ dbscan.c 28 Nov 2007 17:21:39 -0000 1.19
@@ -68,7 +68,7 @@
#if ( defined( hpux ) )
#ifdef _XOPEN_SOURCE_EXTENDED
-#include <arpa/inet.h> /* for ntohl, et al. */
+#include <arpa/inet.h> /* for ntohl, et al. */
#endif
#endif
@@ -101,9 +101,9 @@
/* changelog ruv info. These correspond with some special csn
* timestamps from cl5_api.c */
-#define ENTRY_COUNT_KEY "0000006f" /* 111 csn timestamp */
-#define PURGE_RUV_KEY "000000de" /* 222 csn timestamp */
-#define MAX_RUV_KEY "0000014d" /* 333 csn timestamp */
+#define ENTRY_COUNT_KEY "0000006f" /* 111 csn timestamp */
+#define PURGE_RUV_KEY "000000de" /* 222 csn timestamp */
+#define MAX_RUV_KEY "0000014d" /* 333 csn timestamp */
#define ONEMEG (1024*1024)
@@ -708,7 +708,7 @@
} else if (strncasecmp((char *)key->data, PURGE_RUV_KEY, 8) == 0) {
printf("\tpurge ruv:\n");
print_ruv(data->data);
- } else if (strncasecmp((char *)key->data, MAX_RUV_KEY, 8) == 0) {
+ } else if (strncasecmp((char *)key->data, MAX_RUV_KEY, 8) == 0) {
printf("\tmax ruv:\n");
print_ruv(data->data);
} else {
@@ -772,7 +772,26 @@
static void usage(char *argv0)
{
- printf("\n%s - scan a db file and dump the contents\n", argv0);
+ char *copy = strdup(argv0);
+ char *p0 = NULL, *p1 = NULL;
+ if (NULL != copy) {
+ /* the full path is not needed in the usages */
+ p0 = strrchr(argv0, '/');
+ if (NULL != p0) {
+ *p0 = '\0';
+ p0++;
+ } else {
+ p0 = argv0;
+ }
+ p1 = strrchr(p0, '-'); /* get rid of -bin from the usage */
+ if (NULL != p1) {
+ *p1 = '\0';
+ }
+ }
+ if (NULL == p0) {
+ p0 = argv0;
+ }
+ printf("\n%s - scan a db file and dump the contents\n", p0);
printf(" common options:\n");
printf(" -f <filename> specify db file\n");
printf(" -R dump as raw data\n");
@@ -785,21 +804,20 @@
printf(" (default %d; 40 bytes <= size <= 1048576 bytes)\n",
MAX_BUFFER);
printf(" -G <n> only display index entries with more than <n> ids\n");
- printf(" -n display idl lengths\n");
- printf(" -r display the conents of idl\n");
+ printf(" -n display ID list lengths\n");
+ printf(" -r display the conents of ID list\n");
printf(" -s Summary of index counts\n");
printf(" sample usages:\n");
- printf(" # set <prefix>/usr/lib/<PACKAGE_NAME>:<prefix>/usr/lib:/usr/lib in the library path\n");
printf(" # dump the entry file\n");
- printf(" %s -f id2entry.db\n", argv0);
+ printf(" %s -f id2entry.db\n", p0);
printf(" # display index keys in cn.db4\n");
- printf(" %s -f cn.db4\n", argv0);
+ printf(" %s -f cn.db4\n", p0);
printf(" # display index keys and the count of entries having the key in mail.db4\n");
- printf(" %s -r -f mail.db4\n", argv0);
+ printf(" %s -r -f mail.db4\n", p0);
printf(" # display index keys and the IDs having more than 20 IDs in sn.db4\n");
- printf(" %s -r -G 20 -f sn.db4\n", argv0);
+ printf(" %s -r -G 20 -f sn.db4\n", p0);
printf(" # display summary of objectclass.db4\n");
- printf(" %s -f objectclass.db4\n", argv0);
+ printf(" %s -f objectclass.db4\n", p0);
printf("\n");
exit(1);
}
16 years, 4 months
[Fedora-directory-commits] adminserver/admserv/cgi-src40 security.c, 1.13, 1.14
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27940
Modified Files:
security.c
Log Message:
Resolves: 370071
Summary: Fixed malloc issue when importing a CRL.
Index: security.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/security.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- security.c 14 Nov 2007 23:42:43 -0000 1.13
+++ security.c 27 Nov 2007 16:55:49 -0000 1.14
@@ -1571,7 +1571,7 @@
*end = '\0';
/* don't copy the header */
- DERCert = (char*)PORT_ZAlloc(PORT_Strlen(begin - headerlen + 1));
+ DERCert = (char*)PORT_ZAlloc(PORT_Strlen(begin) - headerlen + 1);
strcpy(DERCert, (begin + headerlen));
if ( SECFailure == ATOB_ConvertAsciiToItem(&derCrl, DERCert) ) {
16 years, 4 months
[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSDialogs.pm, 1.5, 1.6 Util.pm.in, 1.12, 1.13 setup-ds.res.in, 1.11, 1.12
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19191/ldapserver/ldap/admin/src/scripts
Modified Files:
DSDialogs.pm Util.pm.in setup-ds.res.in
Log Message:
Resolves: bug 371771
Bug Description: '.' (dot) in the server ID
Reviewed by: nkinder (Thanks!)
Fix Description: Remove . and , from the characters allowed in the server ID. Also use the more descriptive error message.
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: DSDialogs.pm
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSDialogs.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DSDialogs.pm 15 Aug 2007 22:04:31 -0000 1.5
+++ DSDialogs.pm 21 Nov 2007 20:27:38 -0000 1.6
@@ -99,9 +99,9 @@
my $res = $DialogManager::SAME;
my $path = $self->{manager}->{setup}->{configdir} . "/slapd-" . $ans;
if (!isValidServerID($ans)) {
- $self->{manager}->alert("dialog_dsserverid_error", $ans);
+ $self->{manager}->alert("error_invalid_serverid", $ans);
} elsif (-d $path) {
- $self->{manager}->alert("dialog_dsserverid_inuse", $ans);
+ $self->{manager}->alert("error_server_already_exists", $path);
} else {
$res = $DialogManager::NEXT;
$self->{manager}->{inf}->{slapd}->{ServerIdentifier} = $ans;
Index: Util.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Util.pm.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Util.pm.in 14 Sep 2007 02:41:13 -0000 1.12
+++ Util.pm.in 21 Nov 2007 20:27:38 -0000 1.13
@@ -107,7 +107,7 @@
sub isValidServerID {
my $servid = shift;
- my $validchars = '#%,.:\w@_-';
+ my $validchars = '#%:\w@_-';
return $servid =~ /^[$validchars]+$/o;
}
Index: setup-ds.res.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/setup-ds.res.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- setup-ds.res.in 11 Oct 2007 14:10:00 -0000 1.11
+++ setup-ds.res.in 21 Nov 2007 20:27:38 -0000 1.12
@@ -108,7 +108,7 @@
program, or low port restriction. Please choose another value for\
ServerPort. Error: $!\n
error_invalid_serverid = The ServerIdentifier '%s' contains invalid characters. It must\
-contain only alphanumeric characters and the following: #%,.:@_-\n
+contain only alphanumeric characters and the following: #%:@_-\n\n
error_opening_scripttmpl = Could not open the script template file '%s'. Error: %s\n
error_creating_directory = Could not create directory '%s'. Error: %s\n
error_chowning_directory = Could not change ownership of directory '%s' to userid '%s': Error: %s\n
16 years, 5 months
[Fedora-directory-commits] fedora-idm-console/com/netscape/management/client/theme theme.properties, 1.1.1.1, 1.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/fedora-idm-console/com/netscape/management/client/theme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7955/com/netscape/management/client/theme
Modified Files:
theme.properties
Log Message:
Resolves: 393461
Summary: Move documentation home link to theme package.
Index: theme.properties
===================================================================
RCS file: /cvs/dirsec/fedora-idm-console/com/netscape/management/client/theme/theme.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- theme.properties 1 Aug 2007 23:08:51 -0000 1.1.1.1
+++ theme.properties 21 Nov 2007 16:55:20 -0000 1.2
@@ -31,5 +31,4 @@
CertInstallTypePage-defaultServerName=Fedora Server
CertInstallTypePage-defaultSIE=Fedora Server Instance
-
-
+menu-HelpDocHome=http://directory.fedoraproject.org
16 years, 5 months
[Fedora-directory-commits] console/src/com/netscape/management/client Framework.java, 1.4, 1.5 default.properties, 1.8, 1.9
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7916/src/com/netscape/management/client
Modified Files:
Framework.java default.properties
Log Message:
Resolves: 393461
Summary: Move documentation home link to theme package.
Index: Framework.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/Framework.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Framework.java 2 Jul 2007 18:49:16 -0000 1.4
+++ Framework.java 21 Nov 2007 16:54:46 -0000 1.5
@@ -797,7 +797,8 @@
{
// Launch a browser
Browser browser = new Browser();
- boolean res = browser.open(i18n("menu", "HelpDocHome"), Browser.NEW_WINDOW);
+ boolean res = browser.open(_resource_theme.getString("menu", "HelpDocHome"),
+ Browser.NEW_WINDOW);
}
else
Debug.println("Unrecognized Help Menu ID: " + menuID);
Index: default.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/default.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- default.properties 26 Jul 2007 15:53:02 -0000 1.8
+++ default.properties 21 Nov 2007 16:54:46 -0000 1.9
@@ -64,7 +64,6 @@
menu-HelpIndex=&Index
menu-HelpWebHelp=Web-based &Resources
menu-HelpSuiteSpot=Documentation &Home
-menu-HelpDocHome=directory.fedora.redhat.com
menu-HelpBookshelf=&Bookshelf
menu-HelpAbout=&About...
16 years, 5 months
[Fedora-directory-commits] directoryconsole/help/en/help configtab_db7.html, 1.1, 1.2 configtab_db8.html, 1.1, 1.2 configtab_db9.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-serv9739
Modified Files:
configtab_db7.html configtab_db8.html configtab_db9.html
Log Message:
Resolves: #379191
Summary: Online help: Directory Console (ds-console) (Comment #12)
Description: cvs diffs (help pages referred from Directory Console | Configuration Tab | top Console menu)
1) adjusted the text, e.g., "From local machine" to "on console machine".
2) added missing items
Index: configtab_db7.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_db7.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_db7.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_db7.html 21 Nov 2007 02:00:41 -0000 1.2
@@ -1,5 +1,5 @@
<p class="topic">
-Import
+Initialize Databases
</p>
<p class="text">
@@ -11,13 +11,26 @@
</p>
<p class="text">
-The following two options apply only if you operate the console from a machine remote to the server containing the LDIF file.
+<b>on console machine. </b>
+Select this radio button to initialize the database with a file on the local machine.
+This option is not visible if you are running Directory Server Console on the directory's host.
+By default, the console looks for a file stored in the current directory.
</p>
<p class="text">
-<b>From local machine. </b>Select this radio button to indicate that the LDIF file is located on the local server. By default, the console looks for a file stored in the current directory.
+<b>on server machine. </b>
+Select this radio button to initialize the database with a file on the server's host machine.
+This option is not visible if you are running Directory Server Console on the directory's host.
</p>
<p class="text">
-<b>From server machine. </b>Select this radio button to indicate that the LDIF file is located on a remote server. By default, the console looks for the file in the following directory: <code>/opt/<span class="variable">productID</span>/slapd-</code><span class="variable">serverID</span><code>/ldif</code>.
+<b>Database Name. </b>Backend database name
+</p>
+
+<p class="text">
+<b>Suffix of the Database. </b>Suffix of the database
+</p>
+
+<p class="text">
+<b>Initialize Database. </b>Select database to initialize with the LDIF file
</p>
Index: configtab_db8.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_db8.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_db8.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_db8.html 21 Nov 2007 02:00:41 -0000 1.2
@@ -10,16 +10,11 @@
<b>LDIF file. </b>Enter the full path to the LDIF file you want to import. Click Browse to locate it on your machine.
</p>
-<p class="text">
-If you are operating the console from a machine remote to the server containing the LDIF file, select one of the following options:
-</p>
+<b>on console machine. </b>
+Select this radio button to initialize the database with a file on the local machine.
+This option is not visible if you are running Directory Server Console on the directory's host.
+By default, the console looks in the current directory for the LDIF file.
-<ul>
-<li>
-<b>From local machine. </b>Indicates that the LDIF file is located on the local server. By default, the console looks in the current directory for the LDIF file.
-</li>
-
-<li>
-<b>From server machine. </b>Indicates that the LDIF file is located on a remote server.
-</li>
-</ul>
+<b>on server machine. </b>
+Select this radio button to initialize the database with a file on the server's host machine.
+This option is not visible if you are running Directory Server Console on the directory's host.
Index: configtab_db9.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_db9.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_db9.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_db9.html 21 Nov 2007 02:00:41 -0000 1.2
@@ -11,11 +11,12 @@
</p>
<p class="text">
-<b>To Local Machine. </b>Choose this option to export the database to a local file. This option is not visible if you are running Directory Server Console on the directory's host.
+<b>on console machine. </b>Choose this option to export the database to a local file. This option is not visible if you are running Directory Server Console on the directory's host.
</p>
<p class="text">
-<b>To Server Machine. </b>Choose this option to export the database to a file on the server's host machine. If you choose this option, you cannot Browse to select a different file. This option is not visible if you are running Directory Server Console on the directory's host.
+<b>on server machine. </b>
+Choose this option to export the database to a file on the server's host machine. If you choose this option, you cannot Browse to select a different file. This option is not visible if you are running Directory Server Console on the directory's host.
</p>
<p class="text">
16 years, 5 months
[Fedora-directory-commits] directoryconsole/help/en/help configtab_logs.html, 1.1, 1.2 configtab_logs2.html, 1.1, 1.2 configtab_logs3.html, 1.1, 1.2 configtab_plugins.html, 1.1, 1.2 configtab_schema.html, 1.1, 1.2 configtab_schema2.html, 1.1, 1.2 configtab_schema3.html, 1.1, 1.2 configtab_schema4.html, 1.1, 1.2 configtab_schema5.html, 1.1, 1.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/directoryconsole/help/en/help
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13335
Modified Files:
configtab_logs.html configtab_logs2.html configtab_logs3.html
configtab_plugins.html configtab_schema.html
configtab_schema2.html configtab_schema3.html
configtab_schema4.html configtab_schema5.html
Log Message:
Resolves: 379191
Summary: Corrected formatting and path issues in online help files.
Index: configtab_logs.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_logs.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_logs.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_logs.html 20 Nov 2007 18:32:06 -0000 1.2
@@ -15,11 +15,7 @@
</p>
<p class="text">
-<b>Log File. </b>Contains the full path and name of the access log file. By default, the value is:
-</p>
-
-<p class="code">
-<code><span class="variable">serverRoot</span>/slapd-<span class="variable">serverID</span>/logs/access</code>
+<b>Log File. </b>Contains the full path and name of the access log file.
</p>
<p class="text">
Index: configtab_logs2.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_logs2.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_logs2.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_logs2.html 20 Nov 2007 18:32:06 -0000 1.2
@@ -15,12 +15,7 @@
</p>
<p class="text">
-<b>Log File. </b>Contains the full path and filename of the error log. By default, the value is:
-</p>
-
-<p class="code">
-<span class="variable">serverRoot</span>/slapd-</font><span class="variable">serverID</span>/logs/errors
-</font>
+<b>Log File. </b>Contains the full path and filename of the error log.
</p>
<p class="text">
@@ -48,7 +43,7 @@
</p>
<p class="text">
-<b>Maximum number of logs. </b>The number of logs to archive per directory. The default value is 1 log, meaning that the server does not rotate the log and it grows indefinitely.
+<b>Maximum number of logs. </b>The number of logs to archive per directory.
</p>
<p class="text">
Index: configtab_logs3.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_logs3.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_logs3.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_logs3.html 20 Nov 2007 18:32:06 -0000 1.2
@@ -15,11 +15,7 @@
</p>
<p class="text">
-<b>Log File. </b>Contains the full path and name of the audit log. By default, the value is:
-</p>
-
-<p class="code">
-<span class="variable">serverRoot</span>/slapd-<span class="variable">serverID</span>/logs/audit
+<b>Log File. </b>Contains the full path and name of the audit log.
</p>
<p class="text">
Index: configtab_plugins.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_plugins.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_plugins.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_plugins.html 20 Nov 2007 18:32:06 -0000 1.2
@@ -35,7 +35,7 @@
</p>
<p class="text">
-<b>Plug-in module path. </b>Gives the name and path of the shared object or dynamic link library that contains the plug-in.
+<b>Plug-in module path. </b>Gives the name and path of the shared object that contains the plug-in. The path and shared object suffix can be omitted if the plug-in is in the server's default plug-in directory.
</p>
<p class="text">
Index: configtab_schema.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_schema.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_schema.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_schema.html 20 Nov 2007 18:32:06 -0000 1.2
@@ -3,7 +3,7 @@
</p>
<p class="text">
-Use this tab to view information about all object classes that currently exist in your directory schema. You can also delete an object class that you have created using this tab. You cannot edit or delete standard object classes.
+Use this tab to view information about all object classes that currently exist in your directory schema as well as create new object classes. You can also edit or delete an object class that you have created using this tab. You cannot edit or delete standard object classes.
</p>
<p class="text">
Index: configtab_schema2.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_schema2.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_schema2.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_schema2.html 20 Nov 2007 18:32:06 -0000 1.2
@@ -1,5 +1,5 @@
<p class="topic">
-Create Object Class
+Create/Edit Object Class
</p>
<p class="text">
Index: configtab_schema3.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_schema3.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_schema3.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_schema3.html 20 Nov 2007 18:32:06 -0000 1.2
@@ -10,7 +10,7 @@
<b>Standard Attributes (Read-Only). </b>The Standard Attributes table lists all standard attributes along with their OIDs and corresponding attribute syntax. The alphabetical listing of all available attributes helps you determine whether or not you need to create a new attribute. The information in the table is defined below.
</p>
-<ul>
+<ul class="text">
<li>
Name—The unique name of the attribute.
</li>
Index: configtab_schema4.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_schema4.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_schema4.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_schema4.html 20 Nov 2007 18:32:06 -0000 1.2
@@ -1,5 +1,5 @@
<p class="topic">
-Create Attribute Dialog Box
+Create/Edit Attribute
</p>
<p class="text">
@@ -23,7 +23,7 @@
</p>
<p class="text">
-<b>Syntax. </b>Select a syntax that describes the data to be held by the attribute. Available syntaxes are Integer, IA5String, Case Exact String, Case Ignore String, URI, GeneralizedTime, DistinguishedName (DN), TelephoneNumber, Boolean, Binary, DirectoryString, CountryName, PostalAddress, and Octet String. The default value is DirectoryString.
+<b>Syntax. </b>Select a syntax that describes the data to be held by the attribute.
</p>
<p class="text">
Index: configtab_schema5.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_schema5.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_schema5.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_schema5.html 20 Nov 2007 18:32:06 -0000 1.2
@@ -26,7 +26,7 @@
The possible name types include:
</p>
-<ul>
+<ul class="text">
<li>
caseIgnoreOrderingMatch-(Lang)
</li>
16 years, 5 months
[Fedora-directory-commits] directoryconsole/help/en/help configtab_replication.html, 1.1, 1.2 configtab_replication2.html, 1.1, 1.2 configtab_replication3.html, 1.1, 1.2 configtab_replication8.html, 1.1, 1.2 replication_wizard.html, 1.1, 1.2 replication_wizard4.html, 1.1, 1.2 replication_wizard6.html, 1.1, 1.2 synchronization_wizard2.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-serv2062/help
Modified Files:
configtab_replication.html configtab_replication2.html
configtab_replication3.html configtab_replication8.html
replication_wizard.html replication_wizard4.html
replication_wizard6.html synchronization_wizard2.html
Log Message:
Resolves: #379191
Summary: Online help: Directory Console (ds-console) (Comment #8)
Description: help pages referred from Directory Console | Configuration Tab |
Replication tree
1) format change (added indentation for grouping).
2) eliminated "serverRoot" as well as obsolete descriptions.
3) repl/win-sync agreement summary panel is shared. added notes on both.
Index: configtab_replication.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_replication.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_replication.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_replication.html 20 Nov 2007 17:35:08 -0000 1.2
@@ -11,13 +11,19 @@
</p>
<p class="text">
+<b>Authentication</b>
+</p>
+
+<ul>
+<p class="text">
<b>Supplier DN.</b> 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.
</p>
<p class="text">
-<b>New supplier password. </b> If a password is specified, the supplier server uses this password to bind to the consumer server.
+<b>New supplier password (min 8 char). </b> If a password is specified, the supplier server uses this password to bind to the consumer server. Minimum 8 characters.
</p>
<p class="text">
<b>Confirm new supplier password. </b> Confirms that the password entered in the "New supplier password" field is correct.
</p>
+</ul>
Index: configtab_replication2.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_replication2.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_replication2.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_replication2.html 20 Nov 2007 17:35:08 -0000 1.2
@@ -11,15 +11,20 @@
</p>
<p class="text">
+<b>Replication Changelog</b>
+</p>
+
+<ul>
+<p class="text">
<b>Changelog database directory. </b>The directory in which the supplier server stores the change log.
</p>
<p class="text">
-<b>Browse. </b>If you want the server to display a file selector so that you can select a directory for storing the change log database, click this button.
+<b>Browse (button). </b>If you want the server to display a file selector so that you can select a directory for storing the change log database, click this button.
</p>
<p class="text">
-<b>Use default. </b>If you want the server to suggest a default path name for the change log database, click this button.
+<b>Use default (button). </b>If you want the server to suggest a default path name for the change log database, click this button.
</p>
<p class="text">
@@ -29,6 +34,7 @@
<p class="text">
<b>Max changelog age. </b>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.
</p>
+</ul>
<p class="text">
To remove a change log database that has grown too big, you must manually delete it.
Index: configtab_replication3.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_replication3.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_replication3.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_replication3.html 20 Nov 2007 17:35:08 -0000 1.2
@@ -11,6 +11,11 @@
</p>
<p class="text">
+<b>Replica Role.</b> Select one of the replica roles
+</p>
+
+<ul>
+<p class="text">
<b>Single Master. </b>Select this radio button if you want this Directory Server to act as the single supplier server for this database.
</p>
@@ -25,13 +30,19 @@
<p class="text">
<b>Dedicated Consumer. </b>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.
</p>
+</ul>
<p class="text">
-<b>Replica ID. </b>An integer between 1 and 255 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.
+<b>Common Settings.</b>
</p>
+<ul>
<p class="text">
-If the ID is incorrect, the field labels turn red and the Save button is disabled.
+<b>Replica ID. </b>An integer between 1 and 255 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.
+</p>
+
+<p class="text">
+If the ID is incorrect, the field labels turn red and the Save button is disabled. Dedicated Consumer does not require Replica ID.
</p>
<p class="text">
@@ -41,11 +52,18 @@
<p class="text">
<b>Updatable by a 4.x Replica.</b> Check this checkbox if you want this Directory Server to act as a legacy consumer of a 4.x supplier server.
</p>
+</ul>
+
+<p class="text">
+<b>Update Settings.</b>
+</p>
+<ul>
<p class="text">
-<b>Current Supplier DNs.</b> This field lists the supplier bind DNs that supplier servers must use to update this replica. You can now 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.
+<b>Current Supplier DNs.</b> This field lists the supplier bind DNs that supplier servers must use to update this replica. You can now specify multiple supplier bind DNs per replica, but only one supplier DN per replication agreement. Use the "<b>Enter a new Supplier DN</b>" 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 "<b>Enter a new Supplier DN</b>" field and click Add to add it to this list.
</p>
<p class="text">
<b>Current URLs for referrals (Optional).</b> 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.
</p>
+</ul>
Index: configtab_replication8.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_replication8.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configtab_replication8.html 13 Aug 2007 22:28:09 -0000 1.1
+++ configtab_replication8.html 20 Nov 2007 17:35:08 -0000 1.2
@@ -7,9 +7,5 @@
</p>
<p class="text">
-<b>LDIF file (on remote machine). </b>Enter the full path to the LDIF file. Click Browse to locate it on your machine. By default, if you are running the console locally, the file is stored in the current directory.
-</p>
-
-<p class="text">
-When the Browse button is not enabled, by default the file is stored in the <span class="variable">serverRoot<code>/slapd-</code><span class="variable">serverID</span><code>/ldif</code>
+<b>LDIF file. </b>Enter the full path to the LDIF file. Or click <b>Browse</b> to locate it on your machine.
</p>
Index: replication_wizard.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/replication_wizard.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- replication_wizard.html 13 Aug 2007 22:28:09 -0000 1.1
+++ replication_wizard.html 20 Nov 2007 17:35:08 -0000 1.2
@@ -11,13 +11,14 @@
</p>
<p class="text">
-<b>Consumer. </b>Select the consumer server in the replication agreement from this drop-down menu. To ensure that all servers in your deployment appear in this drop-down menu, you must bind as Administrator. If the consumer server you want still does not appear in the list, click Other to enter the host and port of the consumer.
+<b>Consumer. </b>Select the consumer server in the replication agreement from this drop-down menu. To ensure that all servers in your deployment appear in this drop-down menu, you must bind as Administrator. If the consumer server you want still does not appear in the list, click <b>Other</b> button to enter the host and port of the consumer.
</p>
<p class="text">
-<b>Other. </b>Click this button to manually enter the host and port of a consumer server
+<b>Connection</b>
</p>
+<ul>
<p class="text">
<b>Using Encrypted SSL Connection. </b>If you want the supplier and consumer servers to use SSL for secure communication, select this checkbox. To use this option, you must have first configured your servers to use SSL.
</p>
@@ -51,6 +52,7 @@
<p class="text">
<b>Password. </b>If you are not using SSL, or you are using SSL with simple authentication, enter the Supplier DN password in the Password field.
</p>
+</ul>
<p class="text">
<b>Subtree. </b>Identifies the content to be replicated.
Index: replication_wizard4.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/replication_wizard4.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- replication_wizard4.html 13 Aug 2007 22:28:09 -0000 1.1
+++ replication_wizard4.html 20 Nov 2007 17:35:08 -0000 1.2
@@ -7,5 +7,11 @@
</p>
<p class="text">
+<b>Replication agreement wizard. </b>
If you selected "Initialize Consumer Now" in the Initialize Consumer dialog box, the consumer is initialized immediately. Synchronization begins immediately.
</p>
+
+<p class="text">
+<b>Windows Sync Agreement wizard. </b>
+The server creates the synchronization agreement and dismisses the synchronization wizard. Synchronization begins immediately.
+</p>
Index: replication_wizard6.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/replication_wizard6.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- replication_wizard6.html 13 Aug 2007 22:28:09 -0000 1.1
+++ replication_wizard6.html 20 Nov 2007 17:35:08 -0000 1.2
@@ -11,17 +11,17 @@
</p>
<p class="text">
-<b>Add All. </b>If any or all attributes have been moved to the "Excluded" column on the left, selecting this button will move them back to the "Included" column. This button is grayed out unless the "Enable Fractional Replication" checkbox is selected.
+<b>Add All (button). </b>If any or all attributes have been moved to the "Excluded" column on the left, selecting this button will move them back to the "Included" column. This button is grayed out unless the "Enable Fractional Replication" checkbox is selected.
</p>
<p class="text">
-<b>Add ->. </b>This button will move the highlight entry/entries from the "Excluded" column on the left to the "Included" column on the right. This button is grayed out unless the "Enable Fractional Replication" checkbox is selected.
+<b>Add -> (button). </b>This button will move the highlight entry/entries from the "Excluded" column on the left to the "Included" column on the right. This button is grayed out unless the "Enable Fractional Replication" checkbox is selected.
</p>
<p class="text">
-<b><- Remove. </b>This button will move the highlight entry/entries from the "Included" column on the right to the "Excluded" column on the left. This button is grayed out unless the "Enable Fractional Replication" checkbox is selected.
+<b><- Remove (button). </b>This button will move the highlight entry/entries from the "Included" column on the right to the "Excluded" column on the left. This button is grayed out unless the "Enable Fractional Replication" checkbox is selected.
</p>
<p class="text">
-<b>Remove All. </b>This button will move all the attributes from the "Included" column to the "Excluded" column. This button is grayed out unless the "Enable Fractional Replication" checkbox is selected.
+<b>Remove All (button). </b>This button will move all the attributes from the "Included" column to the "Excluded" column. This button is grayed out unless the "Enable Fractional Replication" checkbox is selected.
</p>
Index: synchronization_wizard2.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/synchronization_wizard2.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- synchronization_wizard2.html 13 Aug 2007 22:28:09 -0000 1.1
+++ synchronization_wizard2.html 20 Nov 2007 17:35:08 -0000 1.2
@@ -11,6 +11,11 @@
</p>
<p class="text">
+<b>Windows Domain Information</b>
+</p>
+
+<ul>
+<p class="text">
<b>Windows Domain Name. </b>This is the name of the Windows domain that contains the Windows subtree which you are synchronizing with the Directory Server subtree. For example: <span style="font-family: courier new,courier,monospace;">example.com</span>
</p>
@@ -19,6 +24,10 @@
</p>
<p class="text">
+<b>Sync New Windows Groups. </b>Check this checkbox if you want to add new Windows groups automatically to the Directory Server.
+</p>
+
+<p class="text">
<b>Windows Subtree. </b>This is the Windows subtree which you are synchronizing with the Directory Server subtree. If the subtree which you are synchronizing is <span style="font-family: courier new,courier,monospace;">ou=People</span>, than the Windows subtree is set by default to <span style="font-family: courier new,courier,monospace;">cn=Users</span>, and the remaining information is supplied by the Windows domain information.
</p>
@@ -33,7 +42,13 @@
<p class="text">
<b>Port Num. </b>The Windows domain controller port number. By default, this is 389; this is automatically reset to 636 if you check the "Using encrypted SSL connection" checkbox (even if you had previously set a different value).
</p>
+</ul>
+
+<p class="text">
+<b>Connection</b>
+</p>
+<ul>
<p class="text">
<b>Using Encrypted SSL Connection. </b>If you want the Directory Server and Windows servers to use SSL for secure communication, select this checkbox. To use this option, you must have first configured your servers to use SSL. It is strongly recommended that you use an SSL connection. Passwords will not be synchronized if you do not enable SSL.
</p>
@@ -45,6 +60,7 @@
<p class="text">
<b>Password. </b>Enter the supplier DN password in the Password field.
</p>
+</ul>
<p class="text">
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.
16 years, 5 months
[Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc ESC.js, 1.13, 1.13.4.1
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15660
Modified Files:
Tag: RHPKI_7_3_BRANCH
ESC.js
Log Message:
Add code to read a global phone home pref under strict circumstances. Bug#352991.
Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -u -r1.13 -r1.13.4.1
--- ESC.js 5 Apr 2007 18:39:52 -0000 1.13
+++ ESC.js 19 Nov 2007 19:23:29 -0000 1.13.4.1
@@ -51,6 +51,8 @@
const ESC_FACE_TO_FACE_MODE = "esc.face.to.face.mode";
const ESC_SECURITY_URL="esc.security.url";
const ESC_SECURE_URL="esc.secure.url";
+const ESC_GLOBAL_PHONE_HOME_URL= "esc.global.phone.home.url";
+const SPECIAL_ATR="3B769400FF6276010000";
const CLEAN_TOKEN = "cleanToken";
const UNINITIALIZED = 1;
@@ -280,6 +282,11 @@
return true;
}
+ //Check for special key since we have no phone home info.
+
+
+ home = GetGlobalPhoneHomeUrl(keyType,keyID);
+
var homeRes = false;
@@ -291,8 +298,9 @@
// Launch the config dialog only if we can't
// Phone Home and we are not in the special security mode
+ // or if we are not using a special key
- if(!homeRes && !CheckForSecurityMode())
+ if(!homeRes && !CheckForSecurityMode() )
{
recordMessage("About to launch CONFIG , non secmode...");
@@ -301,6 +309,48 @@
return homeRes;
}
+
+//Get global phone home url only for a special key
+
+function GetGlobalPhoneHomeUrl(keyType,keyID)
+{
+
+ var globalIssuerURL=null;
+ var specialATR=SPECIAL_ATR;
+ var phonHomeURL= DoCoolKeyGetATR(keyType,keyID);
+
+ var specialAppletVerMaj=1;
+ var specialAppletVerMin=1;
+
+
+ var appletVerMaj = DoGetCoolKeyGetAppletVer(keyType, keyID , true);
+ var appletVerMin = DoGetCoolKeyGetAppletVer(keyType, keyID, false);
+
+ if( (appletVerMaj != specialAppletVerMaj) ||
+ ( appletVerMin != specialAppletVerMin)) {
+
+ return null;
+ }
+
+ var keyATR = DoCoolKeyGetATR(keyType,keyID);
+
+ if( keyATR != specialATR) {
+
+ return null;
+
+ }
+
+ globalIssuerURL = DoCoolKeyGetConfigValue(ESC_GLOBAL_PHONE_HOME_URL);
+
+ if(globalIssuerURL==null) {
+ return null;
+ }
+
+ return globalIssuerURL;
+
+}
+
+
//Test Phone Home url in config UI
function DoPhoneHomeTest()
16 years, 5 months