[Fedora-directory-commits] dsgw configure.ac, 1.10, 1.11 csearch.c, 1.6, 1.7 dbtdsgw.h, 1.5, 1.6 dnedit.c, 1.6, 1.7 dsgw-httpd.conf.in, 1.5, 1.6 dsgwutil.c, 1.11, 1.12 emitauth.c, 1.4, 1.5 entrydisplay.c, 1.9, 1.10 error.c, 1.4, 1.5 htmlout.c, 1.5, 1.6 newentry.c, 1.4, 1.5 tutor.c, 1.4, 1.5 unauth.c, 1.3, 1.4 aclocal.m4, 1.15, 1.16 configure, 1.18, 1.19 missing, 1.14, 1.15 install-sh, 1.14, 1.15 Makefile.in, 1.19, 1.20 depcomp, 1.14, 1.15 config.sub, 1.14, 1.15 config.guess, 1.14, 1.15 compile, 1.14, 1.15

[Doctor Conrad]

Author: rmeggins

Update of /cvs/dirsec/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31631/dsgw

Modified Files:
	configure.ac csearch.c dbtdsgw.h dnedit.c dsgw-httpd.conf.in 
	dsgwutil.c emitauth.c entrydisplay.c error.c htmlout.c 
	newentry.c tutor.c unauth.c aclocal.m4 configure missing 
	install-sh Makefile.in depcomp config.sub config.guess compile 
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is the second pass.  I focused mainly on the
dsgw pages.  Some of the fixes will apply to phonebook too.
I also moved the cgi bin directory to dsgw-cgi-bin - needs to be completely
separate from the admin server cgi bin directory.  There are changes to
dsgw-httpd.conf to reflect this as well as changes to other files.
The dsgw uses a path of dsgwcmd, instead of using cgi-bin directly.  This
is mapped in the dsgw-httpd.conf.
One problem that still remains - HTML Tidy does not like frames and framesets.
The only workaround suggested is to rewrite them using divs.  I'm not really
up to the task right now.
Platforms tested: RHEL5 x86_64
Flag day: Yes - autotool file changes.
Doc: none yet



Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/dsgw/configure.ac,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- configure.ac	1 Feb 2008 16:50:12 -0000	1.10
+++ configure.ac	20 Mar 2008 02:18:39 -0000	1.11
@@ -245,7 +245,7 @@
   manualsubdir=
   propertydir=/$PACKAGE_NAME/properties
   # relative to libdir
-  cgibindir=/$PACKAGE_NAME/cgi-bin
+  cgibindir=/$PACKAGE_NAME/dsgw-cgi-bin
   perldir=/$PACKAGE_NAME/perl
 elif test "$with_fhs_opt" = "yes"; then
   # relative to datadir
@@ -264,7 +264,7 @@
   # relative to libdir
   perldir=/perl
   # same as server's cgibindir
-  cgibindir=/cgi-bin
+  cgibindir=/dsgw-cgi-bin
 else
   # relative to datadir
   htmldir=/$PACKAGE_BASE_NAME/dsgw/html
@@ -282,7 +282,7 @@
   # relative to libdir
   perldir=/$PACKAGE_BASE_NAME/perl
   # CGI program directory
-  cgibindir=/$PACKAGE_BASE_NAME/cgi-bin
+  cgibindir=/$PACKAGE_BASE_NAME/dsgw-cgi-bin
 fi
 
 # relative to instconfigdir
@@ -291,7 +291,7 @@
 # relative to $localstatedir
 cookiedir=/run/$PACKAGE_BASE_NAME/dsgw/cookies
 # URIs
-cgiuri=/cgi-bin
+cgiuri=/dsgwcmd
 dsgwuri=/dsgw
 orguri=/org
 pburi=/pb


Index: csearch.c
===================================================================
RCS file: /cvs/dirsec/dsgw/csearch.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- csearch.c	6 Mar 2008 22:00:09 -0000	1.6
+++ csearch.c	20 Mar 2008 02:18:39 -0000	1.7
@@ -274,7 +274,7 @@
 		}
 
 	    } else if ( dsgw_directive_is( line, "DS_CSEARCH_MATCH_FORM" )) {
-		dsgw_form_begin ("searchMatchForm", NULL);
+		dsgw_form_begin ("searchMatchForm",
"action=\"javascript:void();\"");
 		dsgw_emits("\n");
 
 	    } else if ( dsgw_directive_is( line, "DS_CSEARCH_STRING_FORM" )) {
@@ -295,7 +295,7 @@
 		dsgw_emitf ("<SELECT NAME=searchType "
 			   
"onChange=\"parent.searchTypeSet(this.options[this.selectedIndex].value);"
 			    "this.form.submit();"
-			   
"parent.searchMatchFrame.location='%s?context=%s&file=match&'+this.name+'='"
+			   
"parent.searchMatchFrame.location='%s?context=%s&amp;file=match&amp;'+this.name+'='"
 			    "+escape(this.options[this.selectedIndex].value);\">\n", 
 			    dsgw_getvp( DSGW_CGINUM_CSEARCH), context);
 		dsgw_emit_options (&sop, NULL, NULL);


Index: dbtdsgw.h
===================================================================
RCS file: /cvs/dirsec/dsgw/dbtdsgw.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dbtdsgw.h	6 Mar 2008 22:00:09 -0000	1.5
+++ dbtdsgw.h	20 Mar 2008 02:18:39 -0000	1.6
@@ -257,7 +257,7 @@
 	ResDef( DBT_beforeYouCanEditOrAddEntriesYouM_, 206, "Before you can edit or add
entries, you must authenticate\n(log in) to the directory.  This window will guide\nyou
through the steps of the authentication\nprocess.\n" )/*extracted from emitauth.c*/
 	ResDef( DBT_fromThisScreenYouMayAuthenticate_, 207, "From this screen you may
authenticate, or log in, \nto the directory.  You will need to authenticate\nbefore you
can modify directory entries.  If you\nattempt to modify an entry without
authenticating,\nyou will be asked to log in.\n" )/*extracted from emitauth.c*/
 	ResDef( DBT_authenticationStatus_, 208, "Authentication Status" )/*extracted
from emitauth.c*/
-	ResDef( DBT_FormNyouAreCurrentlyAuthenticate_, 209, "<form>\nYou are
currently authenticated to the directory as " )/*extracted from emitauth.c*/
+	ResDef( DBT_FormNyouAreCurrentlyAuthenticate_, 209, "<form
action=\"javascript:void();\">\nYou are currently authenticated to the
directory as " )/*extracted from emitauth.c*/
 	ResDef( DBT_NifYouWishToDiscardYourAuthentic_, 210, ".\nIf you wish to discard your
authentication credentials and log out of the directory, click on the button below."
)/*extracted from emitauth.c*/
 	ResDef( DBT_discardAuthenticationCredentials_2, 211, "Discard Authentication
Credentials (log out)" )/*extracted from emitauth.c*/
 	ResDef( DBT_yourAuthenticationCredentialsFor_, 212, "Your authentication
credentials for " )/*extracted from emitauth.c*/
@@ -347,9 +347,9 @@
 	ResDef( DBT_Adding_, 300, "Adding" )/*extracted from domodify.c*/
 	ResDef( DBT_Deleting_, 301, "Deleting" )/*extracted from domodify.c*/
 	ResDef( DBT_Renaming_, 302, "Renaming" )/*extracted from domodify.c*/
-	ResDef( DBT_noNameInTheList_, 303, "There are <B>no</B> names in the
list." )/*extracted from dnedit.c*/
-	ResDef( DBT_oneNameInTheList_, 304, "There is <B>1</B> name in the
list." )/*extracted from dnedit.c*/
-	ResDef( DBT_someNamesInTheList_, 305, "There are <B>%s</B> names in the
list." )/*extracted from dnedit.c*/
+	ResDef( DBT_noNameInTheList_, 303, "There are <B>no<\\\\/B> names in
the list." )/*extracted from dnedit.c*/
+	ResDef( DBT_oneNameInTheList_, 304, "There is <B>1<\\\\/B> name in the
list." )/*extracted from dnedit.c*/
+	ResDef( DBT_someNamesInTheList_, 305, "There are <B>%s<\\/B> names in
the list." )/*extracted from dnedit.c*/
 	ResDef( DBT_RemoveFromList_, 306, "Remove<BR>from<BR>list?       
Name" )/*extracted from dnedit.c -- should be JavaScript syntax*/
 	ResDef( DBT_discardChanges_, 307, "Discard Changes?" ) /*extracted from
dnedit.c */
 	ResDef( DBT_discardChangesWindow_, 308, "width=300,height=130,resizable" )
/*extracted from dnedit.c */


Index: dnedit.c
===================================================================
RCS file: /cvs/dirsec/dsgw/dnedit.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dnedit.c	6 Mar 2008 22:00:09 -0000	1.6
+++ dnedit.c	20 Mar 2008 02:18:39 -0000	1.7
@@ -95,7 +95,9 @@
 	
 
     /* Send the top-level document HTML */
-    dsgw_emits( "<HTML>\n"
+    dsgw_emits( "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML
4.01//EN\"\n" );
+    dsgw_emits( "   
\"http://www.w3.org/TR/html4/frameset.dtd\">\n" );
+    dsgw_emits( "<HTML>\n<HEAD><TITLE>DN
Edit</TITLE>\n"
 		"<SCRIPT type=\"text/javascript\">\n" );
     dsgw_emitf( "var emptyFrame = '';\n" );
     dsgw_emitf( "var attrname = '%s';\n", attrname );
@@ -221,28 +223,30 @@
 	"    var d = oframe.document;\n"
 	"\n"
 	"    d.open('text/html');\n"
-	"    d.writeln('<HTML>');\n" );
+	"    d.writeln('<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML
4.01//EN\"\\n');\n"
+	"    d.writeln('   
\"http://www.w3.org/TR/html4/frameset.dtd\">\\n');\n"
+	"    d.writeln('<HTML>\\n<HEAD><TITLE>DN
Edit<\\/TITLE><\\/HEAD>\\n');\n" );
 
     dsgw_emitf(
 	"    d.writeln('<BODY %s>');\n", dsgw_html_body_colors );
     dsgw_emits(
         "    d.writeln(");
     dsgw_quotation_begin (QUOTATION_JAVASCRIPT);
-    dsgw_form_begin (NULL, NULL);
+    dsgw_form_begin (NULL,  "action=\"javascript:void();\"");
     dsgw_quotation_end();
     dsgw_emits(      ");\n");
     dsgw_emits( 
 	"    d.writeln('<CENTER>');\n"
 	"    if (dnl.count == 0) {\n" );
 
-    dsgw_emits( "       d.write(" );
-    dsgw_quote_emits (QUOTATION_JAVASCRIPT, XP_GetClientStr (DBT_noNameInTheList_));
-    dsgw_emits( ");\n" );
+    dsgw_emits( "       d.write('" );
+    dsgw_fputn( stdout, XP_GetClientStr (DBT_noNameInTheList_), strlen(XP_GetClientStr
(DBT_noNameInTheList_)) );
+    dsgw_emits( "');\n" );
 
     dsgw_emits( "    } else if (dnl.count == 1) {\n" );
-    dsgw_emits( "       d.write(" );
-    dsgw_quote_emits (QUOTATION_JAVASCRIPT, XP_GetClientStr (DBT_oneNameInTheList_));
-    dsgw_emits( ");\n" );
+    dsgw_emits( "       d.write('" );
+    dsgw_fputn( stdout, XP_GetClientStr (DBT_oneNameInTheList_), strlen(XP_GetClientStr
(DBT_oneNameInTheList_)) );
+    dsgw_emits( "');\n" );
     dsgw_emits( "    } else {\n" );
     dsgw_emits( "       d.write('");
     dsgw_emitf( XP_GetClientStr( DBT_someNamesInTheList_ ), "' + dnl.count +
'" );
@@ -251,16 +255,16 @@
     dsgw_emits( 
 	"    }\n"
 #ifdef NAV30_SORT_NO_LONGER_COREDUMPS
-	"    d.writeln('</FONT>\\n')\n"
-	"    d.writeln('<INPUT TYPE=\"button\" VALUE=\"Sort\"
onClick=\"parent.sortEntries();\"></CENTER>\\n');\n"
+	"    d.writeln('\\n')\n"
+	"    d.writeln('<INPUT TYPE=\"button\" VALUE=\"Sort\"
onClick=\"parent.sortEntries();\"><\\/CENTER>\\n');\n"
 #else
-	"    d.writeln('</FONT></CENTER>\\n');\n"
+	"    d.writeln('<\\/CENTER>\\n');\n"
 #endif
 	"    if (dnl.count > 0) {\n"
 	"	d.write('<PRE><B>');\n" );
 
     dsgw_emitf(
-	"	d.write('%s</B><HR>');\n",
+	"	d.write('%s<\\/B><\\/PRE><HR><PRE>');\n",
 		XP_GetClientStr( DBT_RemoveFromList_ ));
 
     dsgw_emits( 
@@ -270,9 +274,9 @@
 	"	    d.write('           ');\n"
 	"	    d.write(dnl[i].rdn + '\\n');\n"
 	"	}\n"
-	"	d.writeln('</PRE></FORM><HR>');\n"
+	"	d.writeln('<\\/PRE><\\/FORM><HR>');\n"
 	"    }\n"
-	"    d.writeln('</BODY>');\n"
+	"    d.writeln('<\\/BODY>');\n"
 	"    d.close();\n"
 	"}\n"
 	"\n"
@@ -384,19 +388,23 @@
 	"VALUE=\"");
     dsgw_emits(context);
     dsgw_emits("\">\\n');\n"
-	"    of.writeln('</FORM>\\n');\n"
+	"    of.writeln('<\\/FORM>\\n');\n"
 	"    of.close();\n"
 	"}\n"
 
 	"</SCRIPT>\n"
-	"\n"
-	"<FRAMESET BORDER=1 FRAMEBORDER=1 ROWS=230,*,0,0 "
+	"</HEAD>\n"
+	"<FRAMESET BORDER=\"1\" FRAMEBORDER=\"1\"
ROWS=\"230,*,0,0\" "
 	"SCROLLING=\"NO\" NORESIZE onLoad=\"genOutputFrame"
 	"(this.outputFrame, this.dnlist);\">\n" );
     dsgw_emitf( "   <FRAME
SRC=\"%s?tmplname=%s&amp;dn=%s&amp;context=%s&amp;DNATTR=%s&amp;"
 	     "DNDESC=%s\" NAME=\"controlFrame\"
SCROLLING=\"no\">\n",
-	     dsgw_getvp( DSGW_CGINUM_EDIT ), tmplname, edn, context, attrname,
-	     attrdesc );
+	     dsgw_getvp( DSGW_CGINUM_EDIT ),
+	     dsgw_strdup_escaped(tmplname),
+	     edn,
+	     context,
+	     dsgw_strdup_escaped(attrname),
+	     dsgw_strdup_escaped(attrdesc) );
     dsgw_emitf( "   <FRAME SRC=\"javascript:parent.emptyFrame\" "
 	   "NAME=\"outputFrame\">\n"
 	    "   <FRAME SRC=\"javascript:parent.emptyFrame\" "


Index: dsgw-httpd.conf.in
===================================================================
RCS file: /cvs/dirsec/dsgw/dsgw-httpd.conf.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dsgw-httpd.conf.in	28 Jan 2008 21:22:47 -0000	1.5
+++ dsgw-httpd.conf.in	20 Mar 2008 02:18:39 -0000	1.6
@@ -83,9 +83,8 @@
 </Directory>
 
 # Allow access to the cgi programs
-<Directory "@cgibindir@">
-    AllowOverride None
+<Location "@cgiuri@">
     Options +ExecCGI
     Order allow,deny
     Allow from all
-</Directory>
+</Location>


Index: dsgwutil.c
===================================================================
RCS file: /cvs/dirsec/dsgw/dsgwutil.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dsgwutil.c	6 Mar 2008 22:00:09 -0000	1.11
+++ dsgwutil.c	20 Mar 2008 02:18:39 -0000	1.12
@@ -1082,7 +1082,7 @@
 	dsgw_emits( "</CENTER>\n" );
 	dsgw_emits( XP_GetClientStr( DBT_YourPasswordHasExpired_ ));
 	dsgw_emits( XP_GetClientStr( DBT_YouMustChangeYourPasswd_ ));
-	dsgw_emits( "<P>\n"
+	dsgw_emits( "<br>\n"
 	    "<TR>\n"
 	    "<SCRIPT type=\"text/javascript\">\n"
 	    "<!-- Hide from non-JavaScript browsers\n"


Index: emitauth.c
===================================================================
RCS file: /cvs/dirsec/dsgw/emitauth.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- emitauth.c	6 Mar 2008 22:00:09 -0000	1.4
+++ emitauth.c	20 Mar 2008 02:18:39 -0000	1.5
@@ -78,7 +78,7 @@
     dsgw_emitf( "<CENTER>\n"
 	"<FONT SIZE=+2>%s</FONT>\n"
 	"</CENTER>\n"
-	"<p>", XP_GetClientStr(DBT_authenticateLogInToTheDirectory_) );
+	"<br>", XP_GetClientStr(DBT_authenticateLogInToTheDirectory_) );
 
     if ( isPwForm ) {
 #ifdef NOTFORNOW
@@ -102,7 +102,7 @@
 	"<CENTER>\n"
 	"<FONT SIZE=+2>%s</FONT>\n"
 	"</CENTER>\n"
-	"<P>\n", XP_GetClientStr(DBT_authenticationStatus_) );
+	"<br>\n", XP_GetClientStr(DBT_authenticationStatus_) );
 
     if ( isauth ) {
 	auto char *ufn;
@@ -115,8 +115,8 @@
 	    "<INPUT TYPE=BUTTON "
 	    "VALUE=\"%s\""
 	    "onClick=\"doUnauth();\">\n"
-	    "</FORM>\n"
 	    "</CENTER>\n"
+	    "</FORM>\n"
 	    "<HR>\n",
 	    XP_GetClientStr(DBT_NifYouWishToDiscardYourAuthentic_),
 	    XP_GetClientStr(DBT_discardAuthenticationCredentials_2) );


Index: entrydisplay.c
===================================================================
RCS file: /cvs/dirsec/dsgw/entrydisplay.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- entrydisplay.c	6 Mar 2008 22:00:09 -0000	1.9
+++ entrydisplay.c	20 Mar 2008 02:18:39 -0000	1.10
@@ -544,7 +544,7 @@
 				 dsgw_getvp( DSGW_CGINUM_DOSEARCH ),
 				 "target=stagingFrame",
 				 "onSubmit=\"return parent.processSearch(searchForm);\"" );
-		dsgw_emitf( "\n<INPUT TYPE=\"hidden\" NAME=\"dn\"
VALUE=\"%s\";>\n", encodeddn );
+		dsgw_emitf( "\n<INPUT TYPE=\"hidden\" NAME=\"dn\"
VALUE=\"%s\">\n", encodeddn );
 
 	    } else if ( dsgw_directive_is( line, DRCT_DS_BEGIN_ENTRYFORM )) {
 		if ( editable ) {
@@ -692,10 +692,6 @@
 	output_prelude( tip );
     }
 
-    while ( dsgw_next_html_line( tip->dsti_fp, line )) {
-	output_nonentry_line( tip, line );
-    }
-
     /*
      * check for "completion_javascript" form var and
      * execute it if present.
@@ -706,6 +702,10 @@
 	dsgw_emit_completion_javascript(jscomp, dn ? dn : "");
     }
 
+    while ( dsgw_next_html_line( tip->dsti_fp, line )) {
+	output_nonentry_line( tip, line );
+    }
+
     fflush( stdout );
     fflush( stdout );
 


Index: error.c
===================================================================
RCS file: /cvs/dirsec/dsgw/error.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- error.c	6 Mar 2008 22:00:09 -0000	1.4
+++ error.c	20 Mar 2008 02:18:39 -0000	1.5
@@ -209,7 +209,7 @@
 #endif
     if ( ldaperr  != 0 ) {
 	msg = dsgw_ldaperr2longstring( ldaperr, options );
-	dsgw_emitf("<P>%s", msg );
+	dsgw_emitf("<br>%s", msg );
     }
 
     if (( options & DSGW_ERROPT_INLINE ) == 0 ) {
@@ -284,7 +284,7 @@
     if (gc->gc_mode == DSGW_MODE_EDIT || gc->gc_mode == DSGW_MODE_DOMODIFY) {
 
 	dsgw_emits( XP_GetClientStr(DBT_NPYouMustReAuthenticateBeforeCon_1) );
-	dsgw_emits( "<P>\n" );
+	dsgw_emits( "<br>\n" );
 	dsgw_form_begin( NULL, NULL );
 	dsgw_emits("\n<CENTER><TABLE border=2
width=\"100%\"><TR>\n" );
 	dsgw_emits( "<TD WIDTH=\"50%\" ALIGN=\"center\">\n"
);


Index: htmlout.c
===================================================================
RCS file: /cvs/dirsec/dsgw/htmlout.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- htmlout.c	6 Mar 2008 22:00:09 -0000	1.5
+++ htmlout.c	20 Mar 2008 02:18:39 -0000	1.6
@@ -112,7 +112,7 @@
     if (( title != NULL ) && ( header_done || titleinbody )) {
 	dsgw_emitf( "<CENTER><TABLE BORDER=\"2\"
CELLPADDING=\"10\" WIDTH=100%%>\n"
 		"<TR><TD ALIGN=\"center\"
WIDTH=\"100%%\">\n<FONT SIZE=\"+2\">"
-		"<B>%s</B></FONT></TD></TR></TABLE></CENTER>\n<P>\n",
title );
+		"<B>%s</B></FONT></TD></TR></TABLE></CENTER>\n<br>\n",
title );
     }
 
     header_done = 1;
@@ -371,6 +371,9 @@
 	dsgw_emits (" ");
 	dsgw_emitfv (format, argl);
 	va_end (argl);
+    } else {
+	/* a form must have an action */
+	dsgw_emits (" action=\"javascript:void();\"");
     }
     dsgw_emits (">");
     dsgw_emitf("<INPUT type=hidden name=context value=\"%s\">",
context);


Index: newentry.c
===================================================================
RCS file: /cvs/dirsec/dsgw/newentry.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- newentry.c	6 Mar 2008 22:00:09 -0000	1.4
+++ newentry.c	20 Mar 2008 02:18:39 -0000	1.5
@@ -154,7 +154,7 @@
 			    dsgw_html_body_colors );
 
 	    } else if ( dsgw_directive_is( line, "DS_NEWENTRY_TYPE_FORM" )) {
-		dsgw_form_begin ("typeForm", NULL);
+		dsgw_form_begin ("typeForm",
"action=\"javascript:void();\"");
 		dsgw_emits ("\n");
 
 	    } else if ( dsgw_directive_is( line, "DS_NEWENTRY_TYPE_SELECT" )) {
@@ -332,11 +332,13 @@
     char* newurl = compute_newurl();
     if (client_is_authenticated()) {
 	/* Direct the client to GET newurl */
+	dsgw_emits( "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML
4.01//EN\"\n" );
+	dsgw_emits( "    \"http://www.w3.org/TR/html4/frameset.dtd\">\n"
);
 	dsgw_emits ("<HTML>" );
 	dsgw_head_begin();
 	dsgw_emitf ("\n<TITLE>%s</TITLE>\n", XP_GetClientStr
(DBT_titleNewEntry_));
 	dsgw_emits ("</HEAD>\n"
-		    "<FRAMESET ROWS=*,1>\n");
+		    "<FRAMESET ROWS=\"*,1\">\n");
 	dsgw_emitf ("    <FRAME SRC=\"%s\" NORESIZE>\n", newurl);
 	dsgw_emits ("</FRAMESET>\n"
 		    "</HTML>\n");


Index: tutor.c
===================================================================
RCS file: /cvs/dirsec/dsgw/tutor.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tutor.c	6 Mar 2008 22:00:09 -0000	1.4
+++ tutor.c	20 Mar 2008 02:18:39 -0000	1.5
@@ -219,11 +219,11 @@
         dsgw_send_header();
         dsgw_emits("<TITLE>Directory Server Gateway
Help</TITLE>\n");
         dsgw_emits("\n"); 
-        dsgw_emits("<frameset BORDER=0 FRAMEBORDER=NO rows=\"57,*\"
"
+        dsgw_emits("<frameset BORDER=\"0\" FRAMEBORDER=\"NO\"
rows=\"57,*\" "
 		"onLoad=\"top.master=top.opener.top;top.master.helpwin=self;\" "
 		"onUnload=\"if (top.master) { top.master.helpwin=0; }\">\n" );
-        dsgw_emitf("<frame
src=\"%s?file=%s/infonav.html&amp;context=%s\" scrolling=no "
-		   "marginwidth=0 marginheight=0 "
+        dsgw_emitf("<frame
src=\"%s?file=%s/infonav.html&amp;context=%s\" scrolling=\"no\"
"
+		   "marginwidth=\"0\" marginheight=\"0\" "
 		   "name=\"infobuttons\">\n", dsgw_getvp(DSGW_CGINUM_LANG),
DSGW_MANUALSHORTCUT,
 		   context);
         dsgw_emitf("<frame src=\"%s?tutor=!%s&amp;context=%s\"
"


Index: unauth.c
===================================================================
RCS file: /cvs/dirsec/dsgw/unauth.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- unauth.c	6 Mar 2008 22:00:09 -0000	1.3
+++ unauth.c	20 Mar 2008 02:18:39 -0000	1.4
@@ -98,7 +98,7 @@
 	"%s"
 	"</FONT>\n"
 	"</CENTER>\n"
-	"<P>\n"
+	"<br>\n"
 	"%s",
 	XP_GetClientStr( DBT_Success_ ),
 	XP_GetClientStr( DBT_YouAreNoLongerAuthenticated_ ));




Index: configure
===================================================================
RCS file: /cvs/dirsec/dsgw/configure,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure	6 Mar 2008 22:00:09 -0000	1.18
+++ configure	20 Mar 2008 02:18:39 -0000	1.19
@@ -21394,7 +21394,7 @@
   manualsubdir=
   propertydir=/$PACKAGE_NAME/properties
   # relative to libdir
-  cgibindir=/$PACKAGE_NAME/cgi-bin
+  cgibindir=/$PACKAGE_NAME/dsgw-cgi-bin
   perldir=/$PACKAGE_NAME/perl
 elif test "$with_fhs_opt" = "yes"; then
   # relative to datadir
@@ -21413,7 +21413,7 @@
   # relative to libdir
   perldir=/perl
   # same as server's cgibindir
-  cgibindir=/cgi-bin
+  cgibindir=/dsgw-cgi-bin
 else
   # relative to datadir
   htmldir=/$PACKAGE_BASE_NAME/dsgw/html
@@ -21431,7 +21431,7 @@
   # relative to libdir
   perldir=/$PACKAGE_BASE_NAME/perl
   # CGI program directory
-  cgibindir=/$PACKAGE_BASE_NAME/cgi-bin
+  cgibindir=/$PACKAGE_BASE_NAME/dsgw-cgi-bin
 fi
 
 # relative to instconfigdir
@@ -21440,7 +21440,7 @@
 # relative to $localstatedir
 cookiedir=/run/$PACKAGE_BASE_NAME/dsgw/cookies
 # URIs
-cgiuri=/cgi-bin
+cgiuri=/dsgwcmd
 dsgwuri=/dsgw
 orguri=/org
 pburi=/pb