Issue 466 (partial)

david_page

27.13.2007 73d3682caa5e9a91d7aa087c9e65fbf5be49435a

Issue 466 (partial)

rename "ds-cfg-ads-certificate" to "ds-cfg-public-key-certificate"
use "ds-cfg-public-key-certificate;binary"

 opends/src/ads/org/opends/admin/ads/ADSContext.java

@@ -1922,7 +1922,7 @@
    /**
     * The public-key certificate of the instance key.
     */
    HOST_NAME("ds-cfg-ads-certificate",ADSPropertySyntax.STRING);
    KEY_CERT("ds-cfg-public-key-certificate;binary",ADSPropertySyntax.STRING);

    private String attrName;
    private ADSPropertySyntax attrSyntax;
@@ -1994,12 +1994,12 @@
      try {
        final SearchControls sc = new SearchControls();
        sc.setSearchScope(SearchControls.OBJECT_SCOPE);
        final String attrIDs[] = { "ds-cfg-ads-certificate" };
        final String attrIDs[] = { "ds-cfg-public-key-certificate;binary" };
        sc.setReturningAttributes(attrIDs);
        final SearchResult adsCertEntry
           = dirContext.search(nameFromDN(dnStr), "(objectclass=*)", sc).next();
        final Attribute certAttr
                = adsCertEntry.getAttributes().get("ds-cfg-ads-certificate");
        final Attribute certAttr = adsCertEntry.getAttributes().get(
                                        "ds-cfg-public-key-certificate;binary");
        if (null != certAttr) {
          localInstanceKeyCertificate = (String)certAttr.get();
        }