[Fedora-directory-commits] adminserver/admserv/cgi-src40 htmladmin.c, 1.4, 1.5 htmladmin.properties, 1.4, 1.5
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Wed Nov 2 01:15:25 UTC 2005
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6161/adminserver/admserv/cgi-src40
Modified Files:
htmladmin.c htmladmin.properties
Log Message:
Bug(s) fixed: 172249
Bug Description: admin express pages not working with Fedora DS 1.0
Reviewed by: Nathan, Noriko (Thanks!)
Fix Description: The htmladmin admin express code was checking to see if
the version was >= 4.2. I just removed all version checking code. A
quick search of other admin server code did not reveal any similar
version checking. I also found a typo in the properties file (tarbbget?).
Platforms tested: RHEL4
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.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/htmladmin.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- htmladmin.c 18 Aug 2005 18:59:03 -0000 1.4
+++ htmladmin.c 2 Nov 2005 01:15:17 -0000 1.5
@@ -285,11 +285,9 @@
/*
* Given an SIE, figure out what the URL of its local Admin Server is.
- * Also, determine whether its local Admin Server supports Admin Express or not:
- * if it's pre-Admin Express (i.e. pre-4.2), int *preAE returns 1, otherwise 0.
*/
-char *get_admin_url(LDAP *server, char *sie, int *preAE) {
+char *get_admin_url(LDAP *server, char *sie) {
LDAPMessage *result;
LDAPMessage *entry;
@@ -337,7 +335,7 @@
isie++; /* eliminate spaces */
/*
- * Get product version from ISIE; if less than 4.2, this Admin Server does not fully support Admin Express
+ * Get the ISIE entry
*/
if((ldapError = ldap_search_s(server, isie, LDAP_SCOPE_BASE,
@@ -346,17 +344,6 @@
entry = ldap_first_entry(server, result);
- *preAE = 0;
- if((vals = ldap_get_values(server, entry, ISIE_PRODVER_ATTR)) != NULL) {
- int major, minor;
-
- major = atoi(strtok(vals[0], "."));
- minor = atoi(strtok(NULL, "\0"));
-
- if((major < 4) || (major == 4 && minor < 2))
- *preAE = 1;
- }
-
/*
* Now search the SIE's configuration object to get the port and the security status.
*/
@@ -1220,7 +1207,6 @@
char *href;
char *info_link;
char *log_link;
- int preAE;
if(legacy) {
/* show server id, link to 3.x Admin Server page and move on */
@@ -1239,7 +1225,7 @@
continue;
}
- if(!(admin_url = get_admin_url(server, ldap_get_dn(server, sie_entry), &preAE)))
+ if(!(admin_url = get_admin_url(server, ldap_get_dn(server, sie_entry))))
continue;
if(!get_host_and_port(server, ldap_get_dn(server, sie_entry), sie_entry, &server_host, &server_port))
@@ -1282,26 +1268,19 @@
}
- if(preAE) {
- info_link = strdup("");
- log_link = strdup("");
- }
- else {
-
- info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_ADMIN_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
- sprintf(info_link,
- (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_ADMIN_INFO_LINK),
- admin_url,
- htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
+ info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_ADMIN_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
+ sprintf(info_link,
+ (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_ADMIN_INFO_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
- log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_ADMIN_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(vals[0])) + strlen(htmladmin_strdup_escaped(dirs)) + 2);
- sprintf(log_link,
- (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_ADMIN_LOG_LINK),
- admin_url,
- htmladmin_strdup_escaped(vals[0]),
- htmladmin_strdup_escaped(dirs));
- }
+ log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_ADMIN_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(vals[0])) + strlen(htmladmin_strdup_escaped(dirs)) + 2);
+ sprintf(log_link,
+ (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_ADMIN_LOG_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(vals[0]),
+ htmladmin_strdup_escaped(dirs));
fprintf(stdout,
(const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_STATUS),
@@ -1342,31 +1321,23 @@
view ? viewparam : "");
}
- if(preAE) {
- info_link = strdup("");
- log_link = strdup("");
- repl_link = strdup("");
- }
- else {
-
- info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
- sprintf(info_link, getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_INFO_LINK),
- admin_url,
- htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
-
- log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(vals[0])) + 2);
- sprintf(log_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_LOG_LINK),
- admin_url,
- htmladmin_strdup_escaped(vals[0]));
-
- repl_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_REPL_LINK)) + strlen(admin_url)*2 + strlen(htmladmin_strdup_escaped(host)) + strlen(getenv("NETSITE_ROOT")) + /*space for port num*/ 12);
- sprintf(repl_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_REPL_LINK),
- admin_url,
- htmladmin_strdup_escaped(host),
- server_port[0],
- admin_url,
- getenv("NETSITE_ROOT"));
- }
+ info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
+ sprintf(info_link, getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_INFO_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
+
+ log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(vals[0])) + 2);
+ sprintf(log_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_LOG_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(vals[0]));
+
+ repl_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_REPL_LINK)) + strlen(admin_url)*2 + strlen(htmladmin_strdup_escaped(host)) + strlen(getenv("NETSITE_ROOT")) + /*space for port num*/ 12);
+ sprintf(repl_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_REPL_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(host),
+ server_port[0],
+ admin_url,
+ getenv("NETSITE_ROOT"));
fprintf(stdout,
(const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_STATUS_WITH_REPL),
@@ -1392,24 +1363,17 @@
if(dirs) {
- if(preAE) {
- info_link = strdup("");
- log_link = strdup("");
- }
- else {
-
info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_MSG_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
sprintf(info_link,
- (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_MSG_INFO_LINK),
- admin_url,
- htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
+ (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_MSG_INFO_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_MSG_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(vals[0])) + strlen(htmladmin_strdup_escaped(dirs)) + 2);
sprintf(log_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_MSG_LOG_LINK),
- admin_url,
- htmladmin_strdup_escaped(vals[0]),
- htmladmin_strdup_escaped(dirs));
- }
+ admin_url,
+ htmladmin_strdup_escaped(vals[0]),
+ htmladmin_strdup_escaped(dirs));
fprintf(stdout,
@@ -1512,22 +1476,15 @@
view ? viewparam : "");
}
- if(preAE) {
- info_link = strdup("");
- log_link = strdup("");
- }
- else {
-
- info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_ES_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
- sprintf(info_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_ES_INFO_LINK),
- admin_url,
- htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
-
- log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_ES_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(vals[0])) + 2);
- sprintf(log_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_ES_LOG_LINK),
- admin_url,
- htmladmin_strdup_escaped(vals[0]));
- }
+ info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_ES_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
+ sprintf(info_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_ES_INFO_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
+
+ log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_ES_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(vals[0])) + 2);
+ sprintf(log_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_ES_LOG_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(vals[0]));
fprintf(stdout,
(const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_STATUS),
@@ -1566,22 +1523,15 @@
view ? viewparam : "");
}
- if(preAE) {
- info_link = strdup("");
- log_link = strdup("");
- }
- else {
-
- info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_CMS_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
- sprintf(info_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_CMS_INFO_LINK),
- admin_url,
- htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
-
- log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_CMS_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
- sprintf(log_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_CMS_LOG_LINK),
- admin_url,
- htmladmin_strdup_escaped(vals[0]));
- }
+ info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_CMS_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
+ sprintf(info_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_CMS_INFO_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
+
+ log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_CMS_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
+ sprintf(log_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_CMS_LOG_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(vals[0]));
fprintf(stdout,
(const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_STATUS),
@@ -1618,26 +1568,19 @@
view ? viewparam : "");
}
- if(preAE) {
- info_link = strdup("");
- log_link = strdup("");
- }
- else {
-
- info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_OTHER_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
- sprintf(info_link,
- (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_OTHER_INFO_LINK),
- admin_url,
- htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
-
- log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_OTHER_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(vals[0])) + strlen(htmladmin_strdup_escaped(vals[0])) + 3);
- sprintf(log_link,
- (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_OTHER_LOG_LINK),
- admin_url,
- htmladmin_strdup_escaped(vals[0]),
- htmladmin_strdup_escaped(vals[0]),
- FILE_PATHSEP);
- }
+ info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_OTHER_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
+ sprintf(info_link,
+ (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_OTHER_INFO_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
+
+ log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_OTHER_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(vals[0])) + strlen(htmladmin_strdup_escaped(vals[0])) + 3);
+ sprintf(log_link,
+ (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_OTHER_LOG_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(vals[0]),
+ htmladmin_strdup_escaped(vals[0]),
+ FILE_PATHSEP);
fprintf(stdout,
(const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_STATUS),
@@ -2053,7 +1996,6 @@
char **serverid;
char **serverroot;
char *sie;
- int preAE;
int count, max_count;
if(strstr(object, "Messaging")) {
@@ -2118,7 +2060,7 @@
else
active_port = ports[0];
- if((admin_url = get_admin_url(server, sie, &preAE)) == NULL)
+ if((admin_url = get_admin_url(server, sie)) == NULL)
goto output_topology;
count=0;
Index: htmladmin.properties
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/htmladmin.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- htmladmin.properties 18 Aug 2005 18:59:03 -0000 1.4
+++ htmladmin.properties 2 Nov 2005 01:15:17 -0000 1.5
@@ -73,7 +73,7 @@
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> <font color=\"#FFFFFF\">|</font>\n" }
-htmladmin71 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s&directories=%s\" tarbbget=\"main\">Logs</A> <font color=\"#FFFFFF\">|</font>\n" }
+htmladmin71 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s&directories=%s\" target=\"main\">Logs</A> <font color=\"#FFFFFF\">|</font>\n" }
htmladmin72 { "<font face=\"Helvetica, Arial, Sans-serif\"><font size=-1>%s%s Status=<b>%s</b>%s</font></font>\n\n" }
htmladmin73 { "On" }
htmladmin74 { "Off" }
More information about the Fedora-directory-commits
mailing list