Kolab Groupware OBS

389-ds-console.changes Changed

389-ds-console.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package 389-ds-console
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           389-ds-console
-Version:        1.2.6
+Version:        1.2.7
 Release:        0
 Summary:        389 Directory Server Management Console
 
@@ -33,7 +33,7 @@
 BuildRequires:  ldapjdk
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
-Requires:       389-console
+Requires:       389-admin
 
 %define major_version 1.2
 %define shortname 389-ds
@@ -41,8 +41,10 @@
 
 %description
 A Java based remote management console used for managing 389
-Directory Server.  The 389 Console is required to load and
-run these jar files.
+Directory Server. Requires the 389 Console installed (on a client)
+to load and run the jar files from an 389-admin server.
+
+This package has to be installed on the adminstration server.
 
 
 %package        doc

389-ds-console-1.2.6.tar.bz2/389-ds-console.spec -> 389-ds-console-1.2.7.tar.bz2/389-ds-console.spec Changed

389-ds-console-1.2.6.tar.bz2/build.properties -> 389-ds-console-1.2.7.tar.bz2/build.properties Changed

389-ds-console-1.2.6.tar.bz2/fedora-ds-console.spec -> 389-ds-console-1.2.7.tar.bz2/fedora-ds-console.spec Changed

389-ds-console-1.2.6.tar.bz2/src/com/netscape/admin/dirserv/cosedit/ResEditorCosAttributes.java -> 389-ds-console-1.2.7.tar.bz2/src/com/netscape/admin/dirserv/cosedit/ResEditorCosAttributes.java Changed

@@ -56,11 +56,15 @@
 		
 		// Fetch the labels for attribute qualifier.
 		// Note: array indices match the values DEFAULT, OVERRIDE...
-		_qualifierLabels = new Vector(3);
+		_qualifierLabels = new Vector(8);
 		_qualifierLabels.addElement(_resource.getString(_section, "qualifier-default"));
+		_qualifierLabels.addElement(_resource.getString(_section, "qualifier-default-merge-schemes"));
 		_qualifierLabels.addElement(_resource.getString(_section, "qualifier-override"));
+		_qualifierLabels.addElement(_resource.getString(_section, "qualifier-override-merge-schemes"));
 		_qualifierLabels.addElement(_resource.getString(_section, "qualifier-operational"));
+		_qualifierLabels.addElement(_resource.getString(_section, "qualifier-operational-merge-schemes"));
 		_qualifierLabels.addElement(_resource.getString(_section, "qualifier-operational-default"));
+		_qualifierLabels.addElement(_resource.getString(_section, "qualifier-operational-default-merge-schemes"));
 	}
 	
 	
@@ -451,9 +455,13 @@
  */
 class CosAttributeRec {
 	public static final int DEFAULT     = 0;
-	public static final int OVERRIDE    = 1;
-	public static final int OPERATIONAL = 2;
-	public static final int OPERATIONAL_DEFAULT = 3;
+	public static final int DEFAULT_MERGE_SCHEMES = 1;
+	public static final int OVERRIDE    = 2;
+	public static final int OVERRIDE_MERGE_SCHEMES = 3;
+	public static final int OPERATIONAL = 4;
+	public static final int OPERATIONAL_MERGE_SCHEMES = 5;
+	public static final int OPERATIONAL_DEFAULT = 6;
+	public static final int OPERATIONAL_DEFAULT_MERGE_SCHEMES = 7;
 	
 	String name;
 	int qualifier;
@@ -472,7 +480,18 @@
 				qualifier = OPERATIONAL;
 			else if (token.equalsIgnoreCase("operational-default"))
 				qualifier = OPERATIONAL_DEFAULT;
-			else {
+			else if (token.equalsIgnoreCase("merge-schemes")){
+				// Now check if we already have a qualifier set, and modify it if necessary
+				if(qualifier == DEFAULT){
+					qualifier = DEFAULT_MERGE_SCHEMES;
+				} else if(qualifier == OVERRIDE){
+					qualifier = OVERRIDE_MERGE_SCHEMES;
+				} else if(qualifier == OPERATIONAL){
+					qualifier = OPERATIONAL_MERGE_SCHEMES;
+				} else if(qualifier == OPERATIONAL_DEFAULT){
+					qualifier = OPERATIONAL_DEFAULT_MERGE_SCHEMES;
+				}
+			} else {
 				Debug.println(0, "ResEditorCosAttributes.CosAttributeRec: " + 
 					             "ignored invalid cosAttribute qualifier (" + token + ")");
 			}
@@ -482,14 +501,30 @@
 	public String toString() {
 		StringBuffer sb = new StringBuffer(name);
 		switch(qualifier) {
+			case DEFAULT_MERGE_SCHEMES:
+				sb.append(" merge-schemes");
+				break;
 			case OVERRIDE:
 				sb.append(" override");
 				break;
+			case OVERRIDE_MERGE_SCHEMES:
+				sb.append(" override merge-schemes");
+				break;
 			case OPERATIONAL:
 				sb.append(" operational");
 				break;
+			case OPERATIONAL_MERGE_SCHEMES:
+				sb.append(" operational merge-schemes");
+				break;
+			case OPERATIONAL_DEFAULT:
+				sb.append(" operational-default");
+				break;
+			case OPERATIONAL_DEFAULT_MERGE_SCHEMES:
+				sb.append(" operational-default merge-schemes");
+				break;
 			// case DEFAULT: nothing needed
 		}
+
 		return sb.toString();
 	}
 };

389-ds-console-1.2.6.tar.bz2/src/com/netscape/admin/dirserv/dirserv.properties -> 389-ds-console-1.2.7.tar.bz2/src/com/netscape/admin/dirserv/dirserv.properties Changed

@@ -2772,9 +2772,13 @@
 cosAttributesPage-header-name=Attribute Name
 cosAttributesPage-header-qualifier=Class of Service Behavior
 cosAttributesPage-qualifier-default=Does not override target entry attribute
+cosAttributesPage-qualifier-default-merge-schemes=Does not override target entry attribute (merge-schemes)
 cosAttributesPage-qualifier-override=Overrides target entry attribute
+cosAttributesPage-qualifier-override-merge-schemes=Overrides target entry attribute (merge-schemes)
 cosAttributesPage-qualifier-operational=Overrides target entry attribute and is operational
+cosAttributesPage-qualifier-operational-merge-schemes=Overrides target entry attribute and is operational (merge-schemes)
 cosAttributesPage-qualifier-operational-default=Does not override target entry attribute and is operational
+cosAttributesPage-qualifier-operational-default-merge-schemes=Does not override target entry attribute and is operational (merge-schemes)
 cosTemplatePage-id=Template
 cosTemplatePage-label=Choose how the template entry is identified:
 cosTemplatePage-pointerRadioButton=By its DN

389-ds-console-1.2.6.tar.bz2/src/com/netscape/admin/dirserv/panel/EncryptionPanel.java -> 389-ds-console-1.2.7.tar.bz2/src/com/netscape/admin/dirserv/panel/EncryptionPanel.java Changed

@@ -619,6 +619,57 @@
 		_cbConsoleSSL.setEnabled(_configData.sslServerOn && !_rbRequired.isSelected());
 		_cbSSLCheckHostName.setEnabled(_configData.sslServerOn);
 
+		// Get secure port
+		DSResourceModel model = (DSResourceModel)getModel();
+		ConsoleInfo serverInfo = model.getServerInfo();
+		LDAPConnection ldc = serverInfo.getLDAPConnection();
+		int securePort = -1; 
+		// Read cn=config
+		String configDn = "cn=config";
+		String[] configAttrs = { "nsslapd-secureport" };
+		LDAPEntry configEntry = null;
+		try {
+		    configEntry = ldc.read(configDn, configAttrs);
+		}
+		catch(LDAPException x) {
+		    Debug.println(0, 
+		        "EncryptionPanel.updateComponentState: failure while reading config data");
+		    if (Debug.getTrace()) {
+		        x.printStackTrace();
+		    }
+		}
+
+		// Parse configEntry
+		if (configEntry != null) {
+		    String securePortStr = DSUtil.getAttrValue(configEntry, configAttrs[0]);
+		    try {
+		        securePort = Integer.parseInt(securePortStr);
+		    }
+		    catch(NumberFormatException x) {
+		        Debug.println(0, 
+		            "EncryptionPanel.updateComponentState: cannot convert nsslapd-secureport to an int !");
+		    }
+
+		    // If securePort is not a default value, set it to NetscapeRoot
+		    if (636 != securePort) {
+		        ConsoleInfo consoleInfo = model.getConsoleInfo();
+		        LDAPConnection sieldc = consoleInfo.getLDAPConnection();
+		        String sieDn = consoleInfo.getCurrentDN();
+		        LDAPAttribute attr = 
+		                 new LDAPAttribute("nssecureserverport", securePortStr);
+		        try {
+		            sieldc.modify(sieDn, 
+		                 new LDAPModification(LDAPModification.REPLACE, attr));
+		        }
+		        catch(LDAPException xx) {
+		            Debug.println(0, 
+		                "EncryptionPanel.updateComponentState: failure while modifying console config data");
+		            if (Debug.getTrace()) {
+		                xx.printStackTrace();
+		            }
+		        }
+		    }
+		}
 	}

389-ds-console.dsc Changed

debian.changelog Changed

Changes of Revision 7