[Fedora-directory-commits] ldapserver/ldap/servers/plugins/cos cos_cache.c, 1.11, 1.12
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/cos
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4361
Modified Files:
cos_cache.c
Log Message:
Resolves: bug 486495
Description: CoS operational qualifier doesn't work
Reviewed by: rmeggins
Fix Description: If not using the default, the processing for that case was skipped due to the incorrect if test for pDefAttr. The fix is to move the test for pDefAttr into the lower condition, to make sure it is value before dereferencing it to check for attr_operational or attr_operational_default. The attr_operational || attr_operational_default test has been moved into the using_default && pDefAttr condition, and into the !using_default && pCache condition for the non default case. Parentheses have been added for readability.
Index: cos_cache.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/cos/cos_cache.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cos_cache.c 16 Feb 2009 17:26:57 -0000 1.11
+++ cos_cache.c 26 Feb 2009 22:38:57 -0000 1.12
@@ -2517,12 +2517,13 @@
if(props)
*props = 0;
- if(hit == 1 && props && pDefAttr) {
+ if(hit == 1 && props) {
if (
- ((using_default && pDefAttr->attr_operational == 1) ||
- (!using_default && pCache->ppAttrIndex[attr_matched_index]->attr_operational == 1)) ||
- ((using_default && pDefAttr->attr_operational_default == 1) ||
- (!using_default && pCache->ppAttrIndex[attr_matched_index]->attr_operational_default == 1)) )
+ (using_default && pDefAttr &&
+ ((pDefAttr->attr_operational == 1) || (pDefAttr->attr_operational_default == 1))) ||
+ (!using_default && pCache && pCache->ppAttrIndex && pCache->ppAttrIndex[attr_matched_index] &&
+ ((pCache->ppAttrIndex[attr_matched_index]->attr_operational == 1) ||
+ (pCache->ppAttrIndex[attr_matched_index]->attr_operational_default == 1))))
{
/* this is an operational attribute, lets mark it so */
*props |= SLAPI_ATTR_FLAG_OPATTR;
15 years, 1 month
[Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc escCertManager.js, NONE, 1.1
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3048
Added Files:
escCertManager.js
Log Message:
Security Officer UI changes, #445274.
--- NEW FILE escCertManager.js ---
/** BEGIN COPYRIGHT BLOCK
* This Program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation; version 2 of the License.
*
* This Program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
const MY_CERTS_INDEX = 0;
function CertsTabsSelected()
{
var tabs = document.getElementById("certMgrTabbox");
if( !tabs)
return;
var value = tabs.selectedIndex;
var importBtn = document.getElementById("mine_restoreButton");
var deleteBtn = document.getElementById("mine_deleteButton");
if(value == MY_CERTS_INDEX) {
if(importBtn) {
importBtn.setAttribute("hidden","true");
}
if(deleteBtn) {
deleteBtn.setAttribute("hidden","true");
}
} else {
if(importBtn) {
importBtn.setAttribute("hidden","false");
}
if(deleteBtn) {
deleteBtn.setAttribute("hidden","false");
}
}
}
15 years, 1 month
[Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc ESC.js, 1.18, 1.19 GenericAuth.xul, 1.4, 1.5 MineOverlay.xul, 1.2, 1.3 certManager.xul, 1.2, 1.3 esc.css, 1.5, 1.6
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2324
Modified Files:
ESC.js GenericAuth.xul MineOverlay.xul certManager.xul esc.css
Log Message:
Security Officer UI changes, #445274.
Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ESC.js 4 Feb 2009 01:43:47 -0000 1.18
+++ ESC.js 26 Feb 2009 22:34:42 -0000 1.19
@@ -506,6 +506,9 @@
function GetAuthDataFromPopUp(aKeyType,aKeyID,aUiData)
{
+ if(!gAdminPage)
+ return;
+
keyUITable[aKeyID] = aUiData;
keyTypeTable[aKeyID] = aKeyType;
@@ -2227,7 +2230,7 @@
if(!keyStatus)
{
- DisableItem(viewcertsbtn);
+ EnableItem(viewcertsbtn);
DisableItem(enrollbtn);
if(adminkeymenu)
{
@@ -2293,7 +2296,7 @@
if(keyStatus == getBundleString("statusUninitialized"))
{
- DisableItem(viewcertsbtn);
+ EnableItem(viewcertsbtn);
if(isCool)
{
@@ -2335,7 +2338,7 @@
if(keyStatus == getBundleString("statusNoApplet"))
{
- DisableItem(viewcertsbtn);
+ EnableItem(viewcertsbtn);
DisableItem(enrollbtn);
DisableItem(resetpinbtn);
Index: GenericAuth.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/GenericAuth.xul,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GenericAuth.xul 7 May 2007 23:49:23 -0000 1.4
+++ GenericAuth.xul 26 Feb 2009 22:34:43 -0000 1.5
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="esc.css" type="text/css"?>
<!-- ***** BEGIN COPYRIGHT BLOCK *****
* This Program is free software; you can redistribute it and/or modify it under
@@ -20,8 +21,10 @@
<!DOCTYPE window SYSTEM "chrome://esc/locale/esc.dtd">
<window
class="escwindow"
- id="esc-auth-window"
+ id="esc-window"
title="&genericAuthTitle;"
+ width="400"
+ height="225"
onload="UiLoad();"
onunload="UiUnload();"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -29,8 +32,8 @@
<stringbundle id="esc_strings" src="chrome://esc/locale/esc.properties"/>
<script src="GenericAuth.js"/>
- <grid >
- <rows >
+<grid>
+ <rows>
<row>
<image id="logoImage"/>
Index: MineOverlay.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/MineOverlay.xul,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MineOverlay.xul 4 Feb 2009 01:43:47 -0000 1.2
+++ MineOverlay.xul 26 Feb 2009 22:34:43 -0000 1.3
@@ -95,15 +95,15 @@
label="&certmgr.backupall2.label;"
accesskey="&certmgr.backupall2.accesskey;"
oncommand="backupAllCerts();"/>
- <button id="mine_restoreButton" class="normal"
+-->
+ <button id="mine_restoreButton" class="normal" hidden="true"
label="&certmgr.restore2.label;"
accesskey="&certmgr.restore2.accesskey;"
oncommand="restoreCerts();"/>
- <button id="mine_deleteButton" class="normal"
+ <button id="mine_deleteButton" class="normal" hidden="true"
label="&certmgr.delete2.label;"
accesskey="&certmgr.delete2.accesskey;"
disabled="true" oncommand="deleteCerts();"/>
--->
</hbox>
</vbox>
</overlay>
Index: certManager.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/certManager.xul,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- certManager.xul 4 Feb 2009 01:43:47 -0000 1.2
+++ certManager.xul 26 Feb 2009 22:34:43 -0000 1.3
@@ -62,12 +62,12 @@
<script type="application/x-javascript" src="escCertManager.js"/>
<vbox flex="1">
- <tabbox id="certmanagertabs" flex="1" style="margin:5px" persist="selectedIndex">
- <tabs id="certMgrTabbox">
+ <tabbox id="certmanagertabs" flex="1" style="margin:5px">
+ <tabs id="certMgrTabbox" onselect="CertsTabsSelected();">
<tab id="mine_tab" label="&certmgr.tab.mine;" selected="true"/>
<tab id="others_tab" hidden="true" label="&certmgr.tab.others2;"/>
<tab id="websites_tab" hidden="true" label="&certmgr.tab.websites3;"/>
- <tab id="ca_tab" hidden="true" label="&certmgr.tab.ca;"/>
+ <tab id="ca_tab" hidden="false" label="&certmgr.tab.ca;"/>
<tab id="orphan_tab" hidden="true" label="&certmgr.tab.orphan2;"/>
</tabs>
Index: esc.css
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/esc.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- esc.css 7 May 2007 23:49:23 -0000 1.5
+++ esc.css 26 Feb 2009 22:34:43 -0000 1.6
@@ -26,7 +26,7 @@
}
.escwindow {
-background: #ffffff url(bg.jpg) repeat-x;
+/*background: #ffffff url(bg.jpg) repeat-x; */
font-family: arial;
font-size: 17pt;
15 years, 1 month
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/dna dna.c, 1.16, 1.17
by Nathan Kinder
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/dna
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9289/ldap/servers/plugins/dna
Modified Files:
dna.c
Log Message:
Resolves: bug 487574
Bug Description: A crash occurs in the DNA plug-in when you delete an existing
value of a managed attribute.
Reviewed by: rmeggins (thanks!)
Files: see diff
Branch: HEAD
Fix Description: The DNA code was always expecting a value to be present when
processing a modify operation. The delete and replace modify operations can
be issues with no values. These operations were an oversight in the DNA code.
The fix adds cases to handle delete and replace modify operations. For a replace,
we check if we are replacing all values with nothing, and generate a new value from
the range. If we're processing a delete with no values specified, we also generate
a new value. If the delete has values specified, we check to see if the operation
leaves any values in the existing entry. If no existing values would remain after
the operation, we generate a new value.
Platforms tested: F9
Flag Day: no
Doc impact: no
Index: dna.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/dna/dna.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dna.c 5 Dec 2008 22:41:50 -0000 1.16
+++ dna.c 26 Feb 2009 21:41:15 -0000 1.17
@@ -2628,18 +2628,44 @@
if (slapi_attr_types_equivalent(type,
config_entry->type)) {
- struct berval *bv =
- slapi_mod_get_first_value(smod);
- int len = strlen(config_entry->generate);
-
-
- if (len == bv->bv_len) {
- if (!slapi_UTF8NCASECMP(bv->bv_val,
- config_entry->generate,
- len))
+ /* If all values are being deleted, we need to
+ * generate a new value. */
+ if (SLAPI_IS_MOD_DELETE(slapi_mod_get_operation(smod))) {
+ int numvals = slapi_mod_get_num_values(smod);
+ if (numvals == 0) {
+ generate = 1;
+ } else {
+ Slapi_Attr *attr = NULL;
+ int e_numvals = 0;
+
+ slapi_entry_attr_find(e, type, &attr);
+ if (attr) {
+ slapi_attr_get_numvalues(attr, &e_numvals);
+ if (numvals >= e_numvals) {
+ generate = 1;
+ }
+ }
+ }
+ } else {
+ /* This is either adding or replacing a value */
+ struct berval *bv = slapi_mod_get_first_value(smod);
+
+ /* If we have a value, see if it's the magic value. */
+ if (bv) {
+ int len = strlen(config_entry->generate);
+ if (len == bv->bv_len) {
+ if (!slapi_UTF8NCASECMP(bv->bv_val,
+ config_entry->generate,
+ len))
+ generate = 1;
+ break;
+ }
+ } else {
+ /* This is a replace with no new values, so we need
+ * to generate a new value. */
generate = 1;
- break;
+ }
}
}
15 years, 1 month
[Fedora-directory-commits] directoryconsole/help/en/help configtab_replication3.html, 1.2, 1.3
by Noriko Hosoi
Author: nhosoi
Update of /cvs/dirsec/directoryconsole/help/en/help
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30125
Modified Files:
configtab_replication3.html
Log Message:
Resolves: 178947
Summary: Replica UI "Replica ID" setting tool tip is incorrect (max val is really 65534)
Description: fixed online help
Index: configtab_replication3.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_replication3.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configtab_replication3.html 20 Nov 2007 17:35:08 -0000 1.2
+++ configtab_replication3.html 26 Feb 2009 17:49:06 -0000 1.3
@@ -38,7 +38,7 @@
<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>Replica ID. </b>An integer between 1 and 65534 that identifies the replica. The replica IDs of the master replicas must be unique. In other words, master replicas involved in the same multi-master configuration must have different replica IDs. However, two master replicas (corresponding to different suffixes) on the same server can have the same replica ID.
</p>
<p class="text">
15 years, 1 month
[Fedora-directory-commits] esc/mac/coolkey_package_data/Resources License.txt, 1.1, 1.2
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/mac/coolkey_package_data/Resources
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13101
Modified Files:
License.txt
Log Message:
Give the mac the right license, Bug#236641.
Index: License.txt
===================================================================
RCS file: /cvs/dirsec/esc/mac/coolkey_package_data/Resources/License.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- License.txt 2 Aug 2007 18:22:20 -0000 1.1
+++ License.txt 26 Feb 2009 02:04:01 -0000 1.2
@@ -1,211 +1,222 @@
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- END USER LICENSE AGREEMENT
- RED HAT(R) DIRECTORY SERVER AND
- RED HAT(R) CERTIFICATE SYSTEM
-
-This end user license agreement ("EULA") governs the use of
-Red Hat Directory Server (which uses Administration Server
-and Red Hat Management Console) and Red Hat Certificate
-System (which uses Enterprise Security Client and Auto
-Enrollment Proxy) and any related updates to source code,
-appearance, structure and organization (each, a "Program")
-regardless of the delivery mechanism.
-
-1. Red Hat Directory Server, Enterprise Security Client and
-Auto Enrollment Proxy
-
-1.1 License Grant. Red Hat Directory Server ("RHDS"),
-Enterprise Security Client ("ESC") and Auto Enrollment Proxy
-("AEP")are modular applications consisting of hundreds of
-software components and are collective works under U.S.
-Copyright Law. Subject to the following terms, Red Hat,
-Inc. ("Red Hat") grants to you ('User") a perpetual,
-worldwide license to RHDS, ESC and AEP pursuant to the GNU
-General Public License v.2 ("GPL"). Please note that
-Administration Server and Red Hat Management Console, which
-are binary-only code used to configure and administer RHDS,
-are subject to the license terms in Section 2. The end user
-license agreement for each component of RHDS, ESC and AEP
-are located in the component's source code. With the
-exception of certain image files identified in Section 1.3
-below, the license terms for the components permit User to
-copy, modify, and redistribute the component, in both source
-code and binary code forms. This EULA does not limit User's
-rights under, or grant User rights that supersede, the
-license terms of any particular component.
-
-1.2 License Exception. In addition, as a special
-exception, Red Hat gives User the additional right to link
-the code of RHDS with code not covered under the GPL
-("Non-GPL Code") and to distribute linked combinations
-including the two, subject to the limitations in this
-paragraph. Non-GPL Code permitted under this exception must
-only link to the code of RHDS through those well defined
-interfaces identified in that file named EXCEPTION in the
-source code files for RHDS (the "Approved Interfaces"). The
-files of Non-GPL Code may instantiate templates or use
-macros or inline functions from the Approved Interfaces
-without causing the resulting work to be covered by the GPL.
-Only Red Hat may make changes or additions to the list of
-Approved Interfaces. User must comply with the GPL in all
-respects for all of the RHDS code and other code used in
-conjunction with RHDS except the Non-GPL Code covered by
-this exception. If User modifies RHDS, User may extend this
-exception to its version of RHDS, but User is not obligated
-to do so. If User does not wish to provide this exception
-without modification, User must delete this exception
-statement from User's version of RHDS and license RHDS
-solely under the GPL without exception.
-
-1.3 Intellectual Property Rights. RHDS, ESC, AEP and each
-of their components, including the source code,
-documentation, appearance, structure and organization are
-owned by Red Hat and others and are protected under
-copyright and other laws. Title to RHDS, ESC, AEP and any
-component, or to any copy, modification, or merged portion
-shall remain with the aforementioned, subject to the
-applicable license. The "Red Hat" trademark and the
-"Shadowman" logo are registered trademarks of Red Hat in the
-U.S. and other countries. This EULA does not permit User to
-distribute RHDS, ESC or AEP using Red Hat's trademarks.
-User should read the information found at
-http://www.redhat.com/about/corporate/trademark/ before
-distributing a copy of these Programs, regardless of whether
-they have been modified. User may make a commercial
-redistribution of RHDS, ESC or AEP only if (a) a separate
-agreement with Red Hat authorizing such commercial
-redistribution is executed or other written permission is
-granted by Red Hat or (b) User modifies any files identified
-as "REDHAT-LOGOS" to remove and replace all images
-containing the "Red Hat" trademark or the "Shadowman" logo.
-Merely deleting these files may corrupt the Programs.
-
-2. Red Hat Certificate System, Administration Server, and
-Red Hat Management Console
-
-2.1 License Grant. Subject to the provisions of this
-Section 2.1, Red Hat hereby grants User a non-exclusive,
-non-transferable, worldwide, perpetual, fully paid right
-(without the right to sublicense) to use, reproduce and
-distribute Red Hat Certificate System ("RHCS"),
-Administration Server ("Admin Server"), and Red Hat
-Management Console ("Console") in executable,
-machine-readable form. User must reproduce all copyright
-and other proprietary notices on such copies. User may only
-reproduce and distribute RHCS, Admin Server or Console to
-another party if the other party agrees in writing to be
-obligated by the terms and conditions of this Section 2.1.
-Except as provided in this Section 2.1, User may not modify,
-copy, transfer or otherwise use RHCS, Admin Server, or
-Console, and all licenses granted hereunder are
-automatically terminated if User does so.
-
-2.2 Change in Licensing. It is Red Hat's intent to change
-the terms of the license granted under this Section 2 to
-those of an open source license. If such change is
-generally announced to the public, User will have the option
-to elect to have RHCS, Admin Server and Console be governed
-by the terms of such open source license. If User does not
-make such election, the terms of this Agreement will
-continue to govern User's use of the RHCS, Admin Server and
-Console.
-
-3. Limited Warranty. Except as specifically stated in this
-Section 3, a separate agreement with Red Hat, or a license
-for a particular component, to the maximum extent permitted
-under applicable law, the Programs and the components are
-provided and licensed "as is" without warranty of any kind,
-expressed or implied, including the implied warranties of
-merchantability, non-infringement or fitness for a
-particular purpose. Red Hat warrants that the media on
-which the Programs and the components are furnished will be
-free from defects in materials and manufacture under normal
-use for a period of thirty (30) days from the date of
-delivery to User. Red Hat does not warrant that the
-functions contained in the Programs will meet User's
-requirements or that the operation of the Programs will be
-entirely error free, appear precisely as described in the
-accompanying documentation, or comply with regulatory
-requirements. This warranty extends only to the party that
-purchases services pertaining to the Programs from Red Hat
-or a Red Hat authorized distributor.
-
-4. Limitation of Remedies and Liability. To the maximum
-extent permitted by applicable law, User's exclusive remedy
-under this EULA is to return any defective media within
-thirty (30) days of delivery along with a copy of User's
-payment receipt and Red Hat, at its option, will replace it
-or refund the money paid by User for the media. To the
-maximum extent permitted under applicable law, neither Red
-Hat, any Red Hat authorized distributor, nor the licensor of
-any component provided to User under the EULA will be liable
-to User for any incidental or consequential damages,
-including lost profits or lost savings arising out of the
-use or inability to use the Programs or any component, even
-if Red Hat, such authorized distributor or licensor has been
-advised of the possibility of such damages. In no event
-shall Red Hat's liability, an authorized distributor's
-liability or the liability of the licensor of a component
-provided to User under this EULA exceed the amount that User
-paid to Red Hat under this EULA during the twelve (12)
-months preceding the action.
-
-5. Export Control. As required by the laws of the United
-States and other countries, User represents and warrants
-that it: (a) understands that the Programs and their
-components may be subject to export controls under the U.S.
-Commerce Department's Export Administration Regulations
-("EAR"); (b) is not located in a prohibited destination
-country under the EAR or U.S. sanctions regulations
-(currently Cuba, Iran, Iraq, North Korea, Sudan and Syria,
-subject to change as posted by the United States
-government); (c) will not export, re-export, or transfer the
-Programs to any prohibited destination or persons or
-entities on the U.S. Bureau of Industry and Security Denied
-Parties List or Entity List, or the U.S. Office of Foreign
-Assets Control list of Specially Designated Nationals and
-Blocked Persons, or any similar lists maintained by other
-countries, without the necessary export license(s) or
-authorization(s); (d) will not use or transfer the Programs
-for use in connection with any nuclear, chemical or
-biological weapons, missile technology, or military end-uses
-where prohibited by an applicable arms embargo, unless
-authorized by the relevant government agency by regulation
-or specific license; (e) understands and agrees that if it
-is in the United States and exports or transfers the
-Programs to eligible end users, it will, to the extent
-required by EAR Section 740.17(e), submit semi-annual
-reports to the Commerce Department's Bureau of Industry and
-Security , which include the name and address (including
-country) of each transferee; and (f) understands that
-countries including the United States may restrict the
-import, use, or export of encryption products (which may
-include the Programs and the components) and agrees that it
-shall be solely responsible for compliance with any such
-import, use, or export restrictions.
-
-6. Third Party Programs. Red Hat may distribute third party
-software programs with the Programs that are not part of the
-Programs. These third party programs are not required to
-run the Programs, are provided as a convenience to User, and
-are subject to their own license terms. The license terms
-either accompany the third party software programs or can be
-viewed at
-http://www.redhat.com/licenses/thirdparty/eula.html. If
-User does not agree to abide by the applicable license terms
-for the third party software programs, then User may not
-install them. If User wishes to install the third party
-software programs on more than one system or transfer the
-third party software programs to another party, then User
-must contact the licensor of the applicable third party
-software programs.
-
-7. General. If any provision of this agreement is held to
-be unenforceable, that shall not affect the enforceability
-of the remaining provisions. This agreement shall be
-governed by the laws of the State of New York and of the
-United States, without regard to any conflict of laws
-provisions. The rights and obligations of the parties to
-this EULA shall not be governed by the United Nations
-Convention on the International Sale of Goods.
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+ END OF TERMS AND CONDITIONS
15 years, 1 month
[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts Inf.pm, 1.5, 1.6 Migration.pm.in, 1.8, 1.9 Setup.pm.in, 1.12, 1.13
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16618/ldapserver/ldap/admin/src/scripts
Modified Files:
Inf.pm Migration.pm.in Setup.pm.in
Log Message:
Resolves: bug 486474
Bug Description: overriding arguments to setup causes setup to fail
Reviewed by: ulf.weltman, nkinder (Thanks!)
Fix Description: Parameters specified on the command line should override and replace (not add to) any parameters specified in a given .inf file. I refactored the code a little too - I moved the argv processing into the Inf module out of the Setup and Migration modules. The code will first process the args and store the values in a temporary hash ref. Then it will process the temp hash ref, replacing the values in the main inf with the values from the hash.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: Inf.pm
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Inf.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Inf.pm 7 Sep 2007 15:02:25 -0000 1.5
+++ Inf.pm 24 Feb 2009 16:57:45 -0000 1.6
@@ -192,6 +192,60 @@
close INF;
}
+sub updateFromArgs {
+ my $self = shift;
+ my $argsinf = {}; # tmp for args read in
+
+ if (!@_) {
+ return 1; # no args - just return
+ }
+
+ # read args into temp inf
+ for (@_) {
+ if (/^([\w_-]+)\.([\w_-]+)=(.*)$/) { # e.g. section.param=value
+ my $sec = $1;
+ my $parm = $2;
+ my $val = $3;
+ # a single value is just a single scalar
+ # multiple values are represented by an array ref
+ if (exists($argsinf->{$sec}->{$parm})) {
+ if (!ref($argsinf->{$sec}->{$parm})) {
+ # convert single scalar to array ref
+ my $ary = [$argsinf->{$sec}->{$parm}];
+ $argsinf->{$sec}->{$parm} = $ary;
+ }
+ # just push the new value
+ push @{$argsinf->{$sec}->{$parm}}, $val;
+ } else {
+ # single value
+ $argsinf->{$sec}->{$parm} = $val;
+ }
+ } else { # error
+ print STDERR "Error: unknown command line option $_\n";
+ return;
+ }
+ }
+
+ # no args read - just return true
+ if (!$argsinf || !%{$argsinf}) {
+ return 1;
+ }
+
+ # override inf with vals read from args
+ while (my ($name, $sec) = each %{$argsinf}) {
+ if (ref($sec) eq 'HASH') {
+ for my $key (keys %{$sec}) {
+ if (defined($sec->{$key})) {
+ my $val = $sec->{$key};
+ $self->{$name}->{$key} = $val;
+ }
+ }
+ }
+ }
+
+ return 1;
+}
+
#############################################################################
# Mandatory TRUE return value.
#
Index: Migration.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Migration.pm.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Migration.pm.in 10 Oct 2007 23:49:37 -0000 1.8
+++ Migration.pm.in 24 Feb 2009 16:57:45 -0000 1.9
@@ -232,14 +232,9 @@
# see if user passed in default inf values - also, command line
# arguments override those passed in via an inf file - this
# allows the reuse of .inf files with some parameters overridden
- for (@ARGV) {
- if (/^([\w_-]+)\.([\w_-]+)=(.*)$/) { # e.g. section.param=value
- $self->{inf}->{$1}->{$2} = $3;
- } else { # error
- print STDERR "Error: unknown command line option $_\n";
- usage();
- exit 1;
- }
+ if (!$self->{inf}->updateFromArgs(@ARGV)) {
+ HelpMessage();
+ exit 1;
}
# this is the base config directory - the directory containing
Index: Setup.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Setup.pm.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Setup.pm.in 17 Dec 2008 18:28:04 -0000 1.12
+++ Setup.pm.in 24 Feb 2009 16:57:45 -0000 1.13
@@ -161,30 +161,9 @@
# see if user passed in default inf values - also, command line
# arguments override those passed in via an inf file - this
# allows the reuse of .inf files with some parameters overridden
- for (@ARGV) {
- if (/^([\w_-]+)\.([\w_-]+)=(.*)$/) { # e.g. section.param=value
- my $sec = $1;
- my $parm = $2;
- my $val = $3;
- # a single value is just a single scalar
- # multiple values are represented by an array ref
- if (exists($self->{inf}->{$sec}->{$parm})) {
- if (!ref($self->{inf}->{$sec}->{$parm})) {
- # convert single scalar to array ref
- my $ary = [$self->{inf}->{$sec}->{$parm}];
- $self->{inf}->{$sec}->{$parm} = $ary;
- }
- # just push the new value
- push @{$self->{inf}->{$sec}->{$parm}}, $val;
- } else {
- # single value
- $self->{inf}->{$sec}->{$parm} = $val;
- }
- } else { # error
- print STDERR "Error: unknown command line option $_\n";
- HelpMessage();
- exit 1;
- }
+ if (!$self->{inf}->updateFromArgs(@ARGV)) {
+ HelpMessage();
+ exit 1;
}
# this is the base config directory - the directory containing
15 years, 1 month
[Fedora-directory-commits] adminserver/admserv/schema/ldif 02globalpreferences.ldif.tmpl, 1.5, 1.6 10dsdata.ldif.tmpl, 1.10, 1.11 11dstasks.ldif.tmpl, 1.5, 1.6 20asdata.ldif.tmpl, 1.7, 1.8 21astasks.ldif.tmpl, 1.4, 1.5 22ascommands.ldif.tmpl, 1.2, 1.3
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/schema/ldif
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2070/adminserver/admserv/schema/ldif
Modified Files:
02globalpreferences.ldif.tmpl 10dsdata.ldif.tmpl
11dstasks.ldif.tmpl 20asdata.ldif.tmpl 21astasks.ldif.tmpl
22ascommands.ldif.tmpl
Log Message:
Resolves: bug 468474
Bug Description: migration results in incomplete admin server sie
Reviewed by: nkinder (Thanks!)
Fix Description: This is a redesign of one of the core pieces of the setup/migration code - the code that adds the LDAP entries in various places. For starters, I removed the code that would implicitly delete existing trees. This is the root cause of this bug, and other similar problems with setup/instance creation that have been reported. We should never implicitly delete entries. Instead, we should explicitly delete entries by using the changetype: delete in an LDIF template file.
Another source of problems was that to update an entry, we would delete it and add it back. This caused some configuration settings to be wiped out (e.g. encryption settings). We cannot do this any more. The LDIF template entries have been modified to have two sets of information for each entry that requires update - the entry to add if no entry exists (the full entry) or the changes to make to the entry if it does exist. The code in Util.pm has been changed to ignore duplicate entries and to ignore changes made to entries that do not exist.
Another source of problems with migration is that the error checking was not adequate, especially with FileConn and dse.ldif reading. The fix is to add better error checking and reporting in these areas of code, including error messages.
Yet another problem is the run_dir handling. On many platforms the run_dir is shared among all DS instances and the admin server. Older versions of the software allowed you to run the servers as root. We have to make sure run_dir is usable by the least privileged user of all of the servers.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: 02globalpreferences.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/02globalpreferences.ldif.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 02globalpreferences.ldif.tmpl 10 Aug 2007 02:23:29 -0000 1.5
+++ 02globalpreferences.ldif.tmpl 24 Feb 2009 14:25:42 -0000 1.6
@@ -39,6 +39,13 @@
nsmerge: ADD_IF_EMPTY
dn: cn=nsroledefinition, cn=ResourceEditorExtension, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+changetype: modify
+replace: nsClassname
+nsClassname: com.netscape.admin.dirserv.roledit.ResEditorRoleInfo@%ds_console_jar%
+nsClassname: com.netscape.admin.dirserv.roledit.ResEditorRoleMembers@%ds_console_jar%
+nsClassname: com.netscape.admin.dirserv.roledit.ResEditorRoleAccountPage@%ds_console_jar%
+
+dn: cn=nsroledefinition, cn=ResourceEditorExtension, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
cn: nsroledefinition
objectClass: top
objectClass: extensibleObject
@@ -51,6 +58,13 @@
nsmerge: {nsclassname}MULTI_MERGE
dn: cn=cossuperdefinition, cn=ResourceEditorExtension, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+changetype: modify
+replace: nsClassname
+nsClassname: com.netscape.admin.dirserv.cosedit.ResEditorCosInfo@%ds_console_jar%
+nsClassname: com.netscape.admin.dirserv.cosedit.ResEditorCosAttributes@%ds_console_jar%
+nsClassname: com.netscape.admin.dirserv.cosedit.ResEditorCosTemplate@%ds_console_jar%
+
+dn: cn=cossuperdefinition, cn=ResourceEditorExtension, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
cn: cossuperdefinition
objectClass: top
objectClass: extensibleObject
Index: 10dsdata.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/10dsdata.ldif.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- 10dsdata.ldif.tmpl 14 Jul 2008 18:43:02 -0000 1.10
+++ 10dsdata.ldif.tmpl 24 Feb 2009 14:25:42 -0000 1.11
@@ -23,6 +23,13 @@
aci: (targetattr = "*")(version 3.0; acl "SIE Group (%dsid%)"; allow (all) groupdn = "ldap:///cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
dn: cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+changetype: modify
+replace: nsOsVersion
+replace: nsHardwarePlatform
+nsOsVersion: %uname_a%
+nsHardwarePlatform: %uname_m%
+
+dn: cn=%fqdn%, ou=%domain%, o=NetscapeRoot
objectClass: top
objectClass: nsHost
objectClass: groupOfUniqueNames
@@ -33,6 +40,11 @@
uniqueMember: cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
dn: cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+changetype: modify
+add: uniqueMember
+uniqueMember: cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+
+dn: cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
objectClass: nsAdminGroup
objectClass: groupOfUniqueNames
objectClass: nsDirectoryInfo
@@ -44,6 +56,17 @@
aci: (targetattr=*)(targetfilter=(nsconfigRoot=*))(version 3.0; acl "Enable delegated access"; allow (read, search, compare) groupdn="ldap:///cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
dn: cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+changetype: modify
+replace: nsProductVersion
+replace: nsBuildNumber
+replace: nsServerMigrationClassname
+replace: nsServerCreationClassname
+nsProductVersion: %ds_version%
+nsBuildNumber: %ds_buildnum%
+nsServerMigrationClassname: com.netscape.admin.dirserv.task.MigrateCreate@%ds_console_jar%@cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+nsServerCreationClassname: com.netscape.admin.dirserv.task.MigrateCreate@%ds_console_jar%@cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+
+dn: cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
objectClass: nsApplication
objectClass: groupOfUniqueNames
objectClass: top
@@ -60,11 +83,6 @@
nsServerMigrationClassname: com.netscape.admin.dirserv.task.MigrateCreate@%ds_console_jar%@cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
nsServerCreationClassname: com.netscape.admin.dirserv.task.MigrateCreate@%ds_console_jar%@cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
-dn: cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
-changetype: modify
-add: uniqueMember
-uniqueMember: cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
-
dn: cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
objectClass: netscapeServer
objectClass: nsDirectoryServer
@@ -89,6 +107,18 @@
aci: (targetattr=*)(version 3.0; acl "Enable delegated access"; allow (read, search, compare) groupdn="ldap:///cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
aci: (targetattr="uniquemember || serverProductName || userpassword || description")(targetfilter=(objectclass=netscapeServer))(version 3.0; acl "Enable access delegation"; allow (write) groupdn="ldap:///cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
+dn: cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+changetype: modify
+replace: serverVersionNumber
+serverVersionNumber: %ds_version%
+
+dn: cn=configuration,cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+changetype: modify
+replace: nsClassname
+replace: nsJarfilename
+nsClassname: com.netscape.admin.dirserv.DSAdmin@%ds_console_jar%@cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+nsJarfilename: %ds_console_jar%
+
dn: cn=configuration,cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
objectClass: nsResourceRef
objectClass: nsAdminObject
Index: 11dstasks.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/11dstasks.ldif.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 11dstasks.ldif.tmpl 14 Nov 2007 17:51:55 -0000 1.5
+++ 11dstasks.ldif.tmpl 24 Feb 2009 14:25:43 -0000 1.6
@@ -28,6 +28,12 @@
nsTaskLabel: Operation Tasks Group
cn: Operation
+# change description so that it always lists the correct tasks
+dn: cn=task summary, cn=Operation, cn=Tasks, %ds_sie%
+changetype: modify
+replace: description
+description: start stop restart Backup Restore KeyCert Authenticate CompleteImport CompleteExport
+
dn: cn=task summary, cn=Operation, cn=Tasks, %ds_sie%
objectClass: top
objectClass: nsConfig
@@ -35,6 +41,11 @@
cn: task summary
dn: cn=start, cn=Operation, cn=Tasks, %ds_sie%
+changetype: modify
+replace: nsClassname
+nsClassname: com.netscape.admin.dirserv.task.Start@%ds_console_jar%@%as_sie%
+
+dn: cn=start, cn=Operation, cn=Tasks, %ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -43,6 +54,11 @@
cn: start
dn: cn=stop, cn=Operation, cn=Tasks, %ds_sie%
+changetype: modify
+replace: nsClassname
+nsClassname: com.netscape.admin.dirserv.task.Stop@%ds_console_jar%@%as_sie%
+
+dn: cn=stop, cn=Operation, cn=Tasks, %ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -51,6 +67,11 @@
cn: stop
dn: cn=restart, cn=Operation, cn=Tasks, %ds_sie%
+changetype: modify
+replace: nsClassname
+nsClassname: com.netscape.admin.dirserv.task.Restart@%ds_console_jar%@%as_sie%
+
+dn: cn=restart, cn=Operation, cn=Tasks, %ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -59,6 +80,11 @@
cn: restart
dn: cn=Backup, cn=operation, cn=Tasks, %ds_sie%
+changetype: modify
+replace: nsClassname
+nsClassname: com.netscape.admin.dirserv.task.Backup@%ds_console_jar%@%as_sie%
+
+dn: cn=Backup, cn=operation, cn=Tasks, %ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -66,6 +92,11 @@
cn: Backup
dn: cn=Restore, cn=operation, cn=Tasks, %ds_sie%
+changetype: modify
+replace: nsClassname
+nsClassname: com.netscape.admin.dirserv.task.Restore@%ds_console_jar%@%as_sie%
+
+dn: cn=Restore, cn=operation, cn=Tasks, %ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -73,6 +104,11 @@
cn: Restore
dn: cn=KeyCert, cn=operation, cn=Tasks, %ds_sie%
+changetype: modify
+replace: nsClassname
+nsClassname: com.netscape.admin.dirserv.task.KeyCert@%ds_console_jar%@%as_sie%
+
+dn: cn=KeyCert, cn=operation, cn=Tasks, %ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -80,6 +116,11 @@
cn: KeyCert
dn: cn=Authenticate, cn=operation, cn=Tasks, %ds_sie%
+changetype: modify
+replace: nsClassname
+nsClassname: com.netscape.admin.dirserv.task.Authenticate@%ds_console_jar%@%as_sie%
+
+dn: cn=Authenticate, cn=operation, cn=Tasks, %ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -87,6 +128,11 @@
cn: Authenticate
dn: cn=CompleteImport, cn=operation, cn=Tasks, %ds_sie%
+changetype: modify
+replace: nsClassname
+nsClassname: com.netscape.admin.dirserv.task.CompleteImport@%ds_console_jar%@%as_sie%
+
+dn: cn=CompleteImport, cn=operation, cn=Tasks, %ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -94,6 +140,11 @@
cn: CompleteImport
dn: cn=CompleteExport, cn=operation, cn=Tasks, %ds_sie%
+changetype: modify
+replace: nsClassname
+nsClassname: com.netscape.admin.dirserv.task.CompleteExport@%ds_console_jar%@%as_sie%
+
+dn: cn=CompleteExport, cn=operation, cn=Tasks, %ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
Index: 20asdata.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/20asdata.ldif.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 20asdata.ldif.tmpl 28 Jan 2009 21:25:59 -0000 1.7
+++ 20asdata.ldif.tmpl 24 Feb 2009 14:25:43 -0000 1.8
@@ -18,6 +18,13 @@
#
# END COPYRIGHT BLOCK
dn: cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+changetype: modify
+replace: nsOsVersion
+replace: nsHardwarePlatform
+nsOsVersion: %uname_a%
+nsHardwarePlatform: %uname_m%
+
+dn: cn=%fqdn%, ou=%domain%, o=NetscapeRoot
objectClass: top
objectClass: nsHost
objectClass: groupOfUniqueNames
@@ -28,6 +35,13 @@
uniqueMember: cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
dn: cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+changetype: modify
+add: aci
+add: uniqueMember
+aci: (targetattr=*)(version 3.0; acl "Enable delegated access"; allow (read, search, compare) userdn="ldap:///cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
+uniqueMember: cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+
+dn: cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
objectClass: nsAdminGroup
objectClass: groupOfUniqueNames
objectClass: nsDirectoryInfo
@@ -39,6 +53,15 @@
uniqueMember: cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
dn: cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+changetype: modify
+replace: nsProductVersion
+replace: nsBuildNumber
+replace: nsServerMigrationClassname
+nsProductVersion: %as_version%
+nsBuildNumber: %as_buildnum%
+nsServerMigrationClassname: com.netscape.management.admserv.AdminServerProduct@%as_console_jar%
+
+dn: cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
objectClass: top
objectClass: nsApplication
objectClass: groupOfUniqueNames
@@ -70,6 +93,11 @@
aci: (targetattr="uniquemember || serverProductName || userpassword || description")(targetfilter=(objectclass=netscapeServer))(version 3.0; acl "Enable access delegation"; allow (write) groupdn="ldap:///cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
dn: cn=configuration, cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+changetype: modify
+replace: nsClassname
+nsClassname: com.netscape.management.admserv.AdminServer@%as_console_jar%@cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+
+dn: cn=configuration, cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
objectClass: nsConfig
objectClass: nsAdminConfig
objectClass: nsAdminObject
@@ -100,8 +128,3 @@
objectClass: organizationalUnit
aci: (targetattr=*)(version 3.0; acl "UserDNControl"; allow (all) userdnattr="creatorsname";)
ou: cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=netscaperoot
-
-dn: cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
-changetype: modify
-add: aci
-aci: (targetattr=*)(version 3.0; acl "Enable delegated access"; allow (read, search, compare) userdn="ldap:///cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
Index: 21astasks.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/21astasks.ldif.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 21astasks.ldif.tmpl 5 Sep 2007 16:45:58 -0000 1.4
+++ 21astasks.ldif.tmpl 24 Feb 2009 14:25:43 -0000 1.5
@@ -29,6 +29,13 @@
cn: Operation
dn: cn=Stop, cn=Operation, cn=Tasks, %as_sie%
+changetype: modify
+replace: nsClassname
+replace: nsHelpRef
+nsClassname: com.netscape.management.admserv.task.Stop@%as_console_jar%@%as_sie%
+nsHelpRef: %as_help_path%/stopadm.html
+
+dn: cn=Stop, cn=Operation, cn=Tasks, %as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -38,6 +45,13 @@
cn: Stop
dn: cn=Restart, cn=Operation, cn=Tasks, %as_sie%
+changetype: modify
+replace: nsClassname
+replace: nsHelpRef
+nsClassname: com.netscape.management.admserv.task.Restart@%as_console_jar%@%as_sie%
+nsHelpRef: %as_help_path%/restartadm.html
+
+dn: cn=Restart, cn=Operation, cn=Tasks, %as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -47,6 +61,11 @@
cn: Restart
dn: cn=Authenticate, cn=Operation, cn=Tasks, %as_sie%
+changetype: modify
+replace: nsHelpRef
+nsHelpRef: %as_help_path%/userauth.html
+
+dn: cn=Authenticate, cn=Operation, cn=Tasks, %as_sie%
objectClass: top
objectClass: nstask
nsHelpRef: %as_help_path%/userauth.html
@@ -88,6 +107,11 @@
cn: Configuration
dn: cn=ServerSetup, cn=configuration, cn=Tasks, %as_sie%
+changetype: modify
+replace: nsClassname
+nsClassname: com.netscape.management.admserv.task.ServerSetup@%as_console_jar%@%as_sie%
+
+dn: cn=ServerSetup, cn=configuration, cn=Tasks, %as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -117,6 +141,13 @@
cn: AccessSetup
dn: cn=Logging, cn=configuration, cn=Tasks, %as_sie%
+changetype: modify
+replace: nsClassname
+replace: nsHelpRef
+nsClassname: com.netscape.management.admserv.task.Logging@%as_console_jar%@%as_sie%
+nsHelpRef: %as_help_path%/logging.html
+
+dn: cn=Logging, cn=configuration, cn=Tasks, %as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -133,6 +164,13 @@
cn: SecurityOp
dn: cn=CertSetup, cn=configuration, cn=Tasks, %as_sie%
+changetype: modify
+replace: nsClassname
+replace: nsHelpRef
+nsClassname: com.netscape.management.admserv.task.CertSetup@%as_console_jar%@%as_sie%
+nsHelpRef: %as_help_path%/certrequest.html
+
+dn: cn=CertSetup, cn=configuration, cn=Tasks, %as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -141,6 +179,11 @@
cn: CertSetup
dn: cn=SSLActivate, cn=configuration, cn=Tasks, %as_sie%
+changetype: modify
+replace: nsHelpRef
+nsHelpRef: %as_help_path%/ssl_activate.html
+
+dn: cn=SSLActivate, cn=configuration, cn=Tasks, %as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -149,6 +192,11 @@
cn: SSLActivate
dn: cn=ReadLog, cn=configuration, cn=Tasks, %as_sie%
+changetype: modify
+replace: nsHelpRef
+nsHelpRef: %as_help_path%/logging.html
+
+dn: cn=ReadLog, cn=configuration, cn=Tasks, %as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -157,6 +205,11 @@
cn: ReadLog
dn: cn=HTMLAdmin, cn=configuration, cn=Tasks, %as_sie%
+changetype: modify
+replace: nsHelpRef
+nsHelpRef: %as_help_path%/htmladmin.html
+
+dn: cn=HTMLAdmin, cn=configuration, cn=Tasks, %as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -165,6 +218,11 @@
cn: HTMLAdmin
dn: cn=StatPingServ, cn=configuration, cn=Tasks, %as_sie%
+changetype: modify
+replace: nsHelpRef
+nsHelpRef: %as_help_path%/statpingserv.html
+
+dn: cn=StatPingServ, cn=configuration, cn=Tasks, %as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -173,6 +231,11 @@
cn: StatPingServ
dn: cn=ViewData, cn=configuration, cn=Tasks, %as_sie%
+changetype: modify
+replace: nsHelpRef
+nsHelpRef: %as_help_path%/viewdata.html
+
+dn: cn=ViewData, cn=configuration, cn=Tasks, %as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -181,6 +244,11 @@
cn: ViewData
dn: cn=ViewLog, cn=configuration, cn=Tasks, %as_sie%
+changetype: modify
+replace: nsHelpRef
+nsHelpRef: %as_help_path%/viewlog.html
+
+dn: cn=ViewLog, cn=configuration, cn=Tasks, %as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -189,6 +257,11 @@
cn: ViewLog
dn: cn=MonReplication, cn=configuration, cn=Tasks, %as_sie%
+changetype: modify
+replace: nsHelpRef
+nsHelpRef: %as_help_path%/monreplication.html
+
+dn: cn=MonReplication, cn=configuration, cn=Tasks, %as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -197,6 +270,11 @@
cn: MonReplication
dn: cn=repl-monitor-cgi.pl, cn=configuration, cn=Tasks, %as_sie%
+changetype: modify
+replace: nsHelpRef
+nsHelpRef: %as_help_path%/monreplication.html
+
+dn: cn=repl-monitor-cgi.pl, cn=configuration, cn=Tasks, %as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
Index: 22ascommands.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/22ascommands.ldif.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 22ascommands.ldif.tmpl 20 Jun 2007 23:50:11 -0000 1.2
+++ 22ascommands.ldif.tmpl 24 Feb 2009 14:25:43 -0000 1.3
@@ -23,6 +23,11 @@
cn: Commands
dn: cn=sync-task-sie-data, cn=Commands, %as_sie%
+changetype: modify
+replace: nsHelpRef
+nsHelpRef: %as_help_path%/sync-task-sie-data.html
+
+dn: cn=sync-task-sie-data, cn=Commands, %as_sie%
objectClass: top
objectClass: nstask
nsHelpRef: %as_help_path%/sync-task-sie-data.html
15 years, 1 month