[Fedora-directory-commits] ldapserver/ldap/servers/slapd util.c, 1.9, 1.10
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7463/ldapserver/ldap/servers/slapd
Modified Files:
util.c
Log Message:
Bug(s) fixed: 181776
Bug Description: 64bit issues with normalize_path(), make_dn(), and
add_aci_v()
Reviewed by: Nathan and Noriko (Thanks!)
Fix Description: 1) use sizeof(char *) as the elemsize to pass to
slapi_ch_calloc(). 2) create a variable const char *NULLSTR = 0 to pass
as the last argument to the varargs functions.
Platforms tested: RHEL4 64
Flag Day: no
Doc impact: no
Index: util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/util.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- util.c 12 Jan 2006 00:28:57 -0000 1.9
+++ util.c 16 Feb 2006 17:39:53 -0000 1.10
@@ -408,8 +408,8 @@
char *dname = slapi_ch_strdup(path);
char *dnamep = dname;
char *bnamep = NULL;
- char **dirs = (char **)slapi_ch_calloc(strlen(path), 1);
- char **rdirs = (char **)slapi_ch_calloc(strlen(path), 1);
+ char **dirs = (char **)slapi_ch_calloc(strlen(path), sizeof(char *));
+ char **rdirs = (char **)slapi_ch_calloc(strlen(path), sizeof(char *));
char **dp = dirs;
char **rdp;
do {
18 years, 3 months
[Fedora-directory-commits] ldapserver/ldap/admin/src cfg_sspt.c, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7463/ldapserver/ldap/admin/src
Modified Files:
cfg_sspt.c
Log Message:
Bug(s) fixed: 181776
Bug Description: 64bit issues with normalize_path(), make_dn(), and
add_aci_v()
Reviewed by: Nathan and Noriko (Thanks!)
Fix Description: 1) use sizeof(char *) as the elemsize to pass to
slapi_ch_calloc(). 2) create a variable const char *NULLSTR = 0 to pass
as the last argument to the varargs functions.
Platforms tested: RHEL4 64
Flag Day: no
Doc impact: no
Index: cfg_sspt.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/cfg_sspt.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cfg_sspt.c 19 Apr 2005 22:06:55 -0000 1.7
+++ cfg_sspt.c 16 Feb 2006 17:39:47 -0000 1.8
@@ -54,6 +54,8 @@
#define TEST_CONFIG /* for testing cn=config40 dummy entry instead of real one */
+char* const NULLSTR = 0;
+
char* const class_top = "top";
char* const class_organization = "organization";
char* const class_organizationalUnit = "organizationalunit";
@@ -754,7 +756,7 @@
if (!base)
entrydn = strdup(unit);
else
- entrydn = make_dn("%s=%s, %s", name_ou, unit, base, 0);
+ entrydn = make_dn("%s=%s, %s", name_ou, unit, base, NULLSTR);
if (!entry_exists(ld, entrydn))
{
@@ -1062,7 +1064,7 @@
return -1;
}
- entrydn = make_dn("%s=%s", name_cn, value_config40, 0);
+ entrydn = make_dn("%s=%s", name_cn, value_config40, NULLSTR);
if (!entry_exists(ld, entrydn))
{
LDAPMod* attrs[3];
@@ -1130,7 +1132,7 @@
return -1;
}
- entrydn = make_dn("%s=%s, %s", name_cn, group, base, 0);
+ entrydn = make_dn("%s=%s, %s", name_cn, group, base, NULLSTR);
if (!entry_exists(ld, entrydn))
{
@@ -1379,7 +1381,7 @@
{
/* initial ACIs for o=NetscapeRoot */
- int ret = add_aci_v (connection, value_config40DN, ACI_self_allow, 0);
+ int ret = add_aci_v (connection, value_config40DN, ACI_self_allow, NULLSTR);
return ret;
}
@@ -1418,7 +1420,7 @@
/* parent dn of admin uid entry */
if (query->netscaperoot) {
parentDN = make_dn("%s, %s, %s", name_administratorsRDN,
- name_topologyRDN, query->netscaperoot, 0);
+ name_topologyRDN, query->netscaperoot, NULLSTR);
}
if (query->config_admin_uid) {
@@ -1428,12 +1430,12 @@
configAdminDN = strdup(query->config_admin_uid);
} else if (parentDN) {
/* create a DN for admid */
- configAdminDN = make_dn(DN_formatUID, query->config_admin_uid, parentDN, 0);
+ configAdminDN = make_dn(DN_formatUID, query->config_admin_uid, parentDN, NULLSTR);
} else {
/* create one from scratch */
configAdminDN = make_dn("%s=%s, %s, %s, %s", name_uid, query->config_admin_uid,
name_administratorsRDN, name_topologyRDN,
- name_netscaperootDN, 0);
+ name_netscaperootDN, NULLSTR);
}
}
@@ -1444,7 +1446,7 @@
{
if (configAdminDN && !is_root_user(configAdminDN, query)) {
add_aci_v(connection, query->suffix, ACI_user_allow_2,
- "all", configAdminDN, 0);
+ "all", configAdminDN, NULLSTR);
}
status = create_group(connection, query->suffix, name_localDAGroup);
@@ -1465,13 +1467,13 @@
adminGroupDN = make_dn("%s, %s=%s, %s, %s", value_configAdminGroupRDN,
name_ou, value_groupsOU,
name_topologyRDN,
- query->netscaperoot, 0);
+ query->netscaperoot, NULLSTR);
}
if (query->suffix)
{
localDAGroupDN = make_dn("cn=%s, %s", name_localDAGroup,
- query->suffix, 0);
+ query->suffix, NULLSTR);
}
else
{
@@ -1483,20 +1485,20 @@
add_aci_v(connection, entryAndAccessList[ii].entryDN,
ACI_config_admin_group_allow,
entryAndAccessList[ii].access,
- adminGroupDN, 0);
+ adminGroupDN, NULLSTR);
}
if (configAdminDN && !is_root_user(configAdminDN, query)) {
add_aci_v(connection, entryAndAccessList[ii].entryDN,
ACI_user_allow_2,
entryAndAccessList[ii].access,
- configAdminDN, 0);
+ configAdminDN, NULLSTR);
}
if (localDAGroupDN)
{
add_aci_v(connection, entryAndAccessList[ii].entryDN,
ACI_local_DA_allow,
entryAndAccessList[ii].access,
- localDAGroupDN, 0);
+ localDAGroupDN, NULLSTR);
}
}
}
@@ -1512,22 +1514,22 @@
ACI_config_admin_group_allow_all,
value_configAdminGroupRDN,
name_ou, value_groupsOU, name_topologyRDN,
- query->netscaperoot, 0);
+ query->netscaperoot, NULLSTR);
if (!status)
status = add_aci_v(connection, query->netscaperoot,
ACI_anonymous_allow_with_filter,
- query->netscaperoot, 0);
+ query->netscaperoot, NULLSTR);
if (!status)
status = add_aci_v(connection, query->netscaperoot, ACI_group_expansion,
- query->netscaperoot, 0);
+ query->netscaperoot, NULLSTR);
/* create "topologyOU, netscaperoot" entry and set ACIs */
if (!status)
{
char *dn = make_dn("%s, %s", name_topologyRDN,
- query->netscaperoot, 0);
+ query->netscaperoot, NULLSTR);
status = create_organizational_unit(connection, NULL, dn,
value_topologyDESC,
0, 0, 0);
@@ -1542,7 +1544,7 @@
if (!status)
{
char *dn = make_dn("%s=%s, %s, %s", name_ou, value_groupsOU,
- name_topologyRDN, query->netscaperoot, 0);
+ name_topologyRDN, query->netscaperoot, NULLSTR);
status = create_organizational_unit (connection, NULL, dn,
value_groupsDesc, 0, 0, 0);
free(dn);
@@ -1552,7 +1554,7 @@
if (!status)
{
char *dn = make_dn("%s, %s, %s", name_administratorsRDN,
- name_topologyRDN, query->netscaperoot, 0);
+ name_topologyRDN, query->netscaperoot, NULLSTR);
status = create_organizational_unit (connection, NULL, dn,
value_administratorsDESC,
0, 0, 0);
@@ -1564,7 +1566,7 @@
{
char *dn = make_dn("%s=%s, %s, %s", name_ou, value_groupsOU,
name_topologyRDN,
- query->netscaperoot, 0);
+ query->netscaperoot, NULLSTR);
status = create_group (connection, dn, value_configAdminGroupCN);
free(dn);
}
@@ -1575,7 +1577,7 @@
/* group to add the uid to */
char *groupdn = make_dn("%s, %s=%s, %s, %s", value_configAdminGroupRDN,
name_ou, value_groupsOU, name_topologyRDN,
- query->netscaperoot, 0);
+ query->netscaperoot, NULLSTR);
create_ssadmin_user(connection, parentDN,
query->ssAdmID, query->ssAdmPW1);
@@ -1585,7 +1587,7 @@
}
admin_domainDN = make_dn("%s=%s, %s", name_ou, query->admin_domain,
- query->netscaperoot, 0);
+ query->netscaperoot, NULLSTR);
if (!status)
status = create_organizational_unit (connection, 0,
18 years, 3 months
[Fedora-directory-commits] ldapserver/ldap/clients/dsgw Makefile, 1.6, 1.6.2.1
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1709
Modified Files:
Tag: Directory71RtmBranch
Makefile
Log Message:
[181582] Directory Server 7.1 SP2 packaging
See Comment #4
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/Makefile,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- Makefile 19 Apr 2005 22:07:01 -0000 1.6
+++ Makefile 16 Feb 2006 01:28:12 -0000 1.6.2.1
@@ -151,7 +151,7 @@
$(LDAPLINK) $(ADMINUTIL_LINK) \
$(LDAP_LIBLDBM) $(ICULINK) $(NOSSLLIBS) \
$(LDAP_LIBLDIF) $(DBMLINK) $(ALIBS) \
- $(THREADSLIB) $(NSPRLINK) $(LDAP_LIBLITEKEY)
+ $(THREADSLIB) $(SECURITYLINK) $(NSPRLINK) $(LDAP_LIBLITEKEY)
endif
NSECLIBS_DEP=$(SECGLUEOBJS)
18 years, 3 months
[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv/panel DSEntrySet.java, 1.1.1.1, 1.2 PasswordPolicyPanel.java, 1.1.1.1, 1.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27837/panel
Modified Files:
DSEntrySet.java PasswordPolicyPanel.java
Log Message:
Bug(s) fixed: 181570
Bug Description: The UI for the new password syntax enhancements needs to be created.
Reviewed by: Rich, Noriko (thanks!)
Files: see diffs
Branch: HEAD (directoryconsole)
Fix Description: This adds input fields for the new password syntax config parameters. The
new fields are added uder the "Configuration->Data->Passwords" tab. This revised set of
diffs fixes an issue where the default values when setting up a per-user or per-subtree password
policy were all showing up as 0. This was due to DSEntrySet overwriting the default component
values with a null string if the passwordPolicy LDAP entry did not exist.
Flag Day: no
Doc impact: no
QA impact: Console testplan will need to be updated.
New Tests integrated into TET: none
Index: DSEntrySet.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/DSEntrySet.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- DSEntrySet.java 18 Jul 2005 00:55:55 -0000 1.1.1.1
+++ DSEntrySet.java 15 Feb 2006 23:00:55 -0000 1.2
@@ -152,73 +152,75 @@
// collect all attribute names for this entry into an array
String[] attrNames = getAttributeNames(dn);
Debug.println(9, "DSEntrySet.getAttributes(): attempting to read entry " +
- dn + " from the server attrNames = " + attrNames);
- try {
- entry = ldc.read(dn, attrNames);
- } catch (LDAPException lde) {
- if ( lde.getLDAPResultCode() == lde.NO_SUCH_OBJECT &&
- _allowNoEntry ) {
- entry = null;
- } else {
- throw lde;
- }
- }
- if ( entry == null && !_allowNoEntry ) {
- Debug.println( "DSEntrySet.getAttribytes: failed to read " +
- dn );
- return false;
- } else {
-// Debug.println( "DSEntrySet.getAttributes(): entry = " + entry );
- }
+ dn + " from the server attrNames = " + attrNames);
+ try {
+ entry = ldc.read(dn, attrNames);
+ } catch (LDAPException lde) {
+ if ( lde.getLDAPResultCode() == lde.NO_SUCH_OBJECT && _allowNoEntry ) {
+ entry = null;
+ } else {
+ throw lde;
+ }
+ }
+
+ if ( entry == null && !_allowNoEntry ) {
+ Debug.println( "DSEntrySet.getAttribytes: failed to read " + dn );
+ return false;
+ } else {
+ // Debug.println( "DSEntrySet.getAttributes(): entry = " + entry );
+ }
+
+ Debug.println("DSEntrySet.getAttributes(): read entry from DS:" + entry);
+ Debug.println("DSEntrySet.getAttributes(): attributes for this entry:" + attrNames);
- Debug.println("DSEntrySet.getAttributes(): read entry from DS:" +
- entry);
- Debug.println("DSEntrySet.getAttributes(): attributes for this entry:" +
- attrNames);
// now we have the entry; get the LDAPAttributes
- boolean haveAllAttrs = true; // flag if any attribues were missing
+ boolean haveAllAttrs = true; // flag if any attribues were missing
for (int ii = 0; ii < attrNames.length; ++ii) {
String attrName = attrNames[ii];
LDAPAttribute lda = null;
- if (entry != null) {
- lda = entry.getAttribute(attrName);
- }
+ if (entry != null) {
+ lda = entry.getAttribute(attrName);
+ }
+
if (lda == null && entry != null) {
- Debug.println( "DSEntrySet.getAttributes(): failed to get " +
- "attribute " + attrName + " in " + entry.getDN());
- haveAllAttrs = false; // missing at least one attr value
- }
+ Debug.println( "DSEntrySet.getAttributes(): failed to get " +
+ "attribute " + attrName + " in " + entry.getDN());
+ haveAllAttrs = false; // missing at least one attr value
+ }
- // loop through all of the DSEntrys which
- // correspond to this attribute name and do the
- // remoteToLocal for each one
- Vector v = (Vector)_attrNametoDSAVectorMap.get(attrName);
- for (int jj = 0; v != null && jj < v.size(); ++jj) {
- IDSEntry dse = (IDSEntry)v.elementAt(jj);
- if (lda != null) {
- dse.remoteToLocal(lda.getStringValues());
- } else {
- dse.remoteToLocal(""); // dummy empty value
- }
-// Debug.println("DSEntrySet.show(): set DSE" +
-// " for attribute" + attrName +
-// " to value=" + lda);
-// Debug.println("DSEntrySet.show(): new val=" +
-// dse);
- dse.show();
- }
- }
- if (!haveAllAttrs) {
- Debug.println("DSEntrySet.show(): some of the attributes of " +
- entry.getDN() + " could not be read. Either they " +
- "are not present in the entry or there is an ACI " +
- "which prevents that attribute from being read. " +
- "Try authenticating as a user with more access");
- if (_validate)
- return false;
- }
- }
- return true;
+ // loop through all of the DSEntrys which
+ // correspond to this attribute name and do the
+ // remoteToLocal for each one that was found
+ Vector v = (Vector)_attrNametoDSAVectorMap.get(attrName);
+ for (int jj = 0; v != null && jj < v.size(); ++jj) {
+ IDSEntry dse = (IDSEntry)v.elementAt(jj);
+ if (lda != null) {
+ Debug.println("DSEntrySet.getAttributes(): " + attrName +
+ " was found, setting value from entry");
+ dse.remoteToLocal(lda.getStringValues());
+ }
+
+ // Debug.println("DSEntrySet.show(): set DSE" +
+ // " for attribute" + attrName +
+ // " to value=" + lda);
+ // Debug.println("DSEntrySet.show(): new val=" + dse);
+
+ dse.show();
+ }
+ }
+
+ if (!haveAllAttrs) {
+ Debug.println("DSEntrySet.show(): some of the attributes of " +
+ entry.getDN() + " could not be read. Either they " +
+ "are not present in the entry or there is an ACI " +
+ "which prevents that attribute from being read. " +
+ "Try authenticating as a user with more access");
+ if (_validate)
+ return false;
+ }
+ }
+
+ return true;
}
/**
Index: PasswordPolicyPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/PasswordPolicyPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- PasswordPolicyPanel.java 18 Jul 2005 00:56:02 -0000 1.1.1.1
+++ PasswordPolicyPanel.java 15 Feb 2006 23:00:55 -0000 1.2
@@ -28,6 +28,7 @@
import com.netscape.admin.dirserv.*;
import com.netscape.management.client.*;
import com.netscape.management.client.util.*;
+import com.netscape.management.nmclf.*;
import netscape.ldap.*;
import netscape.ldap.util.*;
@@ -90,8 +91,7 @@
createChangeArea((Container)_myPanel);
createExpirationArea((Container)_myPanel);
createSyntaxArea((Container)_myPanel);
- createMinLengthArea((Container)_myPanel);
- createStorageArea((Container)_myPanel);
+ createStorageArea((Container)_myPanel);
addBottomGlue ();
_isInitialized = true;
@@ -254,46 +254,231 @@
protected void createSyntaxArea( Container myContainer ) {
_cbCheckSyntax = makeJCheckBox(_section, "check", false);
- DSEntrySet entries = getDSEntrySet();
- DSEntryBoolean se = new DSEntryBoolean( "off", _cbCheckSyntax );
- entries.add( _policyspecdn, SYNTAX_ATTR_NAME, se );
- setComponentTable(_cbCheckSyntax, se);
- GridBagConstraints gbc = getGBC();
- gbc.gridwidth = gbc.REMAINDER;
- gbc.anchor = gbc.WEST;
- gbc.fill = gbc.NONE;
- gbc.weightx = 1.0;
- myContainer.add(_cbCheckSyntax, gbc);
- }
-
- protected void createMinLengthArea( Container myContainer ) {
_minLengthLabel = makeJLabel(_section, "minlength");
_tfMinLengthValue = makeNumericalJTextField(_section, "minlength");
- _minLengthLabel.setLabelFor(_tfMinLengthValue);
+ _minLengthLabel.setLabelFor(_tfMinLengthValue);
+
+ _minDigitsLabel = makeJLabel(_section, "mindigits");
+
+ _tfMinDigitsValue = makeNumericalJTextField(_section, "mindigits");
+ _minDigitsLabel.setLabelFor(_tfMinDigitsValue);
+
+ _minAlphasLabel = makeJLabel(_section, "minalphas");
+
+ _tfMinAlphasValue = makeNumericalJTextField(_section, "minalphas");
+ _minAlphasLabel.setLabelFor(_tfMinAlphasValue);
+
+ _minUppersLabel = makeJLabel(_section, "minuppers");
+
+ _tfMinUppersValue = makeNumericalJTextField(_section, "minuppers");
+ _minUppersLabel.setLabelFor(_tfMinUppersValue);
+
+ _minLowersLabel = makeJLabel(_section, "minlowers");
+
+ _tfMinLowersValue = makeNumericalJTextField(_section, "minlowers");
+ _minLowersLabel.setLabelFor(_tfMinLowersValue);
+
+ _minSpecialsLabel = makeJLabel(_section, "minspecials");
+
+ _tfMinSpecialsValue = makeNumericalJTextField(_section, "minspecials");
+ _minSpecialsLabel.setLabelFor(_tfMinSpecialsValue);
+
+ _min8bitLabel = makeJLabel(_section, "min8bit");
+
+ _tfMin8bitValue = makeNumericalJTextField(_section, "min8bit");
+ _min8bitLabel.setLabelFor(_tfMin8bitValue);
+
+ _maxRepeatsLabel = makeJLabel(_section, "maxrepeats");
+ _tfMaxRepeatsValue = makeNumericalJTextField(_section, "maxrepeats");
+ _maxRepeatsLabel.setLabelFor(_tfMaxRepeatsValue);
+
+ _minCategoriesLabel = makeJLabel(_section, "mincategories");
+
+ _tfMinCategoriesValue = makeNumericalJTextField(_section, "mincategories");
+ _minCategoriesLabel.setLabelFor(_tfMinCategoriesValue);
+
+ _minTokenLengthLabel = makeJLabel(_section, "mintokenlength");
+
+ _tfMinTokenLengthValue = makeNumericalJTextField(_section, "mintokenlength");
+ _minTokenLengthLabel.setLabelFor(_tfMinTokenLengthValue);
+
+ // tie components to config attributes
DSEntrySet entries = getDSEntrySet();
- DSEntryInteger minDSEntry = new DSEntryInteger("", _tfMinLengthValue,
- _minLengthLabel,MINLENGTH_MIN_VAL, MINLENGTH_MAX_VAL, 1);
- entries.add(_policyspecdn, MINLENGTH_ATTR_NAME, minDSEntry);
- setComponentTable(_tfMinLengthValue, minDSEntry);
+
+ DSEntryBoolean se = new DSEntryBoolean( "off", _cbCheckSyntax );
+ entries.add( _policyspecdn, SYNTAX_ATTR_NAME, se );
+ setComponentTable(_cbCheckSyntax, se);
+
+ DSEntryInteger minLengthDSEntry = new DSEntryInteger(MINLENGTH_DEFAULT_VAL,
+ _tfMinLengthValue, _minLengthLabel, MINLENGTH_MIN_VAL, MINLENGTH_MAX_VAL, 1);
+ entries.add(_policyspecdn, MINLENGTH_ATTR_NAME, minLengthDSEntry);
+ setComponentTable(_tfMinLengthValue, minLengthDSEntry);
+
+ DSEntryInteger minDigitsDSEntry = new DSEntryInteger(MINDIGITS_DEFAULT_VAL,
+ _tfMinDigitsValue, _minDigitsLabel, MINDIGITS_MIN_VAL, MINDIGITS_MAX_VAL, 1);
+ entries.add(_policyspecdn, MINDIGITS_ATTR_NAME, minDigitsDSEntry);
+ setComponentTable(_tfMinDigitsValue, minDigitsDSEntry);
+
+ DSEntryInteger minAlphasDSEntry = new DSEntryInteger(MINALPHAS_DEFAULT_VAL,
+ _tfMinAlphasValue, _minAlphasLabel, MINALPHAS_MIN_VAL, MINALPHAS_MAX_VAL, 1);
+ entries.add(_policyspecdn, MINALPHAS_ATTR_NAME, minAlphasDSEntry);
+ setComponentTable(_tfMinAlphasValue, minAlphasDSEntry);
+
+ DSEntryInteger minUppersDSEntry = new DSEntryInteger(MINUPPERS_DEFAULT_VAL,
+ _tfMinUppersValue, _minUppersLabel, MINUPPERS_MIN_VAL, MINUPPERS_MAX_VAL, 1);
+ entries.add(_policyspecdn, MINUPPERS_ATTR_NAME, minUppersDSEntry);
+ setComponentTable(_tfMinUppersValue, minUppersDSEntry);
+
+ DSEntryInteger minLowersDSEntry = new DSEntryInteger(MINLOWERS_DEFAULT_VAL,
+ _tfMinLowersValue, _minLowersLabel, MINLOWERS_MIN_VAL, MINLOWERS_MAX_VAL, 1);
+ entries.add(_policyspecdn, MINLOWERS_ATTR_NAME, minLowersDSEntry);
+ setComponentTable(_tfMinLowersValue, minLowersDSEntry);
+
+ DSEntryInteger minSpecialsDSEntry = new DSEntryInteger(MINSPECIALS_DEFAULT_VAL,
+ _tfMinSpecialsValue, _minSpecialsLabel, MINSPECIALS_MIN_VAL, MINSPECIALS_MAX_VAL, 1);
+ entries.add(_policyspecdn, MINSPECIALS_ATTR_NAME, minSpecialsDSEntry);
+ setComponentTable(_tfMinSpecialsValue, minSpecialsDSEntry);
+
+ DSEntryInteger min8bitDSEntry = new DSEntryInteger(MIN8BIT_DEFAULT_VAL,
+ _tfMin8bitValue, _min8bitLabel,MIN8BIT_MIN_VAL, MIN8BIT_MAX_VAL, 1);
+ entries.add(_policyspecdn, MIN8BIT_ATTR_NAME, min8bitDSEntry);
+ setComponentTable(_tfMin8bitValue, min8bitDSEntry);
+
+ DSEntryInteger maxRepeatsDSEntry = new DSEntryInteger(MAXREPEATS_DEFAULT_VAL,
+ _tfMaxRepeatsValue, _maxRepeatsLabel,MAXREPEATS_MIN_VAL, MAXREPEATS_MAX_VAL, 1);
+ entries.add(_policyspecdn, MAXREPEATS_ATTR_NAME, maxRepeatsDSEntry);
+ setComponentTable(_tfMaxRepeatsValue, maxRepeatsDSEntry);
+
+ DSEntryInteger minCategoriesDSEntry = new DSEntryInteger(MINCATEGORIES_DEFAULT_VAL,
+ _tfMinCategoriesValue, _minCategoriesLabel,MINCATEGORIES_MIN_VAL, MINCATEGORIES_MAX_VAL, 1);
+ entries.add(_policyspecdn, MINCATEGORIES_ATTR_NAME, minCategoriesDSEntry);
+ setComponentTable(_tfMinCategoriesValue, minCategoriesDSEntry);
+
+ DSEntryInteger minTokenLengthDSEntry = new DSEntryInteger(MINTOKENLENGTH_DEFAULT_VAL,
+ _tfMinTokenLengthValue, _minTokenLengthLabel,MINTOKENLENGTH_MIN_VAL, MINTOKENLENGTH_MAX_VAL, 1);
+ entries.add(_policyspecdn, MINTOKENLENGTH_ATTR_NAME, minTokenLengthDSEntry);
+ setComponentTable(_tfMinTokenLengthValue, minTokenLengthDSEntry);
// create containers and layouts
- JPanel panel =
- new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
- GridBagConstraints gbc = getGBC();
- gbc.gridwidth = gbc.REMAINDER;
- gbc.anchor = gbc.WEST;
- gbc.fill = gbc.HORIZONTAL;
+ JPanel syntaxPanel = new GroupPanel( _resource.getString(_section, "syntax-title"));
+ syntaxPanel.setLayout(new GridBagLayout());
+ GridBagConstraints gbc = getGBC();
+ gbc.gridwidth = gbc.REMAINDER;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
gbc.weightx = 1.0;
- myContainer.add(panel, gbc);
- panel.add(_minLengthLabel);
- int space = UIFactory.getComponentSpace();
- panel.add(Box.createHorizontalStrut(space));
- panel.add(_tfMinLengthValue);
+ myContainer.add(syntaxPanel, gbc);
+
+ GridBagUtil.constrain(syntaxPanel, _cbCheckSyntax, 0, 0,
+ 1, 1, 1.0, 0.0,
+ GridBagConstraints.WEST, GridBagConstraints.NONE,
+ 0, SuiConstants.COMPONENT_SPACE, SuiConstants.COMPONENT_SPACE, 0);
+
+ GridBagUtil.constrain(syntaxPanel, _minLengthLabel, 0, 1,
+ 1, 1, 0.0, 0.0,
+ GridBagConstraints.EAST, GridBagConstraints.NONE,
+ 0, 0, 0, SuiConstants.COMPONENT_SPACE);
+
+ GridBagUtil.constrain(syntaxPanel, _tfMinLengthValue, 1, 1,
+ 1, 1, 1.0, 0.0,
+ GridBagConstraints.WEST, GridBagConstraints.NONE,
+ 0, 0, SuiConstants.COMPONENT_SPACE, 0);
+
+ GridBagUtil.constrain(syntaxPanel, _minDigitsLabel, 0, 2,
+ 1, 1, 0.0, 0.0,
+ GridBagConstraints.EAST, GridBagConstraints.NONE,
+ 0, 0, 0, SuiConstants.COMPONENT_SPACE);
+
+ GridBagUtil.constrain(syntaxPanel, _tfMinDigitsValue, 1, 2,
+ 1, 1, 1.0, 0.0,
+ GridBagConstraints.WEST, GridBagConstraints.NONE,
+ 0, 0, SuiConstants.COMPONENT_SPACE, 0);
+
+ GridBagUtil.constrain(syntaxPanel, _minAlphasLabel, 0, 3,
+ 1, 1, 0.0, 0.0,
+ GridBagConstraints.EAST, GridBagConstraints.NONE,
+ 0, 0, 0, SuiConstants.COMPONENT_SPACE);
+
+ GridBagUtil.constrain(syntaxPanel, _tfMinAlphasValue, 1, 3,
+ 1, 1, 1.0, 0.0,
+ GridBagConstraints.WEST, GridBagConstraints.NONE,
+ 0, 0, SuiConstants.COMPONENT_SPACE, 0);
+
+ GridBagUtil.constrain(syntaxPanel, _minUppersLabel, 0, 4,
+ 1, 1, 0.0, 0.0,
+ GridBagConstraints.EAST, GridBagConstraints.NONE,
+ 0, 0, 0, SuiConstants.COMPONENT_SPACE);
+
+ GridBagUtil.constrain(syntaxPanel, _tfMinUppersValue, 1, 4,
+ 1, 1, 1.0, 0.0,
+ GridBagConstraints.WEST, GridBagConstraints.NONE,
+ 0, 0, SuiConstants.COMPONENT_SPACE, 0);
+
+ GridBagUtil.constrain(syntaxPanel, _minLowersLabel, 0, 5,
+ 1, 1, 0.0, 0.0,
+ GridBagConstraints.EAST, GridBagConstraints.NONE,
+ 0, 0, 0, SuiConstants.COMPONENT_SPACE);
+
+ GridBagUtil.constrain(syntaxPanel, _tfMinLowersValue, 1, 5,
+ 1, 1, 1.0, 0.0,
+ GridBagConstraints.WEST, GridBagConstraints.NONE,
+ 0, 0, SuiConstants.COMPONENT_SPACE, 0);
+
+ GridBagUtil.constrain(syntaxPanel, _minSpecialsLabel, 0, 6,
+ 1, 1, 0.0, 0.0,
+ GridBagConstraints.EAST, GridBagConstraints.NONE,
+ 0, 0, 0, SuiConstants.COMPONENT_SPACE);
+
+ GridBagUtil.constrain(syntaxPanel, _tfMinSpecialsValue, 1, 6,
+ 1, 1, 1.0, 0.0,
+ GridBagConstraints.WEST, GridBagConstraints.NONE,
+ 0, 0, SuiConstants.COMPONENT_SPACE, 0);
+
+ GridBagUtil.constrain(syntaxPanel, _min8bitLabel, 0, 7,
+ 1, 1, 0.0, 0.0,
+ GridBagConstraints.EAST, GridBagConstraints.NONE,
+ 0, 0, 0, SuiConstants.COMPONENT_SPACE);
+
+ GridBagUtil.constrain(syntaxPanel, _tfMin8bitValue, 1, 7,
+ 1, 1, 1.0, 0.0,
+ GridBagConstraints.WEST, GridBagConstraints.NONE,
+ 0, 0, SuiConstants.COMPONENT_SPACE, 0);
+
+ GridBagUtil.constrain(syntaxPanel, _maxRepeatsLabel, 0, 8,
+ 1, 1, 0.0, 0.0,
+ GridBagConstraints.EAST, GridBagConstraints.NONE,
+ 0, 0, 0, SuiConstants.COMPONENT_SPACE);
+
+ GridBagUtil.constrain(syntaxPanel, _tfMaxRepeatsValue, 1, 8,
+ 1, 1, 1.0, 0.0,
+ GridBagConstraints.WEST, GridBagConstraints.NONE,
+ 0, 0, SuiConstants.COMPONENT_SPACE, 0);
+
+ GridBagUtil.constrain(syntaxPanel, _minCategoriesLabel, 0, 9,
+ 1, 1, 0.0, 0.0,
+ GridBagConstraints.EAST, GridBagConstraints.NONE,
+ 0, 0, 0, SuiConstants.COMPONENT_SPACE);
+
+ GridBagUtil.constrain(syntaxPanel, _tfMinCategoriesValue, 1, 9,
+ 1, 1, 1.0, 0.0,
+ GridBagConstraints.WEST, GridBagConstraints.NONE,
+ 0, 0, SuiConstants.COMPONENT_SPACE, 0);
+
+ GridBagUtil.constrain(syntaxPanel, _minTokenLengthLabel, 0, 10,
+ 1, 1, 0.0, 0.0,
+ GridBagConstraints.EAST, GridBagConstraints.NONE,
+ 0, 0, 0, SuiConstants.COMPONENT_SPACE);
+
+ GridBagUtil.constrain(syntaxPanel, _tfMinTokenLengthValue, 1, 10,
+ 1, 1, 1.0, 0.0,
+ GridBagConstraints.WEST, GridBagConstraints.NONE,
+ 0, 0, SuiConstants.COMPONENT_SPACE, 0);
}
+
protected void createExpirationArea( Container myContainer) {
ButtonGroup expirationButtonGroup = new ButtonGroup();
@@ -610,7 +795,7 @@
* @param e event
*/
public void actionPerformed(ActionEvent e) {
- if (e.getSource().equals(_cbCheckSyntax)) {
+ if (e.getSource().equals(_cbCheckSyntax)) {
enableSyntax();
} else if (e.getSource().equals(_cbKeepHistory)) {
enableHistory();
@@ -709,6 +894,42 @@
_minLengthLabel.repaint();
_tfMinLengthValue.setEnabled( enable );
_tfMinLengthValue.repaint();
+ _minDigitsLabel.setEnabled( enable );
+ _minDigitsLabel.repaint();
+ _tfMinDigitsValue.setEnabled( enable );
+ _tfMinDigitsValue.repaint();
+ _minAlphasLabel.setEnabled( enable );
+ _minAlphasLabel.repaint();
+ _tfMinAlphasValue.setEnabled( enable );
+ _tfMinAlphasValue.repaint();
+ _minUppersLabel.setEnabled( enable );
+ _minUppersLabel.repaint();
+ _tfMinUppersValue.setEnabled( enable );
+ _tfMinUppersValue.repaint();
+ _minLowersLabel.setEnabled( enable );
+ _minLowersLabel.repaint();
+ _tfMinLowersValue.setEnabled( enable );
+ _tfMinLowersValue.repaint();
+ _minSpecialsLabel.setEnabled( enable );
+ _minSpecialsLabel.repaint();
+ _tfMinSpecialsValue.setEnabled( enable );
+ _tfMinSpecialsValue.repaint();
+ _min8bitLabel.setEnabled( enable );
+ _min8bitLabel.repaint();
+ _tfMin8bitValue.setEnabled( enable );
+ _tfMin8bitValue.repaint();
+ _maxRepeatsLabel.setEnabled( enable );
+ _maxRepeatsLabel.repaint();
+ _tfMaxRepeatsValue.setEnabled( enable );
+ _tfMaxRepeatsValue.repaint();
+ _minCategoriesLabel.setEnabled( enable );
+ _minCategoriesLabel.repaint();
+ _tfMinCategoriesValue.setEnabled( enable );
+ _tfMinCategoriesValue.repaint();
+ _minTokenLengthLabel.setEnabled( enable );
+ _minTokenLengthLabel.repaint();
+ _tfMinTokenLengthValue.setEnabled( enable );
+ _tfMinTokenLengthValue.repaint();
}
private void enableChange (){
@@ -910,6 +1131,24 @@
private JLabel _minLengthLabel;
private JTextField _tfMinLengthValue;
+ private JLabel _minDigitsLabel;
+ private JTextField _tfMinDigitsValue;
+ private JLabel _minAlphasLabel;
+ private JTextField _tfMinAlphasValue;
+ private JLabel _minUppersLabel;
+ private JTextField _tfMinUppersValue;
+ private JLabel _minLowersLabel;
+ private JTextField _tfMinLowersValue;
+ private JLabel _minSpecialsLabel;
+ private JTextField _tfMinSpecialsValue;
+ private JLabel _min8bitLabel;
+ private JTextField _tfMin8bitValue;
+ private JLabel _maxRepeatsLabel;
+ private JTextField _tfMaxRepeatsValue;
+ private JLabel _minCategoriesLabel;
+ private JTextField _tfMinCategoriesValue;
+ private JLabel _minTokenLengthLabel;
+ private JTextField _tfMinTokenLengthValue;
private JRadioButton _rbNever;
private JRadioButton _rbExpiresIn;
@@ -995,10 +1234,64 @@
"passwordCheckSyntax";
private static final String MINLENGTH_DN = "cn=config";
- private static final String MINLENGTH_ATTR_NAME =
- "passwordMinLength";
+ private static final String MINLENGTH_ATTR_NAME = "passwordMinLength";
private static final int MINLENGTH_MIN_VAL = 2;
private static final int MINLENGTH_MAX_VAL = 512;
+ private static final String MINLENGTH_DEFAULT_VAL = "8";
+
+ private static final String MINDIGITS_DN = "cn=config";
+ private static final String MINDIGITS_ATTR_NAME = "passwordMinDigits";
+ private static final int MINDIGITS_MIN_VAL = 0;
+ private static final int MINDIGITS_MAX_VAL = 64;
+ private static final String MINDIGITS_DEFAULT_VAL = "0";
+
+ private static final String MINALPHAS_DN = "cn=config";
+ private static final String MINALPHAS_ATTR_NAME = "passwordMinAlphas";
+ private static final int MINALPHAS_MIN_VAL = 0;
+ private static final int MINALPHAS_MAX_VAL = 64;
+ private static final String MINALPHAS_DEFAULT_VAL = "0";
+
+ private static final String MINUPPERS_DN = "cn=config";
+ private static final String MINUPPERS_ATTR_NAME = "passwordMinUppers";
+ private static final int MINUPPERS_MIN_VAL = 0;
+ private static final int MINUPPERS_MAX_VAL = 64;
+ private static final String MINUPPERS_DEFAULT_VAL = "0";
+
+ private static final String MINLOWERS_DN = "cn=config";
+ private static final String MINLOWERS_ATTR_NAME = "passwordMinLowers";
+ private static final int MINLOWERS_MIN_VAL = 0;
+ private static final int MINLOWERS_MAX_VAL = 64;
+ private static final String MINLOWERS_DEFAULT_VAL = "0";
+
+ private static final String MINSPECIALS_DN = "cn=config";
+ private static final String MINSPECIALS_ATTR_NAME = "passwordMinSpecials";
+ private static final int MINSPECIALS_MIN_VAL = 0;
+ private static final int MINSPECIALS_MAX_VAL = 64;
+ private static final String MINSPECIALS_DEFAULT_VAL = "0";
+
+ private static final String MIN8BIT_DN = "cn=config";
+ private static final String MIN8BIT_ATTR_NAME = "passwordMin8bit";
+ private static final int MIN8BIT_MIN_VAL = 0;
+ private static final int MIN8BIT_MAX_VAL = 64;
+ private static final String MIN8BIT_DEFAULT_VAL = "0";
+
+ private static final String MAXREPEATS_DN = "cn=config";
+ private static final String MAXREPEATS_ATTR_NAME = "passwordMaxRepeats";
+ private static final int MAXREPEATS_MIN_VAL = 0;
+ private static final int MAXREPEATS_MAX_VAL = 64;
+ private static final String MAXREPEATS_DEFAULT_VAL = "0";
+
+ private static final String MINCATEGORIES_DN = "cn=config";
+ private static final String MINCATEGORIES_ATTR_NAME = "passwordMinCategories";
+ private static final int MINCATEGORIES_MIN_VAL = 1;
+ private static final int MINCATEGORIES_MAX_VAL = 5;
+ private static final String MINCATEGORIES_DEFAULT_VAL = "3";
+
+ private static final String MINTOKENLENGTH_DN = "cn=config";
+ private static final String MINTOKENLENGTH_ATTR_NAME = "passwordMinTokenLength";
+ private static final int MINTOKENLENGTH_MIN_VAL = 1;
+ private static final int MINTOKENLENGTH_MAX_VAL = 64;
+ private static final String MINTOKENLENGTH_DEFAULT_VAL = "3";
private static final String EXPIRES_DN = "cn=config";
private static final String EXPIRES_ATTR_NAME = "passwordExp";
18 years, 3 months
[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv dirserv.properties, 1.2, 1.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27837
Modified Files:
dirserv.properties
Log Message:
Bug(s) fixed: 181570
Bug Description: The UI for the new password syntax enhancements needs to be created.
Reviewed by: Rich, Noriko (thanks!)
Files: see diffs
Branch: HEAD (directoryconsole)
Fix Description: This adds input fields for the new password syntax config parameters. The
new fields are added uder the "Configuration->Data->Passwords" tab. This revised set of
diffs fixes an issue where the default values when setting up a per-user or per-subtree password
policy were all showing up as 0. This was due to DSEntrySet overwriting the default component
values with a null string if the passwordPolicy LDAP entry did not exist.
Flag Day: no
Doc impact: no
QA impact: Console testplan will need to be updated.
New Tests integrated into TET: none
Index: dirserv.properties
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/dirserv.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dirserv.properties 28 Oct 2005 18:01:34 -0000 1.2
+++ dirserv.properties 15 Feb 2006 23:00:50 -0000 1.3
@@ -1586,7 +1586,6 @@
passwordpolicy-check-default=false
passwordpolicy-minlength-label=Password minimum length
passwordpolicy-minlength-ttip=When syntax checking is on, reject passwords with fewer than this many characters
-passwordpolicy-minlength-default=6
passwordpolicy-minlength-columns=4
passwordpolicy-expiration-title=Password Expiration
passwordpolicy-neverexpire-label=Password never expires
@@ -1606,6 +1605,35 @@
passwordpolicy-sendwarning2-label=day(s) before password expires
passwordpolicy-sendwarning2-ttip=Notify users this many days before their password expires
+passwordpolicy-syntax-title=Password Syntax
+passwordpolicy-mindigits-label=Minimum required digit characters
+passwordpolicy-mindigits-ttip=Reject passwords with fewer than this many digit characters (0-9)
+passwordpolicy-mindigits-columns=4
+passwordpolicy-minalphas-label=Minimum required alpha characters
+passwordpolicy-minalphas-ttip=Reject passwords with fewer than this many alpha characters (uppercase and lowercase 7-bit ASCII)
+passwordpolicy-minalphas-columns=4
+passwordpolicy-minuppers-label=Minimum required uppercase characters
+passwordpolicy-minuppers-ttip=Reject passwords with fewer than this many uppercase characters (7-bit ASCII)
+passwordpolicy-minuppers-columns=4
+passwordpolicy-minlowers-label=Minimum required lowercase characters
+passwordpolicy-minlowers-ttip=Reject passwords with fewer than this many lowercase characters (7-bit ASCII)
+passwordpolicy-minlowers-columns=4
+passwordpolicy-minspecials-label=Minimum required special characters
+passwordpolicy-minspecials-ttip=Reject passwords with fewer than this many special characters (non-alphanumeric 7-bit ASCII)
+passwordpolicy-minspecials-columns=4
+passwordpolicy-min8bit-label=Minimum required 8-bit characters
+passwordpolicy-min8bit-ttip=Reject passwords with fewer than this many 8-bit or multi-byte characters
+passwordpolicy-min8bit-columns=4
+passwordpolicy-maxrepeats-label=Maximum number of repeated characters
+passwordpolicy-maxrepeats-ttip=The maximum number of times the same character can sequentially appear in a password
+passwordpolicy-maxrepeats-columns=4
+passwordpolicy-mincategories-label=Minimum required character categories
+passwordpolicy-mincategories-ttip=The minimum number of character categories that a password must contain (categories are upper, lower, digit, special, and 8-bit)
+passwordpolicy-mincategories-columns=4
+passwordpolicy-mintokenlength-label=Minimum token length
+passwordpolicy-mintokenlength-ttip=The smallest attribute value used when checking if the password contains account information
+passwordpolicy-mintokenlength-columns=4
+
passwordpolicy-gracelogin-label=Allow up to
passwordpolicy-gracelogin-ttip=Allow this many login attempts after password has expired
passwordpolicy-gracelogin-default=3
18 years, 3 months
[Fedora-directory-commits] dsbuild/ds/ldapserver Makefile,1.2,1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27759/dsbuild/ds/ldapserver
Modified Files:
Makefile
Log Message:
Add support for x86_64
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 14 Feb 2006 22:29:06 -0000 1.2
+++ Makefile 15 Feb 2006 22:55:46 -0000 1.3
@@ -5,7 +5,7 @@
CATEGORIES = ds
# have the regular download rule download the patch rather than listing it in PATCHFILES
# this is so we can override the default patch rule
-MYPATCH = ldapserver-gcc4.patch
+#MYPATCH = ldapserver-gcc4.patch
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz $(MYPATCH)
PATCHFILES =
@@ -49,7 +49,9 @@
# this is our "custom" patch target
post-patch:
+ifdef MYPATCH
cat $(addprefix download/,$(MYPATCH)) | ( cd work/$(GARNAME)-$(GARVERSION) ; patch -p1 )
+endif
$(MAKECOOKIE)
configure-custom:
18 years, 3 months
[Fedora-directory-commits] dsbuild objdirname.mk,1.1.1.1,1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27759/dsbuild
Modified Files:
objdirname.mk
Log Message:
Add support for x86_64
Index: objdirname.mk
===================================================================
RCS file: /cvs/dirsec/dsbuild/objdirname.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- objdirname.mk 10 Feb 2006 15:28:53 -0000 1.1.1.1
+++ objdirname.mk 15 Feb 2006 22:55:40 -0000 1.2
@@ -76,10 +76,16 @@
PRETTY_ARCH := Linux
endif
+ifeq ($(USE_64), 1)
+ NS64TAG=_64
+endif
+
NSOS_TEST1 := $(shell uname -m)
ifeq ($(NSOS_ARCH),Linux)
- ifeq (86,$(findstring 86,$(NSOS_TEST1)))
- NSOS_TEST1 = x86
+ ifneq (x86_64, $(NSOS_TEST1))
+ ifeq (86,$(findstring 86,$(NSOS_TEST1)))
+ NSOS_TEST1 = x86
+ endif
endif
ifeq ($(USE_LIBC),1)
@@ -95,8 +101,10 @@
NSCONFIG_NOTAG = $(NSCONFIG)
else
ifeq ($(NSOS_ARCH),RHEL)
- ifeq (86,$(findstring 86,$(NSOS_TEST1)))
- NSOS_TEST1 = x86
+ ifneq (x86_64, $(NSOS_TEST1))
+ ifeq (86,$(findstring 86,$(NSOS_TEST1)))
+ NSOS_TEST1 = x86
+ endif
endif
NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION)
NSCONFIG_NOTAG = $(NSCONFIG)
@@ -119,6 +127,8 @@
NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)
endif
endif
+ NSCONFIG += $(NS64TAG)
+ NSCONFIG_NOTAG += $(NS64TAG)
endif
endif
@@ -132,17 +142,17 @@
OBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
OBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
else
- OBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
- OBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
- OBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
+ OBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
+ OBJDIR_NAME_32 = $(subst $(NS64TAG),,$(OBJDIR_NAME))
+ OBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NSOBJDIR_TAG).OBJ
endif
# Mozilla uses a slightly different naming convention
ifneq (,$(findstring RHEL3,$(OBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL3,Linux2.4,$(OBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(OBJDIR_NAME)))
else
ifneq (,$(findstring RHEL4,$(OBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL4,Linux2.6,$(OBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(OBJDIR_NAME)))
else
MOZ_OBJDIR_NAME = $(OBJDIR_NAME)
endif
18 years, 3 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication repl5_replica.c, 1.11, 1.12
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647/ldapserver/ldap/servers/plugins/replication
Modified Files:
repl5_replica.c
Log Message:
The correct naming convention for RHEL is
RHEL4_x86_64_gcc3_OPT.OBJ
The makefiles were assuming that if the string 86 was found in uname -m
it should use x86 for the arch. However, it should only do this if
uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the
NS64TAG just before the _OPT (or _DBG) since it's already in the arch.
Other platforms continue to use the other naming convention. The
default naming convention for the mozilla components is
Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's
instructions about source builds, but that would cause many changes to
be made to our makefiles, so I just changed the way we calculate the
mozilla OBJDIR name from the regular OBJDIR name. These changes are
pretty much the same for adminutil, setuputil, adminserver, and ldapserver.
For ldapserver, I had to change nsarch (adminserver changed nsarch in a
different way). I also got rid of the 32 bit specific setup stuff. I
assume this was due to 32 bit NES admin server, so we can get rid of
this for the future, because we will have all native 64 bit apps. I also
went ahead and rolled in the gcc4 changes since they are safe for gcc3
as well.
Index: repl5_replica.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_replica.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- repl5_replica.c 19 Apr 2005 22:07:32 -0000 1.11
+++ repl5_replica.c 15 Feb 2006 22:54:07 -0000 1.12
@@ -108,9 +108,9 @@
static char * _replica_get_config_dn (const Slapi_DN *root);
static char * _replica_type_as_string (const Replica *r);
/* DBDB, I think this is probably bogus : */
-int replica_create_ruv_tombstone(Replica *r);
-void assign_csn_callback(const CSN *csn, void *data);
-void abort_csn_callback(const CSN *csn, void *data);
+static int replica_create_ruv_tombstone(Replica *r);
+static void assign_csn_callback(const CSN *csn, void *data);
+static void abort_csn_callback(const CSN *csn, void *data);
static void eq_cb_reap_tombstones(time_t when, void *arg);
static CSN *_replica_get_purge_csn_nolock (const Replica *r);
static void replica_get_referrals_nolock (const Replica *r, char ***referrals);
18 years, 3 months
[Fedora-directory-commits] ldapserver/ldap/cm/newinst Makefile, 1.8, 1.9
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647/ldapserver/ldap/cm/newinst
Modified Files:
Makefile
Log Message:
The correct naming convention for RHEL is
RHEL4_x86_64_gcc3_OPT.OBJ
The makefiles were assuming that if the string 86 was found in uname -m
it should use x86 for the arch. However, it should only do this if
uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the
NS64TAG just before the _OPT (or _DBG) since it's already in the arch.
Other platforms continue to use the other naming convention. The
default naming convention for the mozilla components is
Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's
instructions about source builds, but that would cause many changes to
be made to our makefiles, so I just changed the way we calculate the
mozilla OBJDIR name from the regular OBJDIR name. These changes are
pretty much the same for adminutil, setuputil, adminserver, and ldapserver.
For ldapserver, I had to change nsarch (adminserver changed nsarch in a
different way). I also got rid of the 32 bit specific setup stuff. I
assume this was due to 32 bit NES admin server, so we can get rid of
this for the future, because we will have all native 64 bit apps. I also
went ahead and rolled in the gcc4 changes since they are safe for gcc3
as well.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile 22 Sep 2005 16:48:16 -0000 1.8
+++ Makefile 15 Feb 2006 22:54:02 -0000 1.9
@@ -41,12 +41,6 @@
.SUFFIXES: .cc
-# We do this to force a 32-bit build of this stuff, even in a 64-bit build
-# (because we want to avoid various complexities inherenet in having a 64-bit
-# installer rubbing shoulders with other 32-bit stuff at install time).
-COMPONENT_DEPS := 1
-override USE_64=
-
BUILD_ROOT = ../../..
LDAP_SRC = ../..
@@ -96,7 +90,7 @@
BINS=$(addprefix $(BINDEST)/, $(PROGS))
endif
INFO= $(OBJDIR)/$(DIR)
-PATCHINFO= $(ORIGINAL_OBJDIR)/$(DIR)
+PATCHINFO= $(ABS_OBJDIR)/$(DIR)
# Source for staged installation utilities
INCDIR=$(SETUPUTIL_INCLUDE) -I$(LDAP_SRC)/admin/include -I$(LDAP_SRC)/admin/lib -I$(LDAP_SRC)/admin/src
18 years, 3 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.48,1.49
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647/ldapserver/ldap/cm
Modified Files:
Makefile
Log Message:
The correct naming convention for RHEL is
RHEL4_x86_64_gcc3_OPT.OBJ
The makefiles were assuming that if the string 86 was found in uname -m
it should use x86 for the arch. However, it should only do this if
uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the
NS64TAG just before the _OPT (or _DBG) since it's already in the arch.
Other platforms continue to use the other naming convention. The
default naming convention for the mozilla components is
Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's
instructions about source builds, but that would cause many changes to
be made to our makefiles, so I just changed the way we calculate the
mozilla OBJDIR name from the regular OBJDIR name. These changes are
pretty much the same for adminutil, setuputil, adminserver, and ldapserver.
For ldapserver, I had to change nsarch (adminserver changed nsarch in a
different way). I also got rid of the 32 bit specific setup stuff. I
assume this was due to 32 bit NES admin server, so we can get rid of
this for the future, because we will have all native 64 bit apps. I also
went ahead and rolled in the gcc4 changes since they are safe for gcc3
as well.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Makefile 13 Feb 2006 22:25:33 -0000 1.48
+++ Makefile 15 Feb 2006 22:53:56 -0000 1.49
@@ -254,11 +254,15 @@
ZIP_FLAGS=-r -T -n .gif
endif
+ifeq ($(ARCH), Linux)
+MAKEARCH=$(ARCH)
+else
ifeq ($(USE_64), 1)
MAKEARCH=$(ARCH)64
else
MAKEARCH=$(ARCH)
endif
+endif
PACKAGE_SETUP_LIBS_32=$(subst $(NS64TAG),,$(PACKAGE_SETUP_LIBS))
@@ -598,7 +602,7 @@
endif
# copy in our product .inf files
- $(INSTALL) -m 755 $(OBJDIR_32)/*.inf $(INSTDIR)/slapd
+ $(INSTALL) -m 755 $(OBJDIR)/*.inf $(INSTDIR)/slapd
# strip the executables in the optimized build
ifeq ($(DEBUG), optimize)
@@ -668,10 +672,10 @@
# do one last check for aix. aix zip doesn't like -r -T
$(ZIP) -T $(INSTDIR)/slapd/ns$(DIR).zip
# install the ns-config file into the slapd package directory
- $(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(INSTDIR)/slapd
+ $(INSTALL) -m 755 $(RELDIR)/bin/slapd/admin/bin/ns-config $(INSTDIR)/slapd
# if we are packaging our own version of the components, we need them during setup too
- -@for file in $(PACKAGE_SETUP_LIBS_32) ; \
+ -@for file in $(PACKAGE_SETUP_LIBS) ; \
do if [ -f $$file ] ; \
then $(INSTALL) -m 755 $$file $(INSTDIR)/slapd ; \
fi ; \
18 years, 3 months