Author: nkinder
Update of /cvs/dirsec/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7982
Modified Files:
Makefile.am Makefile.in config.c configure configure.ac dsgw.h
dsgwutil.c
Log Message:
General templating work for DSGW CGI URI's.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am 11 Jan 2008 21:58:09 -0000 1.4
+++ Makefile.am 14 Jan 2008 22:31:17 -0000 1.5
@@ -51,7 +51,8 @@
-DHTMLDIR=\"$(htmldir)\" -DCOOKIEDIR=\"$(cookiedir)\" \
-DCONFIGDIR=\"$(configdir)\" -DSECURITYDIR=\"$(securitydir)\" \
-DCGIBINDIR=\"$(cgibindir)\" -DCONTEXTDIR=\"$(contextdir)\" \
- -DINSTCONFIGDIR=\"$(instconfigdir)\" -DMANUALDIR=\"$(manualdir)\"
+ -DINSTCONFIGDIR=\"$(instconfigdir)\" -DMANUALDIR=\"$(manualdir)\" \
+ -DCGIURIBASE=\"$(cgiuri)\"
LIBS = @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ \
@icu_lib@ -licui18n -licuuc -licudata \
@@ -234,6 +235,7 @@
-e 's,@cgiuri\@,$(cgiuri),g' \
-e 's,@orguri\@,$(orguri),g' \
-e 's,@dsgwuri\@,$(dsgwuri),g' \
+ -e 's,@pburi\@,$(pburi),g' \
-e 's,@cmdbindir\@,$(cmdbindir),g' \
-e 's,@propertydir\@,$(propertydir),g' \
-e 's,@htmldir\@,$(htmldir),g' \
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 11 Jan 2008 21:58:09 -0000 1.4
+++ Makefile.in 14 Jan 2008 22:31:17 -0000 1.5
@@ -345,6 +345,7 @@
orguri = @orguri@
pbconfigdir = $(datadir)@pbconfigdir@
pbhtmldir = $(datadir)@pbhtmldir@
+pburi = @pburi@
perldir = $(libdir)@perldir@
perlexec = @perlexec@
prefix = @prefix@
@@ -370,7 +371,7 @@
-DCONFIGDIR=\"$(configdir)\" -DSECURITYDIR=\"$(securitydir)\" \
-DCGIBINDIR=\"$(cgibindir)\" -DCONTEXTDIR=\"$(contextdir)\" \
-DINSTCONFIGDIR=\"$(instconfigdir)\" \
- -DMANUALDIR=\"$(manualdir)\"
+ -DMANUALDIR=\"$(manualdir)\" -DCGIURIBASE=\"$(cgiuri)\"
# these are programs which we do not want to link with nss
NEED_SECGLUE = unauth search csearch newentry tutor lang
@@ -511,6 +512,7 @@
-e 's,@cgiuri\@,$(cgiuri),g' \
-e 's,@orguri\@,$(orguri),g' \
-e 's,@dsgwuri\@,$(dsgwuri),g' \
+ -e 's,@pburi\@,$(pburi),g' \
-e 's,@cmdbindir\@,$(cmdbindir),g' \
-e 's,@propertydir\@,$(propertydir),g' \
-e 's,@htmldir\@,$(htmldir),g' \
Index: config.c
===================================================================
RCS file: /cvs/dirsec/dsgw/config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.c 10 Jan 2008 01:19:36 -0000 1.2
+++ config.c 14 Jan 2008 22:31:17 -0000 1.3
@@ -120,7 +120,7 @@
gc->gc_tmpldir = DSGW_TMPLDIR_HTTP; /* may be overridden below */
gc->gc_urlpfxmain = DSGW_URLPREFIX_MAIN_HTTP; /* may be overridden below */
/*gc->gc_urlpfxcgi = DSGW_URLPREFIX_CGI_HTTP;*/
- gc->gc_urlpfxcgi = DSGW_URLPREFIX_BIN; /* may be overridden below */
+ gc->gc_urlpfxcgi = CGIURIBASE; /* may be overridden below */
gc->gc_binddn = gc->gc_bindpw = "";
gc->gc_charset = NULL; /* implicitly ISO-8859-1 */
gc->gc_ClientLanguage = "";
@@ -200,11 +200,11 @@
* DSGW_CONFIGFILE in the config directory
*/
if (context == NULL) {
- PR_snprintf( path, MAXPATHLEN, "%s$$LANGDIR/%s",
+ PR_snprintf( path, MAXPATHLEN, "%s/$$LANGDIR/%s",
DSGW_CONFIGDIR_HTTP, DSGW_CONFIGFILE);
len = strlen( DSGW_CONFIGDIR_HTTP ) + strlen( DSGW_CONFIGFILE ) + 32;
} else {
- PR_snprintf( path, MAXPATHLEN, "%s$$LANGDIR/%s.conf",
+ PR_snprintf( path, MAXPATHLEN, "%s/$$LANGDIR/%s.conf",
DSGW_CONTEXTDIR_HTTP, context);
/* increased the length from 11 -- fix for auth crash on AIX */
len = strlen( DSGW_CONTEXTDIR_HTTP ) + strlen( context ) + 32;
Index: configure
===================================================================
RCS file: /cvs/dirsec/dsgw/configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configure 11 Jan 2008 21:58:09 -0000 1.4
+++ configure 14 Jan 2008 22:31:17 -0000 1.5
@@ -466,7 +466,7 @@
#endif"
ac_default_prefix=/opt/dirsrv
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION
PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir
libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir
infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF
AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p
AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu
host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR
am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE
am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE
SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS POW_LIB PACKAGE_BASE_NAME instconfigdir
BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN perlexec CXXLINK_REQUIRED_TRUE
CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG
ICU_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib
sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib
adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin cgibindir cgiuri dsgwuri
orguri propertydir htmldir pbhtmldir orghtmldir configdir pbconfigdir contextdir
securitydir cookiedir perldir NEED_LDIF_TRUE NEED_LDIF_FALSE WINNT_TRUE WINNT_FALSE
LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION
PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir
libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir
infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF
AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p
AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu
host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR
am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE
am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE
SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS POW_LIB PACKAGE_BASE_NAME instconfigdir
BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN perlexec CXXLINK_REQUIRED_TRUE
CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG
ICU_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib
sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib
adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin cgibindir cgiuri dsgwuri
orguri pburi propertydir htmldir pbhtmldir orghtmldir configdir pbconfigdir contextdir
securitydir cookiedir perldir NEED_LDIF_TRUE NEED_LDIF_FALSE WINNT_TRUE WINNT_FALSE
LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -21551,6 +21551,7 @@
cgiuri=/cgi-bin
dsgwuri=/dsgw
orguri=/orgchart
+pburi=/dsgw/pbhtml
# Check for library dependencies
# BEGIN COPYRIGHT BLOCK
@@ -22626,6 +22627,7 @@
+
# need a check here to see if the ldif functions are exported from libldap
# for now, just assume they are not
@@ -23492,6 +23494,7 @@
s,@cgiuri@,$cgiuri,;t t
s,@dsgwuri@,$dsgwuri,;t t
s,@orguri@,$orguri,;t t
+s,@pburi@,$pburi,;t t
s,@propertydir@,$propertydir,;t t
s,@htmldir@,$htmldir,;t t
s,@pbhtmldir@,$pbhtmldir,;t t
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/dsgw/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configure.ac 11 Jan 2008 21:58:09 -0000 1.4
+++ configure.ac 14 Jan 2008 22:31:17 -0000 1.5
@@ -278,6 +278,7 @@
cgiuri=/cgi-bin
dsgwuri=/dsgw
orguri=/orgchart
+pburi=/dsgw/pbhtml
# Check for library dependencies
m4_include(m4/nspr.m4)
@@ -315,6 +316,7 @@
AC_SUBST(cgiuri)
AC_SUBST(dsgwuri)
AC_SUBST(orguri)
+AC_SUBST(pburi)
AC_SUBST(propertydir)
AC_SUBST(htmldir)
AC_SUBST(pbhtmldir)
Index: dsgw.h
===================================================================
RCS file: /cvs/dirsec/dsgw/dsgw.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dsgw.h 10 Jan 2008 01:19:36 -0000 1.2
+++ dsgw.h 14 Jan 2008 22:31:17 -0000 1.3
@@ -266,7 +266,6 @@
/* URL prefixes specific to our gateway */
#define DSGW_URLPREFIX_MAIN_HTTP "lang?file="
#define DSGW_URLPREFIX_CGI_HTTP ""
-#define DSGW_URLPREFIX_BIN "/clients/dsgw/bin/"
#define DSGW_URLPREFIX_MAIN DSGW_URLPREFIX_MAIN_HTTP
Index: dsgwutil.c
===================================================================
RCS file: /cvs/dirsec/dsgw/dsgwutil.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dsgwutil.c 10 Jan 2008 01:19:36 -0000 1.2
+++ dsgwutil.c 14 Jan 2008 22:31:17 -0000 1.3
@@ -93,7 +93,7 @@
(void)ADMUTIL_Init();
/* initialize the string database */
- XP_InitStringDatabase("../property", "dsgw");
+ XP_InitStringDatabase(PROPERTYDIR, "dsgw");
/* set default default languages for string database */
SetLanguage(CLIENT_LANGUAGE, "");
SetLanguage(ADMIN_LANGUAGE, "");
@@ -664,7 +664,7 @@
" window.open('%s?%s&context=%s',
'infowin_dsgw', "
" 'resizable=1,width=400,height=500');"
"}\">\n",
- XP_GetClientStr(DBT_help_1),tutorvp, topic, context,
+ XP_GetClientStr(DBT_help_1), tutorvp, topic, context,
tutorvp, topic, context );
}
@@ -855,9 +855,9 @@
vpmap[ cginum ] = dsgw_ch_malloc( strlen( gc->gc_urlpfxcgi ) + strlen( surl )
/*+ strlen( extpath ) */
- + strlen( cginame ) + 2 );
+ + strlen( cginame ) + 3 );
- sprintf( vpmap[ cginum ], "%s%s%s", surl,
+ sprintf( vpmap[ cginum ], "%s%s/%s", surl,
/*extpath, */
gc->gc_urlpfxcgi, cginame );