From 0ffdb71b0c233950496e48ef9e837dd822b0475d Mon Sep 17 00:00:00 2001
From: fguigues <fguigues@localhost>
Date: Thu, 12 Mar 2009 17:13:05 +0000
Subject: [PATCH] Fix 3690 : SNMP: incorrect value for dsServerDescription entry Fix 3865 : Missing information for JMX and SNMP connection handlers in status output
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/LicenseFile.java | 8 ++--
opendj-sdk/opends/src/snmp/src/org/opends/server/snmp/DsTableEntryImpl.java | 2
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java | 10 +++++
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SNMPConnectionHandlerConfiguration.xml | 31 +++++++++++++++
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java | 10 +++++
opendj-sdk/opends/src/snmp/resource/config/config.snmp.ldif | 1
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/JMXConnectionHandlerConfiguration.xml | 31 +++++++++++++++
opendj-sdk/opends/resource/schema/02-config.ldif | 6 ++-
8 files changed, 90 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/opends/resource/schema/02-config.ldif b/opendj-sdk/opends/resource/schema/02-config.ldif
index 245ac16..18896fa 100644
--- a/opendj-sdk/opends/resource/schema/02-config.ldif
+++ b/opendj-sdk/opends/resource/schema/02-config.ldif
@@ -3017,7 +3017,8 @@
SUP ds-cfg-connection-handler
STRUCTURAL
MUST ds-cfg-listen-port
- MAY ( ds-cfg-ssl-cert-nickname $
+ MAY ( ds-cfg-listen-address $
+ ds-cfg-ssl-cert-nickname $
ds-cfg-use-ssl $
ds-cfg-key-manager-provider )
X-ORIGIN 'OpenDS Directory Server' )
@@ -3916,7 +3917,8 @@
STRUCTURAL
MUST ( ds-cfg-listen-port $
ds-cfg-trap-port )
- MAY ( ds-cfg-traps-destination $
+ MAY ( ds-cfg-listen-address $
+ ds-cfg-traps-destination $
ds-cfg-registered-mbean $
ds-cfg-community $
ds-cfg-allowed-manager $
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/JMXConnectionHandlerConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/JMXConnectionHandlerConfiguration.xml
index 10238dd..2f00ff9 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/JMXConnectionHandlerConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/JMXConnectionHandlerConfiguration.xml
@@ -23,7 +23,7 @@
! CDDL HEADER END
!
!
- ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Copyright 2007-2009 Sun Microsystems, Inc.
! -->
<adm:managed-object name="jmx-connection-handler"
plural-name="jmx-connection-handlers"
@@ -67,6 +67,35 @@
</adm:defined>
</adm:default-behavior>
</adm:property-override>
+ <adm:property name="listen-address" multi-valued="true" read-only="true">
+ <adm:synopsis>
+ Specifies the address or set of addresses on which this
+ <adm:user-friendly-name />
+ should listen for connections from SNMP clients.
+ </adm:synopsis>
+ <adm:description>
+ Multiple addresses may be provided as separate values for this
+ attribute. If no values are provided, then the
+ <adm:user-friendly-name />
+ listens on all interfaces.
+ </adm:description>
+ <adm:requires-admin-action>
+ <adm:server-restart />
+ </adm:requires-admin-action>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>0.0.0.0</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:ip-address />
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-listen-address</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
<adm:property-reference name="listen-port" />
<adm:property-reference name="use-ssl" />
<adm:property-reference name="ssl-cert-nickname" />
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SNMPConnectionHandlerConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SNMPConnectionHandlerConfiguration.xml
index fa745e1..4a3cc6d 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SNMPConnectionHandlerConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SNMPConnectionHandlerConfiguration.xml
@@ -23,7 +23,7 @@
! CDDL HEADER END
!
!
- ! Portions Copyright 2008 Sun Microsystems, Inc.
+ ! Portions Copyright 2008-2009 Sun Microsystems, Inc.
! -->
<adm:managed-object name="snmp-connection-handler"
plural-name="snmp-connection-handlers"
@@ -63,6 +63,35 @@
</adm:property-override>
<!-- SNMP Port -->
<adm:property-reference name="listen-port" />
+ <adm:property name="listen-address" multi-valued="true" read-only="true">
+ <adm:synopsis>
+ Specifies the address or set of addresses on which this
+ <adm:user-friendly-name />
+ should listen for connections from SNMP clients.
+ </adm:synopsis>
+ <adm:description>
+ Multiple addresses may be provided as separate values for this
+ attribute. If no values are provided, then the
+ <adm:user-friendly-name />
+ listens on all interfaces.
+ </adm:description>
+ <adm:requires-admin-action>
+ <adm:server-restart />
+ </adm:requires-admin-action>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>0.0.0.0</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:ip-address />
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-listen-address</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
<adm:property name="trap-port" mandatory="true">
<adm:synopsis>
Specifies the port to use to send SNMP Traps.
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
index 4d0ed92..86f1513 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
@@ -764,6 +764,11 @@
{
protocol = ConnectionHandlerDescriptor.Protocol.JMX;
}
+ SortedSet<InetAddress> v = jmx.getListenAddress();
+ if (v != null)
+ {
+ addresses.addAll(v);
+ }
port = jmx.getListenPort();
}
else if (connHandler instanceof LDIFConnectionHandlerCfgClient)
@@ -776,6 +781,11 @@
protocol = ConnectionHandlerDescriptor.Protocol.SNMP;
SNMPConnectionHandlerCfgClient snmp =
(SNMPConnectionHandlerCfgClient)connHandler;
+ SortedSet<InetAddress> v = snmp.getListenAddress();
+ if (v != null)
+ {
+ addresses.addAll(v);
+ }
port = snmp.getListenPort();
}
else
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java
index 1f4813d..a26bbaf 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java
@@ -432,6 +432,11 @@
{
protocol = ConnectionHandlerDescriptor.Protocol.JMX;
}
+ SortedSet<InetAddress> v = jmx.getListenAddress();
+ if (v != null)
+ {
+ addresses.addAll(v);
+ }
port = jmx.getListenPort();
}
else if (connHandler instanceof LDIFConnectionHandlerCfg)
@@ -443,6 +448,11 @@
{
protocol = ConnectionHandlerDescriptor.Protocol.SNMP;
SNMPConnectionHandlerCfg snmp = (SNMPConnectionHandlerCfg)connHandler;
+ SortedSet<InetAddress> v = snmp.getListenAddress();
+ if (v != null)
+ {
+ addresses.addAll(v);
+ }
port = snmp.getListenPort();
}
else
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/LicenseFile.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/LicenseFile.java
index 1cdc5df..67cd995 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/LicenseFile.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/LicenseFile.java
@@ -57,9 +57,9 @@
if (Utils.isWebStart())
{
return
- File.pathSeparator +
+ File.separatorChar +
"Legal" +
- File.pathSeparator +
+ File.separatorChar +
"license_to_accept.txt";
}
else
@@ -79,9 +79,9 @@
}
return installRootFromSystem +
- File.pathSeparator +
+ File.separatorChar +
"Legal" +
- File.pathSeparator +
+ File.separatorChar +
"license_to_accept.txt";
}
}
diff --git a/opendj-sdk/opends/src/snmp/resource/config/config.snmp.ldif b/opendj-sdk/opends/src/snmp/resource/config/config.snmp.ldif
index 6098f10..c8024ff 100644
--- a/opendj-sdk/opends/src/snmp/resource/config/config.snmp.ldif
+++ b/opendj-sdk/opends/src/snmp/resource/config/config.snmp.ldif
@@ -8,4 +8,5 @@
ds-cfg-enabled: false
ds-cfg-trap-port: 162
ds-cfg-listen-port: 161
+ds-cfg-listen-address: 0.0.0.0
diff --git a/opendj-sdk/opends/src/snmp/src/org/opends/server/snmp/DsTableEntryImpl.java b/opendj-sdk/opends/src/snmp/src/org/opends/server/snmp/DsTableEntryImpl.java
index dec8180..7d6503b 100644
--- a/opendj-sdk/opends/src/snmp/src/org/opends/server/snmp/DsTableEntryImpl.java
+++ b/opendj-sdk/opends/src/snmp/src/org/opends/server/snmp/DsTableEntryImpl.java
@@ -181,7 +181,7 @@
String result = null;
try {
result = DirectoryServer.getServerRoot() +
- File.separatorChar + "bin";
+ File.separatorChar;
} catch (Exception ex) {
if (DebugLogger.debugEnabled()) {
TRACER.debugCaught(DebugLogLevel.ERROR, ex);
--
Gitblit v1.10.0