December 2007 - 389-commits - Fedora Mailing-Lists

[Fedora-directory-commits] adminserver/admserv/schema/ldif 16dssuffixadmin.mod.tmpl, NONE, 1.1 12dsconfig.mod.tmpl, 1.1, 1.2 13dsschema.mod.tmpl, 1.1, 1.2

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/schema/ldif In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13672/adminserver/admserv/schema/ldif Modified Files: 12dsconfig.mod.tmpl 13dsschema.mod.tmpl Added Files: 16dssuffixadmin.mod.tmpl Log Message: Resolves: bug 420751 Bug Description: Console admin user unable to manage users&groups Reviewed by: nkinder, nhosoi (Thanks!) Fix Description: I added a new template file for adding the acis to the default suffix. I also fixed a couple of places in the other template files where we were referring to uid=admin instead of uid=%as_uid%, in case the user doesn't use the default "admin" for the console admin. Platforms tested: RHEL5 x86_64 Flag Day: Yes - autotool file change Doc impact: no --- NEW FILE 16dssuffixadmin.mod.tmpl --- # BEGIN COPYRIGHT BLOCK # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # # 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; either version 2 # of the License, or (at your option) any later version. # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # END COPYRIGHT BLOCK dn: %ds_suffix% changetype: modify add: aci aci: (targetattr="*")(version 3.0; acl "Configuration Administrators Group"; allow (all) groupdn="ldap:///cn=Configuration Administrators, ou=Groups, ou=TopologyManagement, o=NetscapeRoot";) aci: (targetattr="*")(version 3.0; acl "Configuration Administrator"; allow (all) userdn="ldap:///uid=%as_uid%,ou=Administrators, ou=TopologyManagement, o=NetscapeRoot";) aci: (targetattr = "*")(version 3.0; acl "SIE Group"; allow (all) groupdn = "ldap:///cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";) Index: 12dsconfig.mod.tmpl =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/12dsconfig.mod.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 12dsconfig.mod.tmpl 20 Jun 2007 23:50:11 -0000 1.1 +++ 12dsconfig.mod.tmpl 12 Dec 2007 00:45:38 -0000 1.2 @@ -21,7 +21,7 @@ changetype: modify add: aci aci: (targetattr="*")(version 3.0; acl "Configuration Administrators Group"; allow (all) groupdn="ldap:///cn=Configuration Administrators, ou=Groups, ou=TopologyManagement, o=NetscapeRoot";) -aci: (targetattr="*")(version 3.0; acl "Configuration Administrator"; allow (all) userdn="ldap:///uid=admin, ou=Administrators, ou=TopologyManagement, o=NetscapeRoot";) +aci: (targetattr="*")(version 3.0; acl "Configuration Administrator"; allow (all) userdn="ldap:///uid=%as_uid%, ou=Administrators, ou=TopologyManagement, o=NetscapeRoot";) aci: (targetattr = "*")(version 3.0; acl "SIE Group"; allow (all) groupdn = "ldap:///cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";) dn: cn=SNMP,cn=config Index: 13dsschema.mod.tmpl =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/13dsschema.mod.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 13dsschema.mod.tmpl 20 Jun 2007 23:50:11 -0000 1.1 +++ 13dsschema.mod.tmpl 12 Dec 2007 00:45:38 -0000 1.2 @@ -22,5 +22,5 @@ add: aci aci: (target="ldap:///cn=schema")(targetattr !="aci")(version 3.0;acl "anonymous, no acis"; allow (read, search, compare) userdn = "ldap:///anyone";) aci: (targetattr="*")(version 3.0; acl "Configuration Administrators Group"; allow (all) groupdn="ldap:///cn=Configuration Administrators, ou=Groups, ou=TopologyManagement, o=NetscapeRoot";) -aci: (targetattr="*")(version 3.0; acl "Configuration Administrator"; allow (all) userdn="ldap:///uid=admin,ou=Administrators, ou=TopologyManagement, o=NetscapeRoot";) +aci: (targetattr="*")(version 3.0; acl "Configuration Administrator"; allow (all) userdn="ldap:///uid=%as_uid%,ou=Administrators, ou=TopologyManagement, o=NetscapeRoot";) aci: (targetattr = "*")(version 3.0; acl "SIE Group"; allow (all) groupdn = "ldap:///cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)

16 years, 4 months

1
0
0 / 0

[Fedora-directory-commits] admservconsole/src/com/netscape/management/admserv/panel CGIAccessSetup.java, 1.3, 1.4

by Doctor Conrad

Author: nhosoi Update of /cvs/dirsec/admservconsole/src/com/netscape/management/admserv/panel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5734 Modified Files: CGIAccessSetup.java Log Message: Resolves: #400341 Summary: Console: unable to reset admin user password (Comment #7) Description: Adding the code to check if the login user matches the Admin User or not using the regular expression. Index: CGIAccessSetup.java =================================================================== RCS file: /cvs/dirsec/admservconsole/src/com/netscape/management/admserv/panel/CGIAccessSetup.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CGIAccessSetup.java 5 Dec 2007 19:54:23 -0000 1.3 +++ CGIAccessSetup.java 10 Dec 2007 18:24:13 -0000 1.4 @@ -50,6 +50,7 @@ /** * CGI arguments used in setConfiguration() */ + // We may want to remove this since we won't be calling set with a new UID public String getCGIParamsForSetOp() { String uid = getAttribute(AttrNames.ADMPW_UID); return "op=set&" + AttrNames.ADMPW_UID + "=" + @@ -61,7 +62,7 @@ super.save(); - // Use change-sie-passwod command to change the password + // Use change-sie-password command to change the password String pwd = getAttribute(AttrNames.ADMPW_PWD); if (pwd != null) { @@ -74,21 +75,25 @@ _consoleInfo.getAuthenticationDN(), _consoleInfo.getAuthenticationPassword()); } catch (MalformedURLException e) { - Debug.println("CGIAccessSetup.save: "+e); + Debug.println("CGIDataModel.setConfiguration "+e); throw new RemoteRequestException(e); } if (0 == task.exec()) { // Since we've updated the Admin Password, // let's update the one in _consoleInfo. - _consoleInfo.setAuthenticationPassword(pwd); + // But, only do this if we are logged in as the admin user! + String authDN = _consoleInfo.getAuthenticationDN().toLowerCase(); + String authUID = getAttribute(AttrNames.ADMPW_UID).toLowerCase(); + if (authDN.matches("uid=" + authUID + ", *ou=administrators, *ou=topologymanagement, *o=netscaperoot")) { + _consoleInfo.setAuthenticationPassword(pwd); + } } int status = task.getStatus(); + Debug.println(adminURL + " "+status); AdminOperation.processAdmTaskStatus(adminURL, task, _consoleInfo); } } - - }

16 years, 4 months

1
0
0 / 0

[Fedora-directory-commits] admservconsole/src/com/netscape/management/admserv/panel AccessConfigPanel.java, 1.1.1.1, 1.2

by Doctor Conrad

Author: nhosoi Update of /cvs/dirsec/admservconsole/src/com/netscape/management/admserv/panel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27220 Modified Files: AccessConfigPanel.java Log Message: Resolves: #416311 Summary: Admin Console: change admin user text field to label Description: Username value is a text field. By default, it is "admin" and it is the uid attribute value of admin entry. It can be changed (e.g., newadmin), but the uid attribute value is not touched. This causes both "newadmin" and "admin" can be used to login, which is confusing. Since uid attribute value is not modified together, there is no much sense to allow the username modifiable. changing the type to label. Index: AccessConfigPanel.java =================================================================== RCS file: /cvs/dirsec/admservconsole/src/com/netscape/management/admserv/panel/AccessConfigPanel.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- AccessConfigPanel.java 22 May 2006 18:14:45 -0000 1.1.1.1 +++ AccessConfigPanel.java 10 Dec 2007 17:24:21 -0000 1.2 @@ -56,7 +56,7 @@ Help _help; JCheckBox _cbDSGW; - SingleByteTextField _txtUserName; + JLabel _lblUserName; SingleBytePasswordField _txtPassword, _txtConfirm; @@ -104,7 +104,6 @@ } public void registerEditComponents(EditMonitor editMonitor) { - editMonitor.monitor(_txtUserName); editMonitor.monitor(_txtPassword); editMonitor.monitor(_txtConfirm); //editMonitor.monitor(_cbDSGW); @@ -125,42 +124,27 @@ //String dsgw = (_cbDSGW.isSelected()) ? "on" : "off"; //data.setAttribute(AttrNames.CONFIG_DSGW, dsgw); - String newuid = _txtUserName.getText(); String newpw1 = _txtPassword.getText(); String newpw2 = _txtConfirm.getText(); String olduid = _configData.getAttribute(AttrNames.ADMPW_UID); - if (newuid.length() == 0) { - throw new ValidationException("", _i18nMsgEnterUID); - } - // User name changed - else if (!olduid.equals(newuid)) { - if (newpw1.length() == 0) { - throw new ValidationException("", _i18nMsgEnterPWD); - } else if (!newpw1.equals(newpw2)) { + // check if password changed + if (newpw1.length() != 0) { + if (!newpw1.equals(newpw2)) { throw new ValidationException("", _i18nMsgPWDMismatch); } - } else { // check if password changed - if (newpw1.length() != 0) { - if (!newpw1.equals(newpw2)) { - throw new ValidationException("", _i18nMsgPWDMismatch); - } - } } - if (! newuid.equals(olduid)) { - Debug.println("CHANGE UID TO " + newuid); - _configData.setAttribute(AttrNames.ADMPW_UID, newuid); - } if (newpw1.length() > 0) { - Debug.println("CHANGE PWD "); + Debug.println("CHANGE PWD TO " + newpw1); _configData.setAttribute(AttrNames.ADMPW_PWD, newpw1); } } private void setUserName(String name) { - _txtUserName.setText((name == null) ? "" : name); + _lblUserName.setText((name == null) ? "" : name); + _lblUserName.repaint(); } @@ -208,13 +192,14 @@ GBC.NONE); //fill group.add(uidLabel, gbc); - _txtUserName = new SingleByteTextField(16); + // Changed from textfield to a label whose contents is fetched by the CGI + _lblUserName = new JLabel("."); // will be overridden gbc.setInsets(0, DIFFERENT_COMPONENT_SPACE, 0, 0); gbc.setGrid(1, 0, 1, 1); gbc.setSpace(0.0, 0.0, GBC.WEST, // anchor GBC.HORIZONTAL); //fill - group.add(_txtUserName, gbc); - uidLabel.setLabelFor(_txtUserName); + group.add(_lblUserName, gbc); + uidLabel.setLabelFor(_lblUserName); JLabel pwdLabel = new JLabel(_i18nPWD); gbc.setInsets(COMPONENT_SPACE, 0, 0, 0);

16 years, 4 months

1
0
0 / 0

[Fedora-directory-commits] ldapserver/ldap/servers/slapd/tools dbscan.c, 1.19, 1.20

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/tools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20350 Modified Files: dbscan.c Log Message: Resolves: bug 416721 Descriptionn: fedora-ds-base build problem Fix Description: Correct usage of va_list and vfprintf Index: dbscan.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/dbscan.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- dbscan.c 28 Nov 2007 17:21:39 -0000 1.19 +++ dbscan.c 8 Dec 2007 19:17:37 -0000 1.20 @@ -142,6 +142,7 @@ va_start(ap, fmt); vfprintf(stdout, fmt, ap); + va_end(ap); } void db_printfln(char *fmt, ...) @@ -150,7 +151,8 @@ va_start(ap, fmt); vfprintf(stdout, fmt, ap); - vfprintf(stdout, "\n", NULL); + va_end(ap); + fprintf(stdout, "\n"); } int MAX_BUFFER = 4096;

16 years, 4 months

1
0
0 / 0

[Fedora-directory-commits] adminserver/wrappers initscript.in, 1.3, 1.4

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminserver/wrappers In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2050/adminserver/wrappers Modified Files: initscript.in Log Message: Resolves: bug 400221 Bug Description: init.d scripts to restart ds instance on solaris produces output with -n Reviewed by: nhosoi (Thanks!) Fix Description: We cannot figure out at build time whether to use echo -n or echo \c because the user may use a different shell at run time e.g. using bash to run configure but using /sbin/sh at run time. So, we just figure out at runtime what kind of echo is being used and deal with it. Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: initscript.in =================================================================== RCS file: /cvs/dirsec/adminserver/wrappers/initscript.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- initscript.in 8 Oct 2007 14:37:29 -0000 1.3 +++ initscript.in 8 Dec 2007 17:42:49 -0000 1.4 @@ -24,10 +24,17 @@ exit 0 fi -# Solaris echo cannot use -n - linux echo by default cannot use \c +# figure out which echo we're using +ECHO_N=`echo -n` + +# some shells echo cannot use -n - linux echo by default cannot use \c echo_n() { - echo @ECHO_N@ "$*@ECHO_C@" + if [ "$ECHO_N" = '-n' ] ; then + echo "$*\c" + else + echo -n "$*" + fi } # failure and success are not defined on some platforms

16 years, 4 months

1
0
0 / 0

[Fedora-directory-commits] ldapserver/wrappers initscript.in, 1.7, 1.8

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/ldapserver/wrappers In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1859/ldapserver/wrappers Modified Files: initscript.in Log Message: Reviewed by: nhosoi (Thanks!) Fix Description: We cannot figure out at build time whether to use echo -n or echo \c because the user may use a different shell at run time e.g. using bash to run configure but using /sbin/sh at run time. So, we just figure out at runtime what kind of echo is being used and deal with it. Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: initscript.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/initscript.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- initscript.in 5 Oct 2007 23:45:50 -0000 1.7 +++ initscript.in 8 Dec 2007 17:40:32 -0000 1.8 @@ -26,10 +26,17 @@ exit 0 fi -# Solaris echo cannot use -n - linux echo by default cannot use \c +# figure out which echo we're using +ECHO_N=`echo -n` + +# some shells echo cannot use -n - linux echo by default cannot use \c echo_n() { - echo @ECHO_N@ "$*@ECHO_C@" + if [ "$ECHO_N" = '-n' ] ; then + echo "$*\c" + else + echo -n "$*" + fi } # failure and success are not defined on some platforms

16 years, 4 months

1
0
0 / 0

[Fedora-directory-commits] Only 3 Days Left - Get Your Sample!‏

by Doctor Conrad

16 years, 4 months

1
0
0 / 0

[Fedora-directory-commits] console/src/com/netscape/management/client/console Console.java, 1.11, 1.12

by Doctor Conrad

Author: nhosoi Update of /cvs/dirsec/console/src/com/netscape/management/client/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16262 Modified Files: Console.java Log Message: Resolves: #192022 Summary: Admin Server fails to bring up Config DS (Comment #8) Description: _splashScreen.toFront(); was called before displaying the dialog, which caused the dialog hidden behind the splash screen. By removing the toFront line, we can see the dialog. Index: Console.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/Console.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Console.java 26 Jul 2007 23:08:48 -0000 1.11 +++ Console.java 7 Dec 2007 20:44:38 -0000 1.12 @@ -1314,7 +1314,6 @@ rd.showModal(); if (rd.isCancel()) System.exit(0); - _splashScreen.toFront(); if (!restartDirectoryServer(rd.getUsername(), rd.getPassword(), rd.getURL())) {

16 years, 4 months

1
0
0 / 0

[Fedora-directory-commits] adminserver/admserv/html admserv.html, 1.2, 1.3 admserv_dsgw.html, 1.1, 1.2 admserv_orgchart.html, 1.1, 1.2 admserv_phonebook.html, 1.1, 1.2 htmladmin.html, 1.1, 1.2

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/html In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14223/adminserver/admserv/html Modified Files: admserv.html admserv_dsgw.html admserv_orgchart.html admserv_phonebook.html htmladmin.html Log Message: Resolves: bug 407011 Bug Description: GIF missing on the front page for admin web ui Reviewed by: nhosoi (Thanks!) Fix Description: Yet another carry over from the days when everything was under the single server root. We should not use relative paths for the icons, but just use "/icons/" for the path, and let Apache map that to the real location of the icon files. Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: admserv.html =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/html/admserv.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- admserv.html 15 Nov 2007 17:02:02 -0000 1.2 +++ admserv.html 7 Dec 2007 17:43:50 -0000 1.3 @@ -46,7 +46,7 @@ <td colspan="4"> <table border="0" cellspacing="0" cellpadding="0"> <tr valign="TOP"> - <td><img src="../icons/spacer.gif" width="6" height="6"></td> + <td><img src="/icons/spacer.gif" width="6" height="6"></td> <td></td> </tr>  @@ -66,12 +66,12 @@ <td colspan="4"> <table border="0" cellspacing="0" cellpadding="0"> <tr valign="TOP"> - <td><img src="../icons/spacer.gif" width="6" height="6"></td> + <td><img src="/icons/spacer.gif" width="6" height="6"></td> <td></td> </tr>  <tr valign="TOP"> - <td><img src="../icons/goto.gif" width="10" height="15"> </td> + <td><img src="/icons/goto.gif" width="10" height="15"> </td> <td><a href='http://fedora.redhat.com/'>Fedora Home Page</a> Check for upgrades and information about Fedora server products. </td> @@ -81,7 +81,7 @@ <td> </td> </tr> <tr valign="TOP"> - <td><img src="../icons/goto.gif" width="10" height="15"> </td> + <td><img src="/icons/goto.gif" width="10" height="15"> </td> <td><a href='/admin-serv/tasks/configuration/HTMLAdmin?op=index'>Fedora Administration Express</a> View server status and configuration/log data. Index: admserv_dsgw.html =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/html/admserv_dsgw.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- admserv_dsgw.html 15 Nov 2007 17:02:02 -0000 1.1 +++ admserv_dsgw.html 7 Dec 2007 17:43:50 -0000 1.2 @@ -1,5 +1,5 @@ <tr valign="top"> - <td><img src="../icons/goto.gif" width="10" height="15"> </td> + <td><img src="/icons/goto.gif" width="10" height="15"> </td> <td><a href="/clients/dsgw/bin/lang?context=dsgw"> Directory Server Gateway</a> Search for and edit directory entries. Index: admserv_orgchart.html =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/html/admserv_orgchart.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- admserv_orgchart.html 15 Nov 2007 17:02:02 -0000 1.1 +++ admserv_orgchart.html 7 Dec 2007 17:43:50 -0000 1.2 @@ -1,5 +1,5 @@ <tr valign="top"> - <td><img src="../icons/goto.gif" width="10" height="15"> </td> + <td><img src="/icons/goto.gif" width="10" height="15"> </td> <td><a href="/clients/orgchart/html/index.html"> Directory Server Org Charts</a> Browse org charts of your organization. Index: admserv_phonebook.html =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/html/admserv_phonebook.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- admserv_phonebook.html 15 Nov 2007 17:02:02 -0000 1.1 +++ admserv_phonebook.html 7 Dec 2007 17:43:50 -0000 1.2 @@ -1,5 +1,5 @@ <tr valign="top"> - <td><img src="../icons/goto.gif" width="10" height="15"> </td> + <td><img src="/icons/goto.gif" width="10" height="15"> </td> <td><a href="/clients/dsgw/bin/lang?context=pb"> Directory Server Express</a> Search for users by name, user ID or extension. Index: htmladmin.html =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/html/htmladmin.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- htmladmin.html 24 Jul 2006 12:53:20 -0000 1.1 +++ htmladmin.html 7 Dec 2007 17:43:50 -0000 1.2 @@ -80,7 +80,7 @@ <td>  -<img SRC="../icons/help.gif" height=25 width=27 align=TEXTTOP border=0> Help</A> +<img SRC="/icons/help.gif" height=25 width=27 align=TEXTTOP border=0> Help</A> </td> </tr> </table>

16 years, 4 months

1
0
0 / 0

[Fedora-directory-commits] adminserver/admserv/cgi-src40 htmladmin.properties, 1.6, 1.7 viewdata.properties, 1.5, 1.6 viewlog.properties, 1.5, 1.6

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cgi-src40 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14223/adminserver/admserv/cgi-src40 Modified Files: htmladmin.properties viewdata.properties viewlog.properties Log Message: Resolves: bug 407011 Bug Description: GIF missing on the front page for admin web ui Reviewed by: nhosoi (Thanks!) Fix Description: Yet another carry over from the days when everything was under the single server root. We should not use relative paths for the icons, but just use "/icons/" for the path, and let Apache map that to the real location of the icon files. Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: htmladmin.properties =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/htmladmin.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- htmladmin.properties 9 May 2007 00:26:30 -0000 1.6 +++ htmladmin.properties 7 Dec 2007 17:43:50 -0000 1.7 @@ -64,41 +64,41 @@ //#/* html resource string - output_topology() */ htmladmin60 { "<SCRIPT LANGUAGE=JavaScript>\n\n</SCRIPT>\n\n" } htmladmin61 { "<table border=0 cellpadding=0 cellspacing=0 cols=2 width=100%% bgcolor=\"#CCCCCC\">\n" } -htmladmin62 { "<tr>\n<td colspan=2 BGCOLOR=\"#666699\"><img src=\"../icons/domain16.gif\" BORDER=0 height=16 width=16> %s</td>\n</tr>\n\n" } -htmladmin63 { "<tr>\n<td colspan=2 BGCOLOR=\"#999999\"><img src=\"../icons/host.gif\" BORDER=0 height=16 width=16> %s</td>\n</tr>\n\n" } -htmladmin64 { "<tr>\n<td colspan=2><img src=\"../icons/16space.gif\" BORDER=0 height=16 width=16><img src=\"../icons/group2.gif\" BORDER=0 height=16 width=16> %s</td>\n</tr>\n\n" } -htmladmin65 { "<tr>\n<td colspan=2><img src=\"../icons/16space.gif\" BORDER=0 height=16 width=32><img src=\"../icons/%s\" BORDER=0 height=16 width=16> %s%s</td>\n</tr>\n\n" } -htmladmin66 { "<tr>\n<td><img src=\"../icons/16space.gif\" BORDER=0 height=16 width=48>\n* %s</td>\n<td> <A HREF=\"%s\" target=_new>Server Manager</A></td>\n</tr>\n\n\"" } -htmladmin67 { "<tr>\n<td><img src=\"../icons/16space.gif\" BORDER=0 height=16 width=48>\n* %s</td>\n\n<td>\n\n\n" } -htmladmin68 { " <A HREF=\"%s/admin-serv/tasks/operation/Stop?return_format=html\" onclick=\"return confirm_admin_stop()\"><IMG SRC=\"../icons/togon.gif\" border=0 align=ABSCENTER></A>" } -htmladmin69 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_admin_stop()\"><IMG SRC=\"../icons/togon.gif\" border=0 align=ABSCENTER></A>" } +htmladmin62 { "<tr>\n<td colspan=2 BGCOLOR=\"#666699\"><img src=\"/icons/domain16.gif\" BORDER=0 height=16 width=16> %s</td>\n</tr>\n\n" } +htmladmin63 { "<tr>\n<td colspan=2 BGCOLOR=\"#999999\"><img src=\"/icons/host.gif\" BORDER=0 height=16 width=16> %s</td>\n</tr>\n\n" } +htmladmin64 { "<tr>\n<td colspan=2><img src=\"/icons/16space.gif\" BORDER=0 height=16 width=16><img src=\"/icons/group2.gif\" BORDER=0 height=16 width=16> %s</td>\n</tr>\n\n" } +htmladmin65 { "<tr>\n<td colspan=2><img src=\"/icons/16space.gif\" BORDER=0 height=16 width=32><img src=\"/icons/%s\" BORDER=0 height=16 width=16> %s%s</td>\n</tr>\n\n" } +htmladmin66 { "<tr>\n<td><img src=\"/icons/16space.gif\" BORDER=0 height=16 width=48>\n* %s</td>\n<td> <A HREF=\"%s\" target=_new>Server Manager</A></td>\n</tr>\n\n\"" } +htmladmin67 { "<tr>\n<td><img src=\"/icons/16space.gif\" BORDER=0 height=16 width=48>\n* %s</td>\n\n<td>\n\n\n" } +htmladmin68 { " <A HREF=\"%s/admin-serv/tasks/operation/Stop?return_format=html\" onclick=\"return confirm_admin_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" } +htmladmin69 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_admin_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" } htmladmin70 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\" target=\"main\">Server Info</A> |\n" } htmladmin71 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\" target=\"main\">Logs</A> |\n" } htmladmin72 { "%s%s Status=%s%s\n\n" } htmladmin73 { "On" } htmladmin74 { "Off" } htmladmin75 { "Unknown" } -htmladmin76 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_directory_stop()\"><IMG SRC=\"../icons/togon.gif\" border=0 align=ABSCENTER></A>" } -htmladmin77 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"../icons/togoff.gif\" border=0 align=ABSCENTER></A>" } +htmladmin76 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_directory_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" } +htmladmin77 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" } htmladmin78 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\" target=\"main\">Server Info</A> |\n" } htmladmin79 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\" target=\"main\">Logs</A> |\n" } htmladmin80 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\" target=\"main\">Server Info</A> |\n" } htmladmin81 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\" target=\"main\">Logs</A>\n" } htmladmin82 { "%s%s\n\n" } -htmladmin83 { "<tr>\n<td>\n<table BORDER=0 CELLSPACING=0 CELLPADDING=0>\n<tr>\n<td><img src=\"../icons/16space.gif\" BORDER=0 height=16 width=64></td>\n\n<td>\n<table BORDER=0 CELLSPACING=0 CELLPADDING=0 COLS=1 WIDTH=\"100%%\">\n<tr>\n<td>*b %s</td>\n</tr>\n</table>\n</td>\n\n" } -htmladmin84 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"../icons/togon.gif\" border=0 align=ABSCENTER></A>" } -htmladmin85 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"../icons/togoff.gif\" border=0 align=ABSCENTER></A>" } +htmladmin83 { "<tr>\n<td>\n<table BORDER=0 CELLSPACING=0 CELLPADDING=0>\n<tr>\n<td><img src=\"/icons/16space.gif\" BORDER=0 height=16 width=64></td>\n\n<td>\n<table BORDER=0 CELLSPACING=0 CELLPADDING=0 COLS=1 WIDTH=\"100%%\">\n<tr>\n<td>*b %s</td>\n</tr>\n</table>\n</td>\n\n" } +htmladmin84 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" } +htmladmin85 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" } htmladmin86 { " Status=%s%s\n\n" } -htmladmin87 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"../icons/togon.gif\" border=0 align=ABSCENTER></A>" } -htmladmin88 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"../icons/togoff.gif\" border=0 align=ABSCENTER></A>" } +htmladmin87 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" } +htmladmin88 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" } htmladmin89 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\" target=\"main\">Server Info</A> |\n" } htmladmin90 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\" target=\"main\">Logs</A> |\n" } -htmladmin91 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"../icons/togon.gif\" border=0 align=ABSCENTER></A>" } -htmladmin92 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"../icons/togoff.gif\" border=0 align=ABSCENTER></A>" } +htmladmin91 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" } +htmladmin92 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" } htmladmin93 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\" target=\"main\">Server Info</A> |\n" } htmladmin94 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\" target=\"main\">Logs</A> |\n" } -htmladmin95 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"../icons/togon.gif\" border=0 align=ABSCENTER></A>" } -htmladmin96 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"../icons/togoff.gif\" border=0 align=ABSCENTER></A>" } +htmladmin95 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" } +htmladmin96 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" } htmladmin97 { "<td><A HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\" target=\"main\">Server Info</A> |</td>\n" } htmladmin98 { "<td><A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\" target=\"main\">Logs</A> |</td>\n" } htmladmin99 { "\n</td>\n</tr>\n\n" } Index: viewdata.properties =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/viewdata.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- viewdata.properties 18 Aug 2005 18:59:03 -0000 1.5 +++ viewdata.properties 7 Dec 2007 17:43:50 -0000 1.6 @@ -42,7 +42,7 @@ viewdata30 { "<tr>\n<td>\n<div align=right>Description:</div>\n</td>\n<td>%s</td>\n</tr>\n" } viewdata31 { "<table BORDER=0 CELLSPACING=6 CELLPADDING=0>\n" } viewdata32 { "</table>\n" } -viewdata33 { "<tr>\n<td>%s</td>\n</tr>\n<tr>\n<td BACKGROUND=\"../icons/hr.gif\"> </td>\n</tr>\n<tr><td>" } +viewdata33 { "<tr>\n<td>%s</td>\n</tr>\n<tr>\n<td BACKGROUND=\"/icons/hr.gif\"> </td>\n</tr>\n<tr><td>" } viewdata34 { "<A HREF=\"%s\" target=\"new\">Upgrade Available</A>\n" } viewdata35 { "No Upgrade Available\n" } viewdata36 { "<A HREF=\"%s\" target=\"new\">%s</A>\n" } Index: viewlog.properties =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/viewlog.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- viewlog.properties 27 Jun 2007 22:24:59 -0000 1.5 +++ viewlog.properties 7 Dec 2007 17:43:50 -0000 1.6 @@ -42,7 +42,7 @@ viewlog23 { "<option value=No log files>No log files\n" } viewlog24 { "</select>" } viewlog25 { "<input type=\"hidden\" name=\"id\" value=\"%s\">\n" } -viewlog26 { "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%%\">\n<tr>\n<td>%s Logs</td>\n</tr>\n<tr>\n<td BACKGROUND=\"../icons/hr.gif\"> </td>\n</tr>\n<tr><td></table>\n" } +viewlog26 { "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%%\">\n<tr>\n<td>%s Logs</td>\n</tr>\n<tr>\n<td BACKGROUND=\"/icons/hr.gif\"> </td>\n</tr>\n<tr><td></table>\n" } viewlog27 { "<hr width=50%%>\n" } viewlog28 { "<table border=1 width=100%%><tr><th>%s</th></tr></table>\n" }

16 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits December 2007