[Fedora-directory-commits] dsgw cgiutil.c, 1.5, 1.6 cookie.c, 1.1.1.1, 1.2 csearch.c, 1.7, 1.8 dnedit.c, 1.7, 1.8 doauth.c, 1.6, 1.7 domodify.c, 1.4, 1.5 dosearch.c, 1.5, 1.6 dsgw.h, 1.10, 1.11 dsgwutil.c, 1.13, 1.14 emitf.c, 1.2, 1.3 entrydisplay.c, 1.11, 1.12 htmlout.c, 1.7, 1.8 ldaputil.c, 1.5, 1.6 search.c, 1.4, 1.5 tutor.c, 1.5, 1.6
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/dsgw
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11172/dsgw
Modified Files:
cgiutil.c cookie.c csearch.c dnedit.c doauth.c domodify.c
dosearch.c dsgw.h dsgwutil.c emitf.c entrydisplay.c htmlout.c
ldaputil.c search.c tutor.c
Log Message:
Resolves: bug 472092
Bug Description: DSGW password corruption
Reviewed by: nkinder (Thanks!)
Fix Description: 1) By default, all of the get/post parameters have the html entities escaped, so we can be sure that they are displayed to the user escaped, to avoid XSS issues. However, values sent to LDAP must be unescaped. The doauth code is used to authenticate directory manager and ordinary users, so we have to unescape the password explicitly there. The domodify code is used when data is added or modified in the directory server. It's easier to just fix all of the values before sending to the directory server.
2) The entity code has been moved to adminutil, so use the adminutil functions instead of the dsgw functions. This will require adminutil 1.1.8.
3) Clean up various compiler warnings.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: cgiutil.c
===================================================================
RCS file: /cvs/dirsec/dsgw/cgiutil.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cgiutil.c 27 Feb 2008 03:36:50 -0000 1.5
+++ cgiutil.c 22 Dec 2008 21:44:30 -0000 1.6
@@ -152,7 +152,7 @@
}
#ifdef DSGW_DEBUG
- dsgw_log ("vars=\"%s\"\n", vars);
+ dsgw_log ("vars=\"%p\"\n", vars);
#endif
vars = get_input_ptr();
dsgw_vec_convert (vars); /* convert to utf8 */
Index: cookie.c
===================================================================
RCS file: /cvs/dirsec/dsgw/cookie.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- cookie.c 1 Jun 2006 19:43:39 -0000 1.1.1.1
+++ cookie.c 22 Dec 2008 21:44:30 -0000 1.2
@@ -301,7 +301,7 @@
expired = 1;
} else {
#ifdef DSGW_DEBUG
- dsgw_log( "dsgw_ckdn2passwd: cookie expired (%ld > %ld) but within domodify grace period\n", now, atoi( lifetimestr ));
+ dsgw_log( "dsgw_ckdn2passwd: cookie expired (%ld > %ld) but within domodify grace period\n", now, atol( lifetimestr ));
#endif
}
} else if ( now > atoi( lifetimestr )) {
@@ -311,7 +311,7 @@
if ( expired != 0 ) {
dsgw_closecookiedb( fp );
#ifdef DSGW_DEBUG
- dsgw_log( "dsgw_ckdn2passwd: expired (%ld > %ld)\n", now, atoi( lifetimestr ));
+ dsgw_log( "dsgw_ckdn2passwd: expired (%ld > %ld)\n", now, atol( lifetimestr ));
#endif
return DSGW_CKDB_EXPIRED;
}
Index: csearch.c
===================================================================
RCS file: /cvs/dirsec/dsgw/csearch.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- csearch.c 20 Mar 2008 02:18:39 -0000 1.7
+++ csearch.c 22 Dec 2008 21:44:30 -0000 1.8
@@ -41,6 +41,9 @@
#include "dsgw.h"
#include "dbtdsgw.h"
+#ifdef DSGW_DEBUG
+#include <unistd.h>
+#endif
static void get_request(char *fname);
static void emit_file(char* filename, struct ldap_searchobj* sop);
Index: dnedit.c
===================================================================
RCS file: /cvs/dirsec/dsgw/dnedit.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dnedit.c 20 Mar 2008 02:18:39 -0000 1.7
+++ dnedit.c 22 Dec 2008 21:44:30 -0000 1.8
@@ -120,8 +120,7 @@
*
* I feel your pain, so I have removed the pain.
*/
- "var comp_js = 'CU'\n",
- dsgw_getvp( DSGW_CGINUM_EDIT ), context, edn );
+ "var comp_js = 'CU'\n" );
dsgw_emits("var dnlist = new Array;\n" );
for ( i = 0; attrvals && attrvals[ i ] != NULL; i++ ) {
xdn = ldap_explode_dn( attrvals[ i ], 1 );
Index: doauth.c
===================================================================
RCS file: /cvs/dirsec/dsgw/doauth.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- doauth.c 12 Jun 2008 14:01:33 -0000 1.6
+++ doauth.c 22 Dec 2008 21:44:30 -0000 1.7
@@ -76,6 +76,9 @@
encodeddn = dsgw_strdup_escaped( binddn );
authdesturl = dsgw_get_cgi_var( "authdesturl", DSGW_CGIVAR_OPTIONAL );
password = dsgw_get_cgi_var( "password", DSGW_CGIVAR_OPTIONAL );
+ if (password && password[0]) {
+ unescape_entities(password);
+ }
(void) dsgw_init_ldap( &ld, NULL, 1, 0);
Index: domodify.c
===================================================================
RCS file: /cvs/dirsec/dsgw/domodify.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- domodify.c 6 Mar 2008 22:00:09 -0000 1.4
+++ domodify.c 22 Dec 2008 21:44:30 -0000 1.5
@@ -93,13 +93,13 @@
post_request()
{
LDAP *ld;
- int rc, changetype, dnlen, i, passwd_changed, discard_authcreds;
+ int rc, changetype, dnlen, i, passwd_changed;
char *s, *encodeddn, *dn, *newrdn, *changedesc, **rdns, **oldrdns,
*jscomp, *entry_name, *new_name, *success_msg;
char *old_dn;
char buf[ 256 ];
- passwd_changed = discard_authcreds = 0;
+ passwd_changed = 0;
s = dsgw_get_cgi_var( "changetype", DSGW_CGIVAR_REQUIRED );
changedesc = XP_GetClientStr(DBT_Editing_);
@@ -553,16 +553,18 @@
return(LDAP_PARAM_ERROR);
}
- if ( verbose && pmods != NULL ) {
+ if ( pmods != NULL ) {
int j, notascii;
unsigned long k;
struct berval *bvp;
for ( i = 0; pmods[ i ] != NULL; ++i ) {
modop = pmods[ i ]->mod_op & ~LDAP_MOD_BVALUES;
- dsgw_emitf( "%s %s:\n", modop == LDAP_MOD_REPLACE ?
- "replace" : modop == LDAP_MOD_ADD ?
- "add" : "delete", pmods[ i ]->mod_type );
+ if (verbose) {
+ dsgw_emitf( "%s %s:\n", modop == LDAP_MOD_REPLACE ?
+ "replace" : modop == LDAP_MOD_ADD ?
+ "add" : "delete", pmods[ i ]->mod_type );
+ }
if ( pmods[ i ]->mod_bvalues != NULL ) {
for ( j = 0; pmods[ i ]->mod_bvalues[ j ] != NULL; ++j ) {
bvp = pmods[ i ]->mod_bvalues[ j ];
@@ -573,10 +575,16 @@
break;
}
}
- if ( notascii ) {
- dsgw_emitf( XP_GetClientStr(DBT_TnotAsciiLdBytesN_), bvp->bv_len );
- } else {
- dsgw_emitf( "\t\"%s\"\n", bvp->bv_val );
+ if (verbose) {
+ if ( notascii ) {
+ dsgw_emitf( XP_GetClientStr(DBT_TnotAsciiLdBytesN_), bvp->bv_len );
+ } else {
+ dsgw_emitf( "\t\"%s\"\n", bvp->bv_val );
+ }
+ }
+ /* make sure all values sent via LDAP are not html escaped */
+ if (!notascii && bvp->bv_val) { /* not not ascii == ascii */
+ unescape_entities(bvp->bv_val);
}
}
}
Index: dosearch.c
===================================================================
RCS file: /cvs/dirsec/dsgw/dosearch.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dosearch.c 27 Feb 2008 03:36:50 -0000 1.5
+++ dosearch.c 22 Dec 2008 21:44:30 -0000 1.6
@@ -139,9 +139,6 @@
static void
get_request(char *dn, char *ldapquery)
{
- int urllen = 0;
- int argslen = 0;
- char *p = NULL;
char *ldapurl = NULL;
/*
Index: dsgw.h
===================================================================
RCS file: /cvs/dirsec/dsgw/dsgw.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dsgw.h 4 Sep 2008 02:46:09 -0000 1.10
+++ dsgw.h 22 Dec 2008 21:44:30 -0000 1.11
@@ -874,8 +874,6 @@
#else
;
#endif
-char *dsgw_strdup_with_entities( char *s, int *madecopyp );
-void dsgw_convert_entities( char *s );
void dsgw_HTML_emits( char * );
void dsgw_emit_cgi_var( int argc, char **argv );
void dsgw_emit_button( int argc, char **argv, const char* format, ... )
Index: dsgwutil.c
===================================================================
RCS file: /cvs/dirsec/dsgw/dsgwutil.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dsgwutil.c 4 Sep 2008 02:46:09 -0000 1.13
+++ dsgwutil.c 22 Dec 2008 21:44:30 -0000 1.14
@@ -40,6 +40,7 @@
* dsgwutil.c -- misc. utility functions -- HTTP gateway
*/
+#include <unistd.h>
#include <limits.h> /* PATH_MAX */
#include "dsgw.h"
#include "dbtdsgw.h"
Index: emitf.c
===================================================================
RCS file: /cvs/dirsec/dsgw/emitf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emitf.c 14 Jan 2008 22:58:30 -0000 1.2
+++ emitf.c 22 Dec 2008 21:44:30 -0000 1.3
@@ -741,7 +741,8 @@
if (*s == 'q' || *s == 'Q') {
while (ldap_utf8isspace (LDAP_UTF8INC(s)));
if (*s == '=') {
- item[i].i_q = strtod(++s, &s);
+ ++s;
+ item[i].i_q = strtod(s, &s);
}
}
} while ((s = strchr (s, ';')) != NULL);
Index: entrydisplay.c
===================================================================
RCS file: /cvs/dirsec/dsgw/entrydisplay.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- entrydisplay.c 22 Dec 2008 19:50:15 -0000 1.11
+++ entrydisplay.c 22 Dec 2008 21:44:30 -0000 1.12
@@ -739,7 +739,7 @@
if ( !editable ) {
char *urlprefix = dsgw_ch_malloc( strlen(gc->gc_urlpfxmain) + 128);
sprintf(urlprefix, "%semptyFrame.html", gc->gc_urlpfxmain);
- dsgw_convert_entities(urlprefix);
+ unescape_entities(urlprefix);
/* include the functions used to support "Edit" buttons */
/* function haveAuthCookie() */
@@ -1537,7 +1537,7 @@
int freeit;
if ( quote_html_specials ) {
- val = dsgw_strdup_with_entities( val, &freeit );
+ val = strdup_escape_entities( val, &freeit );
} else {
freeit = 0;
}
Index: htmlout.c
===================================================================
RCS file: /cvs/dirsec/dsgw/htmlout.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- htmlout.c 11 Jun 2008 21:12:31 -0000 1.7
+++ htmlout.c 22 Dec 2008 21:44:30 -0000 1.8
@@ -176,7 +176,7 @@
}
}
- newlabel = dsgw_strdup_with_entities( label, &freenewlabel );
+ newlabel = strdup_escape_entities( label, &freenewlabel );
if ( newlabel != NULL && *newlabel != '\0' ) {
dsgw_emitf( ">%s</A>\n", newlabel );
if ( freenewlabel ) {
@@ -266,98 +266,6 @@
}
-#define DSGW_MAX_ENTITY_LEN 6 /* " */
-static char *specials = "&\"<>";
-static char *entities[] = { "&", """, "<", ">" };
-static int entitylen[] = { 5, 6, 4, 4 };
-static int entitynum = sizeof(entities)/sizeof(entities[0]);
-
-char *
-dsgw_strdup_with_entities( char *s, int *madecopyp )
-{
-/*
- * If the UTF8 string "s" contains any HTML special characters, make a
- * duplicate where the appropriate HTML "entities" have been substituted
- * for the special chars. For example, "<mcs(a)ace.com>" will be translated
- * to "<mcs(a)ace.com>".
- *
- * If "s" does not contain any special characters, it is returned and
- * *madecopyp is set to 0.
- * Otherwise a malloc'd string is returned and *madecopyp is set to 1.
- */
- int spcount, idx;
- char *p, *q, *r, *d;
-
- spcount = 0;
- for ( p = s; *p != '\0'; LDAP_UTF8INC( p )) {
- if ( ((*p) & 0x80) == 0 && strchr( specials, *p ) != NULL ) {
- ++spcount;
- }
- }
-
- if ( spcount == 0 ) {
- *madecopyp = 0;
- return( s );
- }
-
- d = r = dsgw_ch_malloc( strlen( s ) + 1 + spcount * DSGW_MAX_ENTITY_LEN );
- for ( p = s; *p != '\0'; LDAP_UTF8INC( p )) {
- if ( ((*p) & 0x80) == 0 && ( q = strchr( specials, *p )) != NULL ) {
- idx = ( q - specials );
- memcpy( r, entities[ idx ], entitylen[ idx ] );
- r += entitylen[ idx ];
- } else {
- r += LDAP_UTF8COPY( r, p );
- }
- }
- *r = '\0';
-
- *madecopyp = 1;
- return( d );
-}
-
-/* this will convert a string with escaped entities ("&")
- back to the original unescaped string ("&")
- This is necessary for converting URLs which would normally
- have entities in them (e.g. search?context=foo&dn=bar)
- for use in javascript (e.g. window.href = 'search?context=foo&dn=bar')
- since javascript must use the unescaped version
- This converts the string in place since the entities "&"
- take up much more room than the single character represented
- If you need to work on a copy then make a copy with strdup first.
-*/
-void
-dsgw_convert_entities(char *s)
-{
- int spcount, idx;
- char *p, *q, *r, *d;
-
- if (!s || !*s) {
- return;
- }
-
- d = r = s;
- for ( p = s; *p != '\0'; LDAP_UTF8INC( p )) {
- if ( ((*p) & 0x80) == 0 && ( (*p) == '&') ) {
- for( idx = 0; idx < entitynum; ++idx ) {
- if (!strncmp(p, entities[ idx ], entitylen[ idx ])) {
- break;
- }
- }
- if (idx < entitynum) {
- *r = specials[idx];
- ++r;
- p += entitylen[ idx ]-1; /* the 1 will be added in the for loop */
- } else {
- r += LDAP_UTF8COPY( r, p );
- }
- } else {
- r += LDAP_UTF8COPY( r, p );
- }
- }
- *r = '\0';
-}
-
void
dsgw_form_begin( const char* name, const char* format, ... )
{
Index: ldaputil.c
===================================================================
RCS file: /cvs/dirsec/dsgw/ldaputil.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ldaputil.c 6 Mar 2008 22:00:09 -0000 1.5
+++ ldaputil.c 22 Dec 2008 21:44:30 -0000 1.6
@@ -155,6 +155,9 @@
}
rndstr = dn = NULL;
passwd = dsgw_get_cgi_var( "passwd", DSGW_CGIVAR_OPTIONAL );
+ if (passwd && passwd[0]) {
+ unescape_entities(passwd); /* unescape before using with ldap */
+ }
if (( p = dsgw_get_cgi_var( "ldapsizelimit", DSGW_CGIVAR_OPTIONAL ))
!= NULL ) {
@@ -189,7 +192,7 @@
#ifdef DSGW_DEBUG
dsgw_log( "dsgw_init_ldap: run under admserv, user id = %s, "
- "dn = %s, passwd = %s, skipac = %d, dn = 0x%x\n",
+ "dn = %s, passwd = %s, skipac = %d, dn = 0x%p\n",
userid == NULL ? "NULL" : userid,
dn == NULL ? "NULL" : dn,
passwd == NULL ? "NULL" : passwd,
Index: search.c
===================================================================
RCS file: /cvs/dirsec/dsgw/search.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- search.c 6 Mar 2008 22:00:09 -0000 1.4
+++ search.c 22 Dec 2008 21:44:30 -0000 1.5
@@ -38,9 +38,11 @@
/*
* search.c -- CGI program to generate smart search form -- HTTP gateway
*/
-
#include "dsgw.h"
#include "dbtdsgw.h"
+#ifdef DSGW_DEBUG
+#include <unistd.h>
+#endif
static void get_request(char *docname);
static void do_searchtype_popup( struct ldap_searchobj *sop );
Index: tutor.c
===================================================================
RCS file: /cvs/dirsec/dsgw/tutor.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tutor.c 20 Mar 2008 02:18:39 -0000 1.5
+++ tutor.c 22 Dec 2008 21:44:30 -0000 1.6
@@ -198,7 +198,7 @@
* Where MANUAL is literal
*/
html = PL_strdup(gc->gc_urlpfxmain);
- dsgw_convert_entities(html);
+ unescape_entities(html);
dsgw_emitf("Location: %s%s/%s\n\n",
html, DSGW_MANUALSHORTCUT, head);
free(html);
14 years, 11 months
[Fedora-directory-commits] dsgw/pbconfig list-Auth.html.in,1.4,1.5
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/dsgw/pbconfig
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16211/dsgw/pbconfig
Modified Files:
list-Auth.html.in
Log Message:
Resolves: bug 471681
Bug Description: DSGW authenticate multi-result hyperlinks broken
Reviewed by: nhosoi (Thanks!)
Fix Description: 1) The quoting was a bit off. The DSGW code adds double quotes at the beginning and end of the javascript. We have to use %22 to have DSGW emit double quotes in the right places where other double quotes are needed.
2) If you are attempting to auth as a real user, and you have password policy on such that the user must change the password after reset, and you are using a binddn instead of the default anon, the auth screen would not prompt you for your old password, because it thought you were already bound as the binddn. The binddn is not a real user in this case, and so should not be considered when testing for "bound".
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: list-Auth.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbconfig/list-Auth.html.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- list-Auth.html.in 20 Mar 2008 02:18:44 -0000 1.4
+++ list-Auth.html.in 22 Dec 2008 19:50:14 -0000 1.5
@@ -123,7 +123,7 @@
<!-- DS_ENTRYBEGIN -->
<TR>
<TD NOWRAP>
-<!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "href=javascript:authSubmit('--value--'); onMouseOver=%22window.status='Click to authenticate'; return true;%22" -->
+<!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "href=javascript:authSubmit('--value--');%22 onMouseOver=%22window.status='Click to authenticate'; return true;" -->
<TD NOWRAP>
<!-- DS_ATTRIBUTE "attr=title" -->
14 years, 11 months
[Fedora-directory-commits] dsgw entrydisplay.c,1.10,1.11
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/dsgw
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16211/dsgw
Modified Files:
entrydisplay.c
Log Message:
Resolves: bug 471681
Bug Description: DSGW authenticate multi-result hyperlinks broken
Reviewed by: nhosoi (Thanks!)
Fix Description: 1) The quoting was a bit off. The DSGW code adds double quotes at the beginning and end of the javascript. We have to use %22 to have DSGW emit double quotes in the right places where other double quotes are needed.
2) If you are attempting to auth as a real user, and you have password policy on such that the user must change the password after reset, and you are using a binddn instead of the default anon, the auth screen would not prompt you for your old password, because it thought you were already bound as the binddn. The binddn is not a real user in this case, and so should not be considered when testing for "bound".
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: entrydisplay.c
===================================================================
RCS file: /cvs/dirsec/dsgw/entrydisplay.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- entrydisplay.c 20 Mar 2008 02:18:39 -0000 1.10
+++ entrydisplay.c 22 Dec 2008 19:50:15 -0000 1.11
@@ -2912,7 +2912,9 @@
}
if ( strcasecmp( argv[0], DSGW_COND_BOUND ) == 0 ) {
- return( dsgw_get_binddn() != NULL );
+ /* We are not really considered to be bound if we are bound
+ as the binddn user */
+ return( (dsgw_get_binddn() != NULL) && gc->gc_binddn && (0 == dsgw_dn_cmp(dsgw_get_binddn(), gc->gc_binddn)) );
}
if ( strcasecmp( argv[0], DSGW_COND_BOUNDASTHISENTRY ) == 0 ) {
14 years, 11 months
[Fedora-directory-commits] dsgw/config list-Auth.html.in,1.4,1.5
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/dsgw/config
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16211/dsgw/config
Modified Files:
list-Auth.html.in
Log Message:
Resolves: bug 471681
Bug Description: DSGW authenticate multi-result hyperlinks broken
Reviewed by: nhosoi (Thanks!)
Fix Description: 1) The quoting was a bit off. The DSGW code adds double quotes at the beginning and end of the javascript. We have to use %22 to have DSGW emit double quotes in the right places where other double quotes are needed.
2) If you are attempting to auth as a real user, and you have password policy on such that the user must change the password after reset, and you are using a binddn instead of the default anon, the auth screen would not prompt you for your old password, because it thought you were already bound as the binddn. The binddn is not a real user in this case, and so should not be considered when testing for "bound".
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: list-Auth.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/list-Auth.html.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- list-Auth.html.in 20 Mar 2008 02:18:40 -0000 1.4
+++ list-Auth.html.in 22 Dec 2008 19:50:14 -0000 1.5
@@ -89,7 +89,7 @@
<!-- DS_ENTRYBEGIN -->
<TR>
<TD NOWRAP>
-<!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "href=javascript:authSubmit('--value--'); onMouseOver=%22window.status='Click to authenticate'; return true;%22" -->
+<!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "href=javascript:authSubmit('--value--');%22 onMouseOver=%22window.status='Click to authenticate'; return true;" -->
<TD NOWRAP>
<!-- DS_ATTRIBUTE "attr=title" -->
14 years, 11 months
[Fedora-directory-commits] adminutil configure.ac, 1.12, 1.13 aclocal.m4, 1.15, 1.16 missing, 1.14, 1.15 install-sh, 1.14, 1.15 configure, 1.15, 1.16 Makefile.in, 1.15, 1.16 depcomp, 1.14, 1.15 config.sub, 1.14, 1.15 config.guess, 1.14, 1.15 compile, 1.14, 1.15
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv644
Modified Files:
configure.ac aclocal.m4 missing install-sh configure
Makefile.in depcomp config.sub config.guess compile
Log Message:
bump version to 1.1.8
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminutil/configure.ac,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- configure.ac 27 Aug 2008 20:07:58 -0000 1.12
+++ configure.ac 22 Dec 2008 18:56:09 -0000 1.13
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([adminutil], [1.1.7], [http://bugzilla.redhat.com/])
+AC_INIT([adminutil], [1.1.8], [http://bugzilla.redhat.com/])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
AM_MAINTAINER_MODE
AC_CANONICAL_HOST
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminutil/configure,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- configure 27 Aug 2008 20:07:59 -0000 1.15
+++ configure 22 Dec 2008 18:56:09 -0000 1.16
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for adminutil 1.1.7.
+# Generated by GNU Autoconf 2.59 for adminutil 1.1.8.
#
# Report bugs to <http://bugzilla.redhat.com/>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='adminutil'
PACKAGE_TARNAME='adminutil'
-PACKAGE_VERSION='1.1.7'
-PACKAGE_STRING='adminutil 1.1.7'
+PACKAGE_VERSION='1.1.8'
+PACKAGE_STRING='adminutil 1.1.8'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
# Factoring default headers for most tests.
@@ -954,7 +954,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures adminutil 1.1.7 to adapt to many kinds of systems.
+\`configure' configures adminutil 1.1.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of adminutil 1.1.7:";;
+ short | recursive ) echo "Configuration of adminutil 1.1.8:";;
esac
cat <<\_ACEOF
@@ -1182,7 +1182,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-adminutil configure 1.1.7
+adminutil configure 1.1.8
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1196,7 +1196,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by adminutil $as_me 1.1.7, which was
+It was created by adminutil $as_me 1.1.8, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1839,7 +1839,7 @@
# Define the identity of the package.
PACKAGE='adminutil'
- VERSION='1.1.7'
+ VERSION='1.1.8'
cat >>confdefs.h <<_ACEOF
@@ -24401,7 +24401,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by adminutil $as_me 1.1.7, which was
+This file was extended by adminutil $as_me 1.1.8, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24459,7 +24459,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-adminutil config.status 1.1.7
+adminutil config.status 1.1.8
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
14 years, 11 months
[Fedora-directory-commits] adminutil/include/libadminutil resource.h, 1.3, 1.4
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/adminutil/include/libadminutil
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv513/adminutil/include/libadminutil
Modified Files:
resource.h
Log Message:
fix compiler warning
Index: resource.h
===================================================================
RCS file: /cvs/dirsec/adminutil/include/libadminutil/resource.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- resource.h 4 Apr 2007 19:37:41 -0000 1.3
+++ resource.h 22 Dec 2008 18:55:20 -0000 1.4
@@ -187,11 +187,11 @@
#ifdef RESOURCE_STR
#define BEGIN_STR(argLibraryName) \
- res_RESOURCE_TABLE argLibraryName[] = { 0, #argLibraryName,
+ res_RESOURCE_TABLE argLibraryName[] = { {0, #argLibraryName} ,
#define ResDef(argToken,argID,argString) \
- argID, argString,
+ {argID, argString},
#define END_STR(argLibraryName) \
- 0, 0 };
+ {0, 0} };
#else
#define BEGIN_STR(argLibraryName) \
enum {
14 years, 11 months
[Fedora-directory-commits] console/src/com/netscape/management/client/util IndexDialog.java, 1.2, 1.3
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/console/src/com/netscape/management/client/util
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28952/console/src/com/netscape/management/client/util
Modified Files:
IndexDialog.java
Log Message:
Resolves: bug 312381
Description: ambiguity in imported classes
Fix Description: clean up imports - import specific class names only instead of .*
Index: IndexDialog.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/util/IndexDialog.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IndexDialog.java 10 Jan 2008 18:35:38 -0000 1.2
+++ IndexDialog.java 22 Dec 2008 18:48:35 -0000 1.3
@@ -20,20 +20,47 @@
package com.netscape.management.client.util;
-import java.awt.*;
-import java.util.*;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.text.CollationKey;
+import java.text.Collator;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
import java.io.StringReader;
-import java.net.*;
-import java.text.*;
-import java.beans.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.text.html.*;
-import com.netscape.management.client.console.*;
-import com.netscape.management.client.components.*;
+import java.net.URL;
+
+import javax.swing.BorderFactory;
+import javax.swing.JEditorPane;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.JTextField;
+import javax.swing.ListSelectionModel;
+import javax.swing.UIManager;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.text.html.HTMLDocument;
+import javax.swing.text.html.HTMLFrameHyperlinkEvent;
+
+import com.netscape.management.client.components.GenericDialog;
+import com.netscape.management.client.console.Console;
/**
* Dialog to select a topic to display, from a list of URLS organized
14 years, 11 months
[Fedora-directory-commits] console/src/com/netscape/management/client/topology DomainNode.java, 1.2, 1.3
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/console/src/com/netscape/management/client/topology
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28952/console/src/com/netscape/management/client/topology
Modified Files:
DomainNode.java
Log Message:
Resolves: bug 312381
Description: ambiguity in imported classes
Fix Description: clean up imports - import specific class names only instead of .*
Index: DomainNode.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/DomainNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DomainNode.java 10 Jan 2008 18:35:36 -0000 1.2
+++ DomainNode.java 22 Dec 2008 18:48:35 -0000 1.3
@@ -19,17 +19,39 @@
* END COPYRIGHT BLOCK **/
package com.netscape.management.client.topology;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.tree.*;
+import javax.swing.JCheckBox;
+import javax.swing.JPasswordField;
+import javax.swing.event.ChangeListener;
+import javax.swing.tree.MutableTreeNode;
+
+import netscape.ldap.LDAPAttribute;
+import netscape.ldap.LDAPConnection;
+import netscape.ldap.LDAPEntry;
+import netscape.ldap.LDAPException;
+import netscape.ldap.LDAPModification;
+import netscape.ldap.LDAPSearchResults;
+
import java.awt.Component;
import java.text.MessageFormat;
-import com.netscape.management.client.*;
-import com.netscape.management.client.util.*;
-import com.netscape.management.client.console.*;
-import com.netscape.management.nmclf.*;
-import netscape.ldap.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
+
+import com.netscape.management.client.IMenuInfo;
+import com.netscape.management.client.IMenuItem;
+import com.netscape.management.client.IPage;
+import com.netscape.management.client.IResourceObject;
+import com.netscape.management.client.ResourceModel;
+import com.netscape.management.client.ResourcePage;
+import com.netscape.management.client.console.Console;
+import com.netscape.management.client.console.ConsoleInfo;
+import com.netscape.management.client.console.SplashScreen;
+import com.netscape.management.client.util.Debug;
+import com.netscape.management.client.util.LDAPUtil;
+import com.netscape.management.client.util.RemoteImage;
+import com.netscape.management.client.util.ResourceSet;
+import com.netscape.management.client.util.SingleBytePasswordField;
+import com.netscape.management.nmclf.SuiPasswordField;
/**
14 years, 11 months
[Fedora-directory-commits] console/src/com/netscape/management/client/security CertRequestWizard.java, 1.4, 1.5
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/console/src/com/netscape/management/client/security
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28952/console/src/com/netscape/management/client/security
Modified Files:
CertRequestWizard.java
Log Message:
Resolves: bug 312381
Description: ambiguity in imported classes
Fix Description: clean up imports - import specific class names only instead of .*
Index: CertRequestWizard.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/CertRequestWizard.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CertRequestWizard.java 10 Jan 2008 18:35:36 -0000 1.4
+++ CertRequestWizard.java 22 Dec 2008 18:48:34 -0000 1.5
@@ -19,19 +19,41 @@
* END COPYRIGHT BLOCK **/
package com.netscape.management.client.security;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import java.util.zip.*;
-import java.util.jar.*;
-import java.net.*;
+import java.awt.Component;
+import java.awt.Dialog;
+import java.awt.Frame;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.Vector;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
+import java.util.zip.ZipEntry;
import java.io.File;
import java.io.FilenameFilter;
import java.io.InputStream;
-import javax.swing.*;
-import javax.swing.event.*;
-import com.netscape.management.client.console.*;
-import com.netscape.management.client.components.*;
+import java.net.URL;
+
+import javax.swing.ButtonGroup;
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.SwingUtilities;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import com.netscape.management.client.security.csr.ICAPlugin;
+import com.netscape.management.client.security.csr.IUIPage;
import com.netscape.management.client.util.ModalDialogUtil;
import com.netscape.management.client.util.ResourceSet;
import com.netscape.management.client.util.MultilineLabel;
@@ -41,9 +63,19 @@
import com.netscape.management.client.util.AdmTask;
import com.netscape.management.client.util.Help;
import com.netscape.management.client.util.Browser;
-import com.netscape.management.nmclf.*;
-import com.netscape.management.client.security.csr.*;
-import com.netscape.management.client.preferences.*;
+import com.netscape.management.client.preferences.LDAPPreferences;
+import com.netscape.management.client.components.ErrorDialog;
+import com.netscape.management.client.components.IDataCollectionModel;
+import com.netscape.management.client.components.IWizardSequenceManager;
+import com.netscape.management.client.components.Wizard;
+import com.netscape.management.client.components.WizardDataCollectionModel;
+import com.netscape.management.client.components.WizardPage;
+import com.netscape.management.client.components.WizardSequenceManager;
+import com.netscape.management.client.console.Console;
+import com.netscape.management.client.console.ConsoleInfo;
+import com.netscape.management.nmclf.SuiConstants;
+import com.netscape.management.nmclf.SuiScrollPane;
+
import netscape.ldap.*;
/**
@@ -401,7 +433,6 @@
String jarFilename = fList[i].getParent()+"/"+fList[i].getName();
JarFile jarfile = new JarFile(jarFilename);
Manifest mf = jarfile.getManifest();
- Map map = mf.getEntries();
Set set = mf.getEntries().keySet();
Iterator iterator = set.iterator();
14 years, 11 months
[Fedora-directory-commits] console/src/com/netscape/management/client/preferences FilePreferenceManager.java, 1.3, 1.4
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/console/src/com/netscape/management/client/preferences
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17558/console/src/com/netscape/management/client/preferences
Modified Files:
FilePreferenceManager.java
Log Message:
Resolves: bug 312381
Description: ambiguity in imported classes
Fix Description: clean up imports - import specific class names only instead of .*
Index: FilePreferenceManager.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/preferences/FilePreferenceManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FilePreferenceManager.java 10 Jan 2008 18:35:36 -0000 1.3
+++ FilePreferenceManager.java 22 Dec 2008 18:13:07 -0000 1.4
@@ -19,11 +19,13 @@
* END COPYRIGHT BLOCK **/
package com.netscape.management.client.preferences;
-import java.util.*;
import java.io.File;
import java.io.FilenameFilter;
-import com.netscape.management.client.console.*;
-import com.netscape.management.client.util.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import com.netscape.management.client.console.Console;
+import com.netscape.management.client.util.Debug;
/**
* A PreferenceManager that reads and stores preference
14 years, 11 months