July 2007 - 389-commits - Fedora mailing-lists

[Fedora-directory-commits] adminserver/m4 httpd.m4,1.4,1.5
by Doctor Conrad 31 Jul '07

31 Jul '07

Author: nhosoi Update of /cvs/dirsec/adminserver/m4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7318/m4 Modified Files: httpd.m4 Log Message: Resolves: #203999 Summary: HP-UX: mime.types is not in /etc. (comment #5) Description: Introducing httpdconfdir to httpd.conf.in, which is going to be replaced with the parent directory of the httpd.conf full-path if the directory has mime.types (for HP-UX). Otherwise, check /etc if mime.types is located in the directory (for RHELs and Solaris). If mime.types is not found in the both directories, issue an error. Index: httpd.m4 =================================================================== RCS file: /cvs/dirsec/adminserver/m4/httpd.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- httpd.m4 22 Jun 2007 01:34:20 -0000 1.4 +++ httpd.m4 31 Jul 2007 00:19:22 -0000 1.5 @@ -66,6 +66,15 @@ mimemagic=${httpd_root}/${mimemagic} fi +# check for mime.types file +httpdconfdir=`dirname $httpdconf` +if test ! -f $httpdconfdir/mime.types ; then + httpdconfdir="/etc" + if test ! -f $httpdconfdir/mime.types ; then + AC_MSG_ERROR([mime.types file not found]) + fi +fi + # check for --with-apxs AC_MSG_CHECKING(for --with-apxs) AC_ARG_WITH(apxs,

1 0

[Fedora-directory-commits] adminserver/admserv/cfgstuff httpd.conf.in, 1.5, 1.6
by Doctor Conrad 31 Jul '07

31 Jul '07

Author: nhosoi Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7318/admserv/cfgstuff Modified Files: httpd.conf.in Log Message: Resolves: #203999 Summary: HP-UX: mime.types is not in /etc. (comment #5) Description: Introducing httpdconfdir to httpd.conf.in, which is going to be replaced with the parent directory of the httpd.conf full-path if the directory has mime.types (for HP-UX). Otherwise, check /etc if mime.types is located in the directory (for RHELs and Solaris). If mime.types is not found in the both directories, issue an error. Index: httpd.conf.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd.conf.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- httpd.conf.in 21 May 2007 15:52:26 -0000 1.5 +++ httpd.conf.in 31 Jul 2007 00:19:22 -0000 1.6 @@ -277,7 +277,7 @@ # TypesConfig describes where the mime.types file (or equivalent) is # to be found. # -TypesConfig /etc/mime.types +TypesConfig @httpdconfdir@/mime.types # # DefaultType is the default MIME type the server will use for a document

1 0

[Fedora-directory-commits] adminserver Makefile.am, 1.24, 1.25 Makefile.in, 1.27, 1.28 aclocal.m4, 1.21, 1.22 configure, 1.24, 1.25 configure.ac, 1.13, 1.14
by Doctor Conrad 31 Jul '07

31 Jul '07

Author: nhosoi Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7318 Modified Files: Makefile.am Makefile.in aclocal.m4 configure configure.ac Log Message: Resolves: #203999 Summary: HP-UX: mime.types is not in /etc. (comment #5) Description: Introducing httpdconfdir to httpd.conf.in, which is going to be replaced with the parent directory of the httpd.conf full-path if the directory has mime.types (for HP-UX). Otherwise, check /etc if mime.types is located in the directory (for RHELs and Solaris). If mime.types is not found in the both directories, issue an error. Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/adminserver/Makefile.am,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- Makefile.am 27 Jul 2007 01:42:46 -0000 1.24 +++ Makefile.am 31 Jul 2007 00:19:21 -0000 1.25 @@ -419,6 +419,7 @@ -e 's,@securitydir\@,$(securitydir),g' \ -e 's,@httpduser\@,$(httpduser),g' \ -e 's,@httpdgroup\@,$(httpdgroup),g' \ + -e 's,@httpdconfdir\@,$(httpdconfdir),g' \ -e 's,@piddir\@,$(piddir),g' \ -e 's,@pidfile\@,$(pidfile),g' \ -e 's,@admservport\@,$(admservport),g' \ Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/adminserver/Makefile.in,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- Makefile.in 31 Jul 2007 00:07:28 -0000 1.27 +++ Makefile.in 31 Jul 2007 00:19:21 -0000 1.28 @@ -394,7 +394,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -443,6 +442,7 @@ host_vendor = @host_vendor@ htmldir = $(datadir)@htmldir@ httpdconf = @httpdconf@ +httpdconfdir = @httpdconfdir@ httpdgroup = @httpdgroup@ httpduser = @httpduser@ icondir = $(datadir)@icondir@ @@ -811,6 +811,7 @@ -e 's,@securitydir\@,$(securitydir),g' \ -e 's,@httpduser\@,$(httpduser),g' \ -e 's,@httpdgroup\@,$(httpdgroup),g' \ + -e 's,@httpdconfdir\@,$(httpdconfdir),g' \ -e 's,@piddir\@,$(piddir),g' \ -e 's,@pidfile\@,$(pidfile),g' \ -e 's,@admservport\@,$(admservport),g' \ Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/adminserver/aclocal.m4,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- aclocal.m4 31 Jul 2007 00:07:28 -0000 1.21 +++ aclocal.m4 31 Jul 2007 00:19:21 -0000 1.22 @@ -1578,27 +1578,10 @@ # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -4305,9 +4288,6 @@ # Is the compiler the GNU C compiler? with_gcc=$_LT_AC_TAGVAR(GCC, $1) -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -4441,11 +4421,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) # Dependencies to place before the objects being linked to create a # shared library. @@ -4457,7 +4437,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -4537,7 +4517,7 @@ link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -6373,7 +6353,6 @@ done done done -IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -6406,7 +6385,6 @@ done ]) SED=$lt_cv_path_SED -AC_SUBST([SED]) AC_MSG_RESULT([$SED]) ]) Index: configure =================================================================== RCS file: /cvs/dirsec/adminserver/configure,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- configure 31 Jul 2007 00:07:28 -0000 1.24 +++ configure 31 Jul 2007 00:19:21 -0000 1.25 @@ -468,7 +468,7 @@ ac_default_prefix=/opt/fedora-ds ac_subdirs_all="$ac_subdirs_all mod_admserv" ac_subdirs_all="$ac_subdirs_all mod_restartd" -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 PACKAGE_BASE_NAME PACKAGE_BASE_VERSION LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_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 EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX! XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -3832,7 +3832,6 @@ done done done -IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -3867,7 +3866,6 @@ fi SED=$lt_cv_path_SED - echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 @@ -4308,7 +4306,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4311 "configure"' > conftest.$ac_ext + echo '#line 4309 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5443,7 +5441,7 @@ # Provide some information about the compiler. -echo "$as_me:5446:" \ +echo "$as_me:5444:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6506,11 +6504,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6509: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6507: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6513: \$? = $ac_status" >&5 + echo "$as_me:6511: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6774,11 +6772,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6777: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6775: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6781: \$? = $ac_status" >&5 + echo "$as_me:6779: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6878,11 +6876,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6881: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6879: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6885: \$? = $ac_status" >&5 + echo "$as_me:6883: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8343,31 +8341,10 @@ # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 8350 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -9244,7 +9221,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9247 "configure" +#line 9224 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9344,7 +9321,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9347 "configure" +#line 9324 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9675,9 +9652,6 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -9811,11 +9785,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects # Dependencies to place before the objects being linked to create a # shared library. @@ -9827,7 +9801,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -9907,7 +9881,7 @@ link_all_deplibs=$link_all_deplibs # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -11687,11 +11661,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11690: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11664: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11694: \$? = $ac_status" >&5 + echo "$as_me:11668: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11791,11 +11765,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11794: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11768: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11798: \$? = $ac_status" >&5 + echo "$as_me:11772: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12323,31 +12297,10 @@ # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 12330 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -12731,9 +12684,6 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_CXX -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -12867,11 +12817,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects_CXX # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects_CXX # Dependencies to place before the objects being linked to create a # shared library. @@ -12883,7 +12833,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path_CXX # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -12963,7 +12913,7 @@ link_all_deplibs=$link_all_deplibs_CXX # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -13385,11 +13335,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13388: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13338: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13392: \$? = $ac_status" >&5 + echo "$as_me:13342: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13489,11 +13439,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13492: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13442: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13496: \$? = $ac_status" >&5 + echo "$as_me:13446: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14934,31 +14884,10 @@ # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 14941 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -15342,9 +15271,6 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_F77 -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -15478,11 +15404,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects_F77 # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects_F77 # Dependencies to place before the objects being linked to create a # shared library. @@ -15494,7 +15420,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path_F77 # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -15574,7 +15500,7 @@ link_all_deplibs=$link_all_deplibs_F77 # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -15716,11 +15642,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15719: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15645: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15723: \$? = $ac_status" >&5 + echo "$as_me:15649: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15984,11 +15910,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15987: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15913: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15991: \$? = $ac_status" >&5 + echo "$as_me:15917: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16088,11 +16014,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16091: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16017: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16095: \$? = $ac_status" >&5 + echo "$as_me:16021: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17553,31 +17479,10 @@ # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 17560 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -17961,9 +17866,6 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_GCJ -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -18097,11 +17999,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects_GCJ # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects_GCJ # Dependencies to place before the objects being linked to create a # shared library. @@ -18113,7 +18015,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18193,7 +18095,7 @@ link_all_deplibs=$link_all_deplibs_GCJ # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -18445,9 +18347,6 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_RC -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -18581,11 +18480,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects_RC # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects_RC # Dependencies to place before the objects being linked to create a # shared library. @@ -18597,7 +18496,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path_RC # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18677,7 +18576,7 @@ link_all_deplibs=$link_all_deplibs_RC # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -23562,6 +23461,17 @@ mimemagic=${httpd_root}/${mimemagic} fi +# check for mime.types file +httpdconfdir=`dirname $httpdconf` +if test ! -f $httpdconfdir/mime.types ; then + httpdconfdir="/etc" + if test ! -f $httpdconfdir/mime.types ; then + { { echo "$as_me:$LINENO: error: mime.types file not found" >&5 +echo "$as_me: error: mime.types file not found" >&2;} + { (exit 1); exit 1; }; } + fi +fi + # check for --with-apxs echo "$as_me:$LINENO: checking for --with-apxs" >&5 echo $ECHO_N "checking for --with-apxs... $ECHO_C" >&6 @@ -24909,6 +24819,7 @@ + # WINNT should be true if building on Windows system not using # cygnus, mingw, or the like and using cmd.exe as the shell @@ -25716,7 +25627,6 @@ s,@CCDEPMODE@,$CCDEPMODE,;t t s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t -s,@SED@,$SED,;t t s,@EGREP@,$EGREP,;t t s,@LN_S@,$LN_S,;t t s,@ECHO@,$ECHO,;t t @@ -25776,6 +25686,7 @@ s,@icondir@,$icondir,;t t s,@manualdir@,$manualdir,;t t s,@httpdconf@,$httpdconf,;t t +s,@httpdconfdir@,$httpdconfdir,;t t s,@mimemagic@,$mimemagic,;t t s,@httpduser@,$httpduser,;t t s,@httpdgroup@,$httpdgroup,;t t Index: configure.ac =================================================================== RCS file: /cvs/dirsec/adminserver/configure.ac,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- configure.ac 30 Jul 2007 23:13:45 -0000 1.13 +++ configure.ac 31 Jul 2007 00:19:22 -0000 1.14 @@ -276,6 +276,7 @@ AC_SUBST(icondir) AC_SUBST(manualdir) AC_SUBST(httpdconf) +AC_SUBST(httpdconfdir) AC_SUBST(mimemagic) AC_SUBST(httpduser) AC_SUBST(httpdgroup)

1 0

[Fedora-directory-commits] adminserver aclocal.m4, 1.20, 1.21 configure, 1.23, 1.24 missing, 1.13, 1.14 install-sh, 1.13, 1.14 depcomp, 1.13, 1.14 config.sub, 1.13, 1.14 config.guess, 1.13, 1.14 compile, 1.12, 1.13 Makefile.in, 1.26, 1.27
by Doctor Conrad 31 Jul '07

31 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4623 Modified Files: aclocal.m4 configure missing install-sh depcomp config.sub config.guess compile Makefile.in Log Message: need to set icu_libdir for the --with-icu case too Index: configure =================================================================== RCS file: /cvs/dirsec/adminserver/configure,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- configure 30 Jul 2007 23:35:49 -0000 1.23 +++ configure 31 Jul 2007 00:07:28 -0000 1.24 @@ -24357,8 +24357,9 @@ then echo "$as_me:$LINENO: result: using $withval" >&5 echo "${ECHO_T}using $withval" >&6 - ICUDIR=$withval + ICUDIR="$withval" icu_lib="-L$ICUDIR/lib" + icu_libdir="$ICUDIR/lib" else echo { { echo "$as_me:$LINENO: error: $withval not found" >&5

1 0

[Fedora-directory-commits] adminserver/m4 icu.m4,1.2,1.3
by Doctor Conrad 31 Jul '07

31 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/m4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4623/m4 Modified Files: icu.m4 Log Message: need to set icu_libdir for the --with-icu case too Index: icu.m4 =================================================================== RCS file: /cvs/dirsec/adminserver/m4/icu.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- icu.m4 30 Jul 2007 23:35:49 -0000 1.2 +++ icu.m4 31 Jul 2007 00:07:27 -0000 1.3 @@ -27,8 +27,9 @@ if test -d "$withval"/lib then AC_MSG_RESULT([using $withval]) - ICUDIR=$withval + ICUDIR="$withval" icu_lib="-L$ICUDIR/lib" + icu_libdir="$ICUDIR/lib" else echo AC_MSG_ERROR([$withval not found])

1 0

[Fedora-directory-commits] adminserver aclocal.m4, 1.19, 1.20 configure, 1.22, 1.23 missing, 1.12, 1.13 install-sh, 1.12, 1.13 depcomp, 1.12, 1.13 config.sub, 1.12, 1.13 config.guess, 1.12, 1.13 compile, 1.11, 1.12 Makefile.in, 1.25, 1.26
by Doctor Conrad 31 Jul '07

31 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23990 Modified Files: aclocal.m4 configure missing install-sh depcomp config.sub config.guess compile Makefile.in Log Message: need to set icu_libdir Index: configure =================================================================== RCS file: /cvs/dirsec/adminserver/configure,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- configure 30 Jul 2007 23:13:45 -0000 1.22 +++ configure 30 Jul 2007 23:35:49 -0000 1.23 @@ -24411,6 +24411,7 @@ echo "$as_me:$LINENO: result: using $withval" >&5 echo "${ECHO_T}using $withval" >&6 icu_lib="-L$withval" + icu_libdir="$withval" else echo { { echo "$as_me:$LINENO: error: $withval not found" >&5

1 0

[Fedora-directory-commits] adminserver/m4 icu.m4,1.1,1.2
by Doctor Conrad 31 Jul '07

31 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/m4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23990/m4 Modified Files: icu.m4 Log Message: need to set icu_libdir Index: icu.m4 =================================================================== RCS file: /cvs/dirsec/adminserver/m4/icu.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- icu.m4 9 May 2007 00:26:38 -0000 1.1 +++ icu.m4 30 Jul 2007 23:35:49 -0000 1.2 @@ -61,6 +61,7 @@ then AC_MSG_RESULT([using $withval]) icu_lib="-L$withval" + icu_libdir="$withval" else echo AC_MSG_ERROR([$withval not found])

1 0

[Fedora-directory-commits] console fedora-idm-console.spec,1.1,1.2
by Doctor Conrad 31 Jul '07

31 Jul '07

Author: rmeggins Update of /cvs/dirsec/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23909 Modified Files: fedora-idm-console.spec Log Message: Resolves: bug 250178 Description: console: Spec file cleanup in prep for Fedora package review Fix Description: See http://fedoraproject.org/wiki/Packaging/Guidelines Reviewed by: nkinder (Thanks!) Index: fedora-idm-console.spec =================================================================== RCS file: /cvs/dirsec/console/fedora-idm-console.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-idm-console.spec 27 Jul 2007 20:29:59 -0000 1.1 +++ fedora-idm-console.spec 30 Jul 2007 23:32:33 -0000 1.2 @@ -3,32 +3,29 @@ Name: fedora-idm-console Version: %{major_version}.%{minor_version} -Release: 3 +Release: 4 +Summary: Fedora Management Console + Group: Applications -Vendor: Fedora Project -URL: http://directory.fedora.redhat.com License: LGPL -Packager: Red Hat, Inc. <http://bugzilla.redhat.com/bugzilla> -Summary: Fedora Management Console -BuildRoot: %{_tmppath}/%{name}-%{version}-root +URL: http://directory.fedora.redhat.com + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Source: %{name}-%{version}.tar.gz -Autoreq: 0 -AutoReqProv: no +Source: %{name}-%{version}.tar.bz2 Requires: %{name}-framework >= %{version} -BuildPreReq: ant >= 1.6.2, ldapjdk >= 4.18, jss >= 4.2 +BuildRequires: ant >= 1.6.2 +BuildRequires: ldapjdk +BuildRequires: jss >= 4.2 %description A Java based remote management console used for Managing Fedora Administration Server and Fedora Directory Server. -# prep and setup expect there to be a Source file -# in the /usr/src/redhat/SOURCES directory - it will be unpacked -# in the _builddir (not BuildRoot) - %package framework Summary: Fedora Management Console Framework -Requires: ldapjdk >= 4.18, jss >= 4.2 +BuildRequires: ldapjdk +BuildRequires: jss >= 4.2 Group: System Environment/Libraries %description framework @@ -36,41 +33,24 @@ %prep %setup -q - + %build -cd console -ant -Dlib.dir=%{_libdir} - -%install -rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/usr/share/java -install -m777 built/release/jars/fedora-* $RPM_BUILD_ROOT/usr/share/java -install -d $RPM_BUILD_ROOT/usr/bin -install -m777 built/release/%{name} $RPM_BUILD_ROOT/usr/bin +%{ant} \ + -Dlib.dir=%{_libdir} \ + -Dbuilt.dir=`pwd`/built \ + -Dclassdest=%{_javadir} -%clean +%install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_javadir} +install -m777 built/release/jars/fedora-* $RPM_BUILD_ROOT%{_javadir} +install -d $RPM_BUILD_ROOT%{_bindir} +install -m777 built/release/%{name} $RPM_BUILD_ROOT%{_bindir} -%files -%defattr(-,root,root) -/usr/share/java/%{name}-%{version}_en.jar -/usr/bin/%{name} - -%files framework -%defattr(-,root,root) -/usr/share/java/%{name}-base-%{version}.jar -/usr/share/java/fedora-mcc-%{version}.jar -/usr/share/java/fedora-mcc-%{version}_en.jar -/usr/share/java/fedora-nmclf-%{version}.jar -/usr/share/java/fedora-nmclf-%{version}_en.jar - -%post -cd /usr/share/java +# create symlinks +pushd $RPM_BUILD_ROOT%{_javadir} ln -s %{name}-%{version}_en.jar %{name}-%{major_version}_en.jar ln -s %{name}-%{version}_en.jar %{name}_en.jar - -%post framework -cd /usr/share/java ln -s %{name}-base-%{version}.jar %{name}-base-%{major_version}.jar ln -s %{name}-base-%{version}.jar %{name}-base.jar ln -s fedora-mcc-%{version}.jar fedora-mcc-%{major_version}.jar @@ -81,24 +61,40 @@ ln -s fedora-nmclf-%{version}.jar fedora-nmclf.jar ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf-%{major_version}_en.jar ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf_en.jar +popd + +%clean +rm -rf $RPM_BUILD_ROOT -%preun -rm -rf /usr/share/java/%{name}-%{major_version}_en.jar -rm -rf /usr/share/java/%{name}_en.jar - -%preun framework -rm -rf /usr/share/java/%{name}-base-%{major_version}.jar -rm -rf /usr/share/java/%{name}-base.jar -rm -rf /usr/share/java/fedora-mcc-%{major_version}.jar -rm -rf /usr/share/java/fedora-mcc.jar -rm -rf /usr/share/java/fedora-mcc-%{major_version}_en.jar -rm -rf /usr/share/java/fedora-mcc_en.jar -rm -rf /usr/share/java/fedora-nmclf-%{major_version}.jar -rm -rf /usr/share/java/fedora-nmclf.jar -rm -rf /usr/share/java/fedora-nmclf-%{major_version}_en.jar -rm -rf /usr/share/java/fedora-nmclf_en.jar +%files +%defattr(-,root,root) +%{_javadir}/%{name}-%{version}_en.jar +%{_javadir}/%{name}-%{major_version}_en.jar +%{_javadir}/%{name}_en.jar +%{_bindir}/%{name} + +%files framework +%defattr(-,root,root) +%{_javadir}/%{name}-base-%{version}.jar +%{_javadir}/%{name}-base-%{major_version}.jar +%{_javadir}/%{name}-base.jar +%{_javadir}/fedora-mcc-%{version}.jar +%{_javadir}/fedora-mcc-%{major_version}.jar +%{_javadir}/fedora-mcc.jar +%{_javadir}/fedora-mcc-%{version}_en.jar +%{_javadir}/fedora-mcc-%{major_version}_en.jar +%{_javadir}/fedora-mcc_en.jar +%{_javadir}/fedora-nmclf-%{version}.jar +%{_javadir}/fedora-nmclf-%{major_version}.jar +%{_javadir}/fedora-nmclf.jar +%{_javadir}/fedora-nmclf-%{version}_en.jar +%{_javadir}/fedora-nmclf-%{major_version}_en.jar +%{_javadir}/fedora-nmclf_en.jar %changelog +* Fri Jul 27 2007 Rich Megginson <rmeggins(a)redhat.com> 1.1.0-4 +- fedora-ized build - clean up in prep for package review + * Fri Jul 27 2007 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-3 - Changed package name to be less generic.

1 0

[Fedora-directory-commits] adminserver configure.ac, 1.12, 1.13 config.h.in, 1.5, 1.6 aclocal.m4, 1.18, 1.19 configure, 1.21, 1.22 missing, 1.11, 1.12 install-sh, 1.11, 1.12 compile, 1.10, 1.11 Makefile.in, 1.24, 1.25 depcomp, 1.11, 1.12 config.sub, 1.11, 1.12 config.guess, 1.11, 1.12
by Doctor Conrad 31 Jul '07

31 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21509 Modified Files: configure.ac config.h.in aclocal.m4 configure missing install-sh compile Makefile.in depcomp config.sub config.guess Log Message: remove AC_FUNC_REALLOC - breaks build in HPUX Index: configure.ac =================================================================== RCS file: /cvs/dirsec/adminserver/configure.ac,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- configure.ac 26 Jun 2007 18:34:46 -0000 1.12 +++ configure.ac 30 Jul 2007 23:13:45 -0000 1.13 @@ -45,7 +45,6 @@ AC_FUNC_MALLOC AC_FUNC_MEMCMP AC_FUNC_MMAP -AC_FUNC_REALLOC AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_STRERROR_R Index: config.h.in =================================================================== RCS file: /cvs/dirsec/adminserver/config.h.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- config.h.in 25 Jun 2007 23:23:10 -0000 1.5 +++ config.h.in 30 Jul 2007 23:13:45 -0000 1.6 @@ -103,10 +103,6 @@ /* Define to 1 if you have the `putenv' function. */ #undef HAVE_PUTENV -/* Define to 1 if your system has a GNU libc compatible `realloc' function, - and to 0 otherwise. */ -#undef HAVE_REALLOC - /* Define to 1 if you have the `rmdir' function. */ #undef HAVE_RMDIR @@ -339,9 +335,6 @@ /* Define to `int' if <sys/types.h> does not define. */ #undef pid_t -/* Define to rpl_realloc if the replacement function should be used. */ -#undef realloc - /* Define to `unsigned' if <sys/types.h> does not define. */ #undef size_t Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/adminserver/aclocal.m4,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- aclocal.m4 11 Jul 2007 01:20:21 -0000 1.18 +++ aclocal.m4 30 Jul 2007 23:13:45 -0000 1.19 @@ -1578,10 +1578,27 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '[#]line __oline__ "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -4288,6 +4305,9 @@ # Is the compiler the GNU C compiler? with_gcc=$_LT_AC_TAGVAR(GCC, $1) +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -4421,11 +4441,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) +predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) +postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -4437,7 +4457,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) +compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -4517,7 +4537,7 @@ link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -6353,6 +6373,7 @@ done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -6385,6 +6406,7 @@ done ]) SED=$lt_cv_path_SED +AC_SUBST([SED]) AC_MSG_RESULT([$SED]) ]) Index: configure =================================================================== RCS file: /cvs/dirsec/adminserver/configure,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- configure 11 Jul 2007 01:20:21 -0000 1.21 +++ configure 30 Jul 2007 23:13:45 -0000 1.22 @@ -468,7 +468,7 @@ ac_default_prefix=/opt/fedora-ds ac_subdirs_all="$ac_subdirs_all mod_admserv" ac_subdirs_all="$ac_subdirs_all mod_restartd" -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 EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX! XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_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 PACKAGE_BASE_NAME PACKAGE_BASE_VERSION LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -3832,6 +3832,7 @@ done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -3866,6 +3867,7 @@ fi SED=$lt_cv_path_SED + echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 @@ -4306,7 +4308,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4309 "configure"' > conftest.$ac_ext + echo '#line 4311 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5441,7 +5443,7 @@ # Provide some information about the compiler. -echo "$as_me:5444:" \ +echo "$as_me:5446:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6504,11 +6506,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6507: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6509: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6511: \$? = $ac_status" >&5 + echo "$as_me:6513: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6772,11 +6774,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6775: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6777: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6779: \$? = $ac_status" >&5 + echo "$as_me:6781: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6876,11 +6878,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6879: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6881: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6883: \$? = $ac_status" >&5 + echo "$as_me:6885: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8341,10 +8343,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 8350 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -9221,7 +9244,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9224 "configure" +#line 9247 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9321,7 +9344,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9324 "configure" +#line 9347 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9652,6 +9675,9 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -9785,11 +9811,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects +predep_objects=\`echo $lt_predep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects +postdep_objects=\`echo $lt_postdep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -9801,7 +9827,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -9881,7 +9907,7 @@ link_all_deplibs=$link_all_deplibs # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -11661,11 +11687,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11664: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11690: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11668: \$? = $ac_status" >&5 + echo "$as_me:11694: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11765,11 +11791,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11768: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11794: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11772: \$? = $ac_status" >&5 + echo "$as_me:11798: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12297,10 +12323,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 12330 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -12684,6 +12731,9 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_CXX +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -12817,11 +12867,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_CXX +predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_CXX +postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -12833,7 +12883,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -12913,7 +12963,7 @@ link_all_deplibs=$link_all_deplibs_CXX # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -13335,11 +13385,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13338: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13388: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13342: \$? = $ac_status" >&5 + echo "$as_me:13392: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13439,11 +13489,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13442: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13492: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13446: \$? = $ac_status" >&5 + echo "$as_me:13496: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14884,10 +14934,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 14941 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -15271,6 +15342,9 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_F77 +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -15404,11 +15478,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_F77 +predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_F77 +postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -15420,7 +15494,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_F77 +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -15500,7 +15574,7 @@ link_all_deplibs=$link_all_deplibs_F77 # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -15642,11 +15716,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15645: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15719: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15649: \$? = $ac_status" >&5 + echo "$as_me:15723: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15910,11 +15984,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15913: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15987: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15917: \$? = $ac_status" >&5 + echo "$as_me:15991: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16014,11 +16088,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16017: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16091: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16021: \$? = $ac_status" >&5 + echo "$as_me:16095: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17479,10 +17553,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 17560 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -17866,6 +17961,9 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_GCJ +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -17999,11 +18097,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_GCJ +predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_GCJ +postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -18015,7 +18113,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18095,7 +18193,7 @@ link_all_deplibs=$link_all_deplibs_GCJ # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -18347,6 +18445,9 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_RC +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -18480,11 +18581,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_RC +predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_RC +postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -18496,7 +18597,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_RC +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18576,7 +18677,7 @@ link_all_deplibs=$link_all_deplibs_RC # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -21837,237 +21938,6 @@ fi rm -f conftest.mmap - -for ac_header in stdlib.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to http://bugzilla.redhat.com/ ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - -echo "$as_me:$LINENO: checking for GNU libc compatible realloc" >&5 -echo $ECHO_N "checking for GNU libc compatible realloc... $ECHO_C" >&6 -if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_func_realloc_0_nonnull=no -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#if STDC_HEADERS || HAVE_STDLIB_H -# include <stdlib.h> -#else -char *realloc (); -#endif - -int -main () -{ -exit (realloc (0, 0) ? 0 : 1); - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_realloc_0_nonnull=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_realloc_0_nonnull=no -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -echo "$as_me:$LINENO: result: $ac_cv_func_realloc_0_nonnull" >&5 -echo "${ECHO_T}$ac_cv_func_realloc_0_nonnull" >&6 -if test $ac_cv_func_realloc_0_nonnull = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_REALLOC 1 -_ACEOF - -else - cat >>confdefs.h <<\_ACEOF -#define HAVE_REALLOC 0 -_ACEOF - - case $LIBOBJS in - "realloc.$ac_objext" | \ - *" realloc.$ac_objext" | \ - "realloc.$ac_objext "* | \ - *" realloc.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS realloc.$ac_objext" ;; -esac - - -cat >>confdefs.h <<\_ACEOF -#define realloc rpl_realloc -_ACEOF - -fi - - - echo "$as_me:$LINENO: checking return type of signal handlers" >&5 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 if test "${ac_cv_type_signal+set}" = set; then @@ -25844,6 +25714,7 @@ s,@CCDEPMODE@,$CCDEPMODE,;t t s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t +s,@SED@,$SED,;t t s,@EGREP@,$EGREP,;t t s,@LN_S@,$LN_S,;t t s,@ECHO@,$ECHO,;t t Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/adminserver/Makefile.in,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- Makefile.in 27 Jul 2007 01:42:46 -0000 1.24 +++ Makefile.in 30 Jul 2007 23:13:45 -0000 1.25 @@ -394,6 +394,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@

1 0

[Fedora-directory-commits] directoryconsole build.xml, 1.8, 1.9 fedora-ds-console.spec, 1.1, 1.2
by Doctor Conrad 31 Jul '07

31 Jul '07

Author: nkinder Update of /cvs/dirsec/directoryconsole In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17231 Modified Files: build.xml fedora-ds-console.spec Log Message: Resolves: 250145 Summary: Updated dependency on fedora-idm-console. Index: build.xml =================================================================== RCS file: /cvs/dirsec/directoryconsole/build.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- build.xml 2 Jul 2007 19:44:08 -0000 1.8 +++ build.xml 30 Jul 2007 18:10:08 -0000 1.9 @@ -82,9 +82,9 @@  <path id="ldapconsole.classpath"> <fileset dir="${console.location}"> - <include name="**/${brand}-base-*.jar"/> - <include name="**/${brand}-mcc-*.jar"/> - <include name="**/${brand}-nmclf-*.jar"/> + <include name="**/fedora-idm-console-base-*.jar"/> + <include name="**/fedora-mcc-*.jar"/> + <include name="**/fedora-nmclf-*.jar"/> <include name="**/ldapjdk.jar"/> </fileset> <pathelement path="${built.classdir}"/> Index: fedora-ds-console.spec =================================================================== RCS file: /cvs/dirsec/directoryconsole/fedora-ds-console.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-ds-console.spec 2 Jul 2007 19:47:55 -0000 1.1 +++ fedora-ds-console.spec 30 Jul 2007 18:10:08 -0000 1.2 @@ -3,7 +3,7 @@ Name: fedora-ds-console Version: %{major_version}.%{minor_version} -Release: 1 +Release: 2 Group: Applications Vendor: Fedora Project URL: http://directory.fedora.redhat.com @@ -15,7 +15,7 @@ Source: %{name}-%{version}.tar.gz Autoreq: 0 AutoReqProv: no -BuildPreReq: ant >= 1.6.2, ldapjdk >= 4.18, fedora-console-framework >= 1.1 +BuildPreReq: ant >= 1.6.2, ldapjdk >= 4.18, fedora-idm-console-framework >= 1.1 %description A Java based remote management console used for Managing Fedora @@ -58,5 +58,8 @@ rm -rf /usr/share/java/fedora-ds_en.jar %changelog +* Mon Jul 30 2007 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-2 +- Updated requirements. + * Mon Nov 14 2005 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-1 - Initial creation

1 0

[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv DSAdmin.java, 1.5, 1.6 about.properties, 1.4, 1.5 dirserv.properties, 1.6, 1.7
by Doctor Conrad 31 Jul '07

31 Jul '07

Author: nkinder Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2901/src/com/netscape/admin/dirserv Modified Files: DSAdmin.java about.properties dirserv.properties Log Message: Resolves: 250137 Summary: Updated verison number to 1.1.0 Index: DSAdmin.java =================================================================== RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSAdmin.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- DSAdmin.java 11 Jul 2007 01:26:23 -0000 1.5 +++ DSAdmin.java 30 Jul 2007 17:16:40 -0000 1.6 @@ -1267,7 +1267,7 @@ static public int SECURITY_ENABLE = 2; // Minimum required console version - private static final float MINIMUM_VERSION = 1.0f; + private static final float MINIMUM_VERSION = 1.1f; // Icon for the console private static final String _imageName = "directory.gif"; Index: about.properties =================================================================== RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/about.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- about.properties 29 Sep 2006 17:17:26 -0000 1.4 +++ about.properties 30 Jul 2007 17:16:40 -0000 1.5 @@ -19,7 +19,7 @@ # # Strings and logos used by the DSAboutDialog -aboutDialog-dialogTitle=Fedora Directory Server 1.0.3 +aboutDialog-dialogTitle=Fedora Directory Server 1.1.0 aboutDialog-productLogo=com/netscape/management/client/images/logo32.gif aboutDialog-productCopyright=Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.\nCopyright (C) 2005 Red Hat, Inc.\nAll rights reserved. aboutDialog-productLicense=Fedora is a trademark of Red Hat, Inc. in the United States and other countries and is used by permission. Index: dirserv.properties =================================================================== RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/dirserv.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dirserv.properties 2 Jul 2007 19:44:08 -0000 1.6 +++ dirserv.properties 30 Jul 2007 17:16:40 -0000 1.7 @@ -164,9 +164,9 @@ # dialog-configtitle=Fedora Directory Server dsAdmin-title=Fedora Directory Server -dsAdmin-version=Version 1.0.3 +dsAdmin-version=Version 1.1.0 dsAdmin-nsServerPort=Port -dsAdmin-framework-description=Fedora Directory Server Console 1.0.3 +dsAdmin-framework-description=Fedora Directory Server Console 1.1.0 dsAdmin-remove-server-cgi-failed=ds_remove failure # @@ -1736,12 +1736,12 @@ encryption-nosslfamily-msg=At least one cipher family must be selected to enable SSL encryption-nosslfamily-title=Invalid SSL settings encryption-preferences-title=Encryption Preferences -encryption-consoleSSL-label=Use SSL in Fedora Console -encryption-consoleSSL-ttip=Use SSL for connections from Fedora Console to this server +encryption-consoleSSL-label=Use SSL in Console +encryption-consoleSSL-ttip=Use SSL for connections from Console to this server encryption-SSLCheckHostName-label=Check hostname against name in certificate for outbound SSL connections encryption-SSLCheckHostName-ttip=Check the hostname used for outbound SSL connections against the name in the destination server's certificate encryption-confirm-clientauth-title=Require Client Authentication -encryption-confirm-clientauth-msg=When the server is configured to require SSL client authentication,\nFedora Console cannot use SSL to manage the server.\nIt will use a regular LDAP connection. +encryption-confirm-clientauth-msg=When the server is configured to require SSL client authentication,\nConsole cannot use SSL to manage the server.\nIt will use a regular LDAP connection. encryption-confirm-sslport-title=Encrypted Port Checking encryption-confirm-sslport-msg=The encrypted port is %0. On Unix, using a port\nbelow 1024 requires the server to be installed as root.\n\nBefore restarting the server, make sure it was installed\nas root or set a port above 1024 using the Settings tab. @@ -2390,7 +2390,7 @@ general-ldapv2quoting-title=Using Deprecated LDAPv2 Style Quoting general-ldapv2quoting-msg=The field %0 has the value %1 which uses the deprecated\nLDAPv2 style quoting. It will be converted to use LDAPv3 escapes. general-neednewconsole-title=Console Version Mismatch -general-neednewconsole-msg=This Directory Server Console is not compatible with Admin Console version %0.\nPlease install the latest Admin Console or download the components from the Fedora web server. +general-neednewconsole-msg=This Directory Server is not compatible with the Console version you are running (%0).\nPlease install the latest Console. general-notyetimplemented=Not Yet Implemented! general-backendname-exist-msg=Database named %0 already exists general-backendname-exist-title=Error on creation @@ -2686,7 +2686,7 @@ mappingtree-referral-LDAPUrl-no-good-title=Confirmation Needed mappingtree-referral-LDAPUrl-no-good-msg=This URL is not compliant with the Standard LDAP URL format.\nIf your LDAP client understands a non standard format,\nclick YES to add it to the list. mappingtree-multiple-db-title=Warning -mappingtree-multiple-db-msg= You have chosen to distribute a single suffix across multiple databases.\n This requires configuring distribution logic with Fedora Professional Services.\n In addition, you cannot replicate a suffix distributed across multiple databases.\n Do you want to continue? +mappingtree-multiple-db-msg= You have chosen to distribute a single suffix across multiple databases.\n This requires a custom distribution logic plugin.\n In addition, you cannot replicate a suffix distributed across multiple databases.\n Do you want to continue? mappingtree-reload-suffix-title=Error Reading Suffix mappingtree-reload-suffix-msg=Failed to read %0\n Error: %1 mappingtree-del-warning-title=Database Successfully Deleted

1 0

[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv/panel MappingUtils.java, 1.1.1.1, 1.2
by Doctor Conrad 31 Jul '07

31 Jul '07

Author: nkinder Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2901/src/com/netscape/admin/dirserv/panel Modified Files: MappingUtils.java Log Message: Resolves: 250137 Summary: Updated verison number to 1.1.0 Index: MappingUtils.java =================================================================== RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/MappingUtils.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- MappingUtils.java 18 Jul 2005 00:56:00 -0000 1.1.1.1 +++ MappingUtils.java 30 Jul 2007 17:16:41 -0000 1.2 @@ -493,9 +493,9 @@ /** * Returns the suffix of the backend that is naming context and parent of the entry. - * For example if we have 2 backends with suffixes 'o=fedora.com' and 'ou=people, o=fedora.com' - * For 'cn=Michael, o=fedora.com' it will return 'o=fedora.com' - * For 'cn=Michael, ou=people, o=fedora.com' it will return 'o=fedora.com' ('ou=people, o=fedora.com' is not a naming context) + * For example if we have 2 backends with suffixes 'o=example.com' and 'ou=people, o=example.com' + * For 'cn=Michael, o=example.com' it will return 'o=example.com' + * For 'cn=Michael, ou=people, o=example.com' it will return 'o=example.com' ('ou=people, o=example.com' is not a naming context) * For 'cn=plugins, cn=config' (not in a regular backend) it will return null */ public static String getTopSuffixForEntry(LDAPConnection ldc, String dn) { @@ -522,9 +522,9 @@ /** * This method gets the shortest suffix which is superior of the given dn from the given suffix list . - * For example if we have a list with 2 suffixes 'o=fedora.com' and 'ou=people, o=fedora.com' - * For 'cn=Michael, o=fedora.com' it will return 'o=fedora.com' - * For 'cn=Michael, ou=people, o=fedora.com' it will return 'o=fedora.com' + * For example if we have a list with 2 suffixes 'o=example.com' and 'ou=people, o=example.com' + * For 'cn=Michael, o=example.com' it will return 'o=example.com' + * For 'cn=Michael, ou=people, o=example.com' it will return 'o=example.com' * For 'cn=plugins, cn=config' (not in the list of suffixes) it will return null * * @param dn of the entry we want to handle @@ -555,9 +555,9 @@ /** * Returns the suffix of the backend to which this entry belongs. - * For example if we have 2 backends with suffixes 'o=fedora.com' and 'ou=people, o=fedora.com' - * For 'cn=Michael, o=fedora.com' it will return 'o=fedora.com' - * For 'cn=Michael, ou=people, o=fedora.com' it will return 'ou=people, o=fedora.com' + * For example if we have 2 backends with suffixes 'o=example.com' and 'ou=people, o=example.com' + * For 'cn=Michael, o=example.com' it will return 'o=example.com' + * For 'cn=Michael, ou=people, o=example.com' it will return 'ou=people, o=example.com' * For 'cn=plugins, cn=config' (not in a regular backend) it will return null */

1 0

[Fedora-directory-commits] console/src/com/netscape/management/client/theme theme.properties, 1.4, 1.5
by Doctor Conrad 28 Jul '07

28 Jul '07

Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/theme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5556/src/com/netscape/management/client/theme Modified Files: theme.properties Log Message: Resolves: 249897 Summary: Changed package name to fedora-idm-console. Index: theme.properties =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/theme/theme.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- theme.properties 26 Jul 2007 23:08:49 -0000 1.4 +++ theme.properties 27 Jul 2007 20:29:59 -0000 1.5 @@ -20,7 +20,7 @@ console-title=Fedora Management Console console-useragent=Fedora-Management-Console -console-prefsdir=.fedora-console +console-prefsdir=.fedora-idm-console login-title=Fedora Management Console Login banner-console=Fedora Management Console

1 0

[Fedora-directory-commits] console fedora-idm-console, NONE, 1.1 fedora-idm-console.spec, NONE, 1.1 build.properties, 1.12, 1.13 build.xml, 1.15, 1.16 fedora-console, 1.1, NONE fedora-console.spec, 1.3, NONE
by Doctor Conrad 28 Jul '07

28 Jul '07

Author: nkinder Update of /cvs/dirsec/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5556 Modified Files: build.properties build.xml Added Files: fedora-idm-console fedora-idm-console.spec Removed Files: fedora-console fedora-console.spec Log Message: Resolves: 249897 Summary: Changed package name to fedora-idm-console. --- NEW FILE fedora-idm-console --- #!/bin/sh # # BEGIN COPYRIGHT BLOCK # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation version # 2.1 of the License. # # This library 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 # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # END COPYRIGHT BLOCK JAVA=`which java` if [ -z "$JAVA" -o ! -x "$JAVA" ] then echo "$0: The java program is not in your path, or is not executable."; exit 1 fi CLASSDEST=@classdest@ # # Launch the Console # java -ms8m -mx64m -cp @jssjar@:@ldapjdkjar@:$CLASSDEST/@basejar@:$CLASSDEST/@mccjar@:$CLASSDEST/@mcclangjar@:$CLASSDEST/@nmclfjar@:$CLASSDEST/@nmclflangjar@:$CLASSDEST/@themejar@ -Djava.library.path=@libdir@ -Djava.util.prefs.systemRoot="$HOME/.@prefsdir@" -Djava.util.prefs.userRoot="$HOME/.@prefsdir@" com.netscape.management.client.console.Console $* --- NEW FILE fedora-idm-console.spec --- %define major_version 1.1 %define minor_version 0 Name: fedora-idm-console Version: %{major_version}.%{minor_version} Release: 3 Group: Applications Vendor: Fedora Project URL: http://directory.fedora.redhat.com License: LGPL Packager: Red Hat, Inc. <http://bugzilla.redhat.com/bugzilla> Summary: Fedora Management Console BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Source: %{name}-%{version}.tar.gz Autoreq: 0 AutoReqProv: no Requires: %{name}-framework >= %{version} BuildPreReq: ant >= 1.6.2, ldapjdk >= 4.18, jss >= 4.2 %description A Java based remote management console used for Managing Fedora Administration Server and Fedora Directory Server. # prep and setup expect there to be a Source file # in the /usr/src/redhat/SOURCES directory - it will be unpacked # in the _builddir (not BuildRoot) %package framework Summary: Fedora Management Console Framework Requires: ldapjdk >= 4.18, jss >= 4.2 Group: System Environment/Libraries %description framework A Java Management Console framework used for remote server management. %prep %setup -q %build cd console ant -Dlib.dir=%{_libdir} %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/usr/share/java install -m777 built/release/jars/fedora-* $RPM_BUILD_ROOT/usr/share/java install -d $RPM_BUILD_ROOT/usr/bin install -m777 built/release/%{name} $RPM_BUILD_ROOT/usr/bin %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /usr/share/java/%{name}-%{version}_en.jar /usr/bin/%{name} %files framework %defattr(-,root,root) /usr/share/java/%{name}-base-%{version}.jar /usr/share/java/fedora-mcc-%{version}.jar /usr/share/java/fedora-mcc-%{version}_en.jar /usr/share/java/fedora-nmclf-%{version}.jar /usr/share/java/fedora-nmclf-%{version}_en.jar %post cd /usr/share/java ln -s %{name}-%{version}_en.jar %{name}-%{major_version}_en.jar ln -s %{name}-%{version}_en.jar %{name}_en.jar %post framework cd /usr/share/java ln -s %{name}-base-%{version}.jar %{name}-base-%{major_version}.jar ln -s %{name}-base-%{version}.jar %{name}-base.jar ln -s fedora-mcc-%{version}.jar fedora-mcc-%{major_version}.jar ln -s fedora-mcc-%{version}.jar fedora-mcc.jar ln -s fedora-mcc-%{version}_en.jar fedora-mcc-%{major_version}_en.jar ln -s fedora-mcc-%{version}_en.jar fedora-mcc_en.jar ln -s fedora-nmclf-%{version}.jar fedora-nmclf-%{major_version}.jar ln -s fedora-nmclf-%{version}.jar fedora-nmclf.jar ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf-%{major_version}_en.jar ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf_en.jar %preun rm -rf /usr/share/java/%{name}-%{major_version}_en.jar rm -rf /usr/share/java/%{name}_en.jar %preun framework rm -rf /usr/share/java/%{name}-base-%{major_version}.jar rm -rf /usr/share/java/%{name}-base.jar rm -rf /usr/share/java/fedora-mcc-%{major_version}.jar rm -rf /usr/share/java/fedora-mcc.jar rm -rf /usr/share/java/fedora-mcc-%{major_version}_en.jar rm -rf /usr/share/java/fedora-mcc_en.jar rm -rf /usr/share/java/fedora-nmclf-%{major_version}.jar rm -rf /usr/share/java/fedora-nmclf.jar rm -rf /usr/share/java/fedora-nmclf-%{major_version}_en.jar rm -rf /usr/share/java/fedora-nmclf_en.jar %changelog * Fri Jul 27 2007 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-3 - Changed package name to be less generic. * Thu Jul 26 2007 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-2 - Updated start script and theme jar names. Fixed post and preun steps for framework subpackage. * Fri Jun 29 2007 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-1 - Updated for 1.1.0 release * Mon Nov 14 2005 Nathan Kinder <nkinder(a)redhat.com> 1.0-1 - Initial creation Index: build.properties =================================================================== RCS file: /cvs/dirsec/console/build.properties,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- build.properties 26 Jul 2007 23:08:46 -0000 1.12 +++ build.properties 27 Jul 2007 20:29:59 -0000 1.13 @@ -36,11 +36,11 @@ nmclf.name=${nmclf.core}-${console.dotversion} nmclf.gen.name=${nmclf.core}-${console.dotgenversion} -base.core=${console.brand}-base +base.core=${console.brand}-idm-console-base base.name=${base.core}-${console.dotversion} base.gen.name=${base.core}-${console.dotgenversion} -theme.core=${console.brand}-console +theme.core=${console.brand}-idm-console theme.name=${theme.core}-${console.dotversion} theme.gen.name=${theme.core}-${console.dotgenversion} Index: build.xml =================================================================== RCS file: /cvs/dirsec/console/build.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- build.xml 26 Jul 2007 23:08:46 -0000 1.15 +++ build.xml 27 Jul 2007 20:29:59 -0000 1.16 @@ -184,9 +184,9 @@ <classpath refid="console.classpath" /> </javac> -  - <copy file="fedora-console" todir="${release.dir}"/> - <replace file="${release.dir}/fedora-console"> +  + <copy file="fedora-idm-console" todir="${release.dir}"/> + <replace file="${release.dir}/fedora-idm-console"> <replacefilter token="@classdest@" value="${classdest}"/> <replacefilter token="@jssjar@" value="${jss.local.location}/${jss.jar.name}"/> <replacefilter token="@ldapjdkjar@" value="${ldapjdk.local.location}/${ldapjdk.jar.name}"/> --- fedora-console DELETED --- --- fedora-console.spec DELETED ---

1 0

[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DialogManager.pm, 1.4, 1.5 SetupDialogs.pm.in, 1.2, 1.3 setup-ds.res.in, 1.8, 1.9
by Doctor Conrad 27 Jul '07

27 Jul '07

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21095 Modified Files: DialogManager.pm SetupDialogs.pm.in setup-ds.res.in Log Message: Resolves: #249739 Summary: Implement a script registering DS to the Configuration DS (comment#5) Index: DialogManager.pm =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DialogManager.pm,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DialogManager.pm 20 Jun 2007 16:27:50 -0000 1.4 +++ DialogManager.pm 27 Jul 2007 01:46:10 -0000 1.5 @@ -89,6 +89,11 @@ } } +sub resetDialog { + my $self = shift; + @{$self->{dialogs}} = (); +} + # see if the user answered with the special BACK answer sub isBack { my $self = shift; Index: SetupDialogs.pm.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/SetupDialogs.pm.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SetupDialogs.pm.in 13 Jul 2007 19:51:48 -0000 1.2 +++ SetupDialogs.pm.in 27 Jul 2007 01:46:10 -0000 1.3 @@ -253,4 +253,8 @@ return ($welcome, $license, $setuptype, $hostdlg, $usergroup); } +sub getRegDialogs { + return ($usergroup); +} + 1; Index: setup-ds.res.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/setup-ds.res.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- setup-ds.res.in 13 Jul 2007 18:35:32 -0000 1.8 +++ setup-ds.res.in 27 Jul 2007 01:46:10 -0000 1.9 @@ -66,7 +66,7 @@ dialog_dsrootdn_prompt = Directory Manager DN dialog_dsrootdn_error = The input '%s' is not a valid DN. Please choose another one.\n\n dialog_dsrootpw_prompt1 = Password -dialog_dsrootpw_prompt2 = Password (again) +dialog_dsrootpw_prompt2 = Password (confirm) dialog_dsrootpw_invalid = The password contains invalid characters. Please choose another one.\n\n dialog_dsrootpw_tooshort = The password must be at least %s characters long. Please choose another one.\n\n dialog_dsrootpw_nomatch = The passwords do not match. Please try again.\n\n

1 0

[Fedora-directory-commits] adminserver/admserv/newinst/src RegDSDialogs.pm, NONE, 1.1 register-ds-admin.pl.in, NONE, 1.1 register-ds-admin.res.in, NONE, 1.1 AdminServer.pm.in, 1.7, 1.8 ConfigDSDialogs.pm, 1.5, 1.6 setup-ds-admin.res.in, 1.5, 1.6
by Doctor Conrad 27 Jul '07

27 Jul '07

Author: nhosoi Update of /cvs/dirsec/adminserver/admserv/newinst/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20804/admserv/newinst/src Modified Files: AdminServer.pm.in ConfigDSDialogs.pm setup-ds-admin.res.in Added Files: RegDSDialogs.pm register-ds-admin.pl.in register-ds-admin.res.in Log Message: resolves: #249739 Summary: Implement a script registering DS to the Configuration DS (comment #1-4) --- NEW FILE RegDSDialogs.pm --- # BEGIN COPYRIGHT BLOCK # 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; version 2 of the License. # # 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., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # In addition, as a special exception, Red Hat, Inc. gives You the additional # right to link the code of this Program with code not covered under the GNU # General Public License ("Non-GPL Code") and to distribute linked combinations # including the two, subject to the limitations in this paragraph. Non-GPL Code # permitted under this exception must only link to the code of this Program # through those well defined interfaces identified in the file named EXCEPTION # found in the source code files (the "Approved Interfaces"). The files of # Non-GPL Code may instantiate templates or use macros or inline functions from # the Approved Interfaces without causing the resulting work to be covered by # the GNU General Public License. Only Red Hat, Inc. may make changes or # additions to the list of Approved Interfaces. You must obey the GNU General # Public License in all respects for all of the Program code and other code used # in conjunction with the Program except the Non-GPL Code covered by this # exception. If you modify this file, you may extend this exception to your # version of the file, but you are not obligated to do so. If you do not wish to # provide this exception without modification, you must delete this exception # statement from your version and license this file solely under the GPL without # exception. # # # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # package RegDSDialogs; use strict; use DialogManager; use Setup; use Dialog; use Util; my $configdsinfo = new Dialog ( $TYPICAL, 'use_existing_configds_txt', sub { my $self = shift; my $servid = $self->{manager}->{inf}->{slapd}->{ServerIdentifier}; return $servid; }, sub { my $self = shift; my $ans = shift; my $index = shift; my $res = $DialogManager::SAME; $self->{manager}->setType($TYPICAL); if ($index == 0) { # validate serverIdentifier? foreach my $inst (@{$self->{manager}->{inf}->{slapd}->{Instances}}) { if ( "$inst" eq "slapd-" . $ans ) { $self->{manager}->{inf}->{slapd}->{ServerIdentifier} = $ans; $res = $DialogManager::NEXT; goto out; } } out: if ( $DialogManager::SAME == $res ) { $self->{manager}->alert("error_configds_txt", $ans); } return $res; } return $res; }, ['dialog_dsserverid_prompt'] ); sub getDialogs { return ($configdsinfo); } 1; --- NEW FILE register-ds-admin.pl.in --- #!/usr/bin/env perl # BEGIN COPYRIGHT BLOCK # 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; version 2 of the License. # # 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., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # In addition, as a special exception, Red Hat, Inc. gives You the additional # right to link the code of this Program with code not covered under the GNU # General Public License ("Non-GPL Code") and to distribute linked combinations # including the two, subject to the limitations in this paragraph. Non-GPL Code # permitted under this exception must only link to the code of this Program # through those well defined interfaces identified in the file named EXCEPTION # found in the source code files (the "Approved Interfaces"). The files of # Non-GPL Code may instantiate templates or use macros or inline functions from # the Approved Interfaces without causing the resulting work to be covered by # the GNU General Public License. Only Red Hat, Inc. may make changes or # additions to the list of Approved Interfaces. You must obey the GNU General # Public License in all respects for all of the Program code and other code used # in conjunction with the Program except the Non-GPL Code covered by this # exception. If you modify this file, you may extend this exception to your # version of the file, but you are not obligated to do so. If you do not wish to # provide this exception without modification, you must delete this exception # statement from your version and license this file solely under the GPL without # exception. # # # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # use lib "@perldir@"; use File::Basename; use Net::Domain qw(hostfqdn); # Admin Setup modules use AdminUtil; use AdminServer; # Directory Setup modules use Resource; use Setup; use SetupLog; use DialogManager; use Inf; use Util; sub reg_get_passwd { my $setup = shift; my $key = shift; my $value = shift; print("\n==============================================================================\n"); $setup->msg(0, $key, $value); system("stty -echo"); my $ans = <STDIN>; system("stty echo"); print "\n"; chop($ans); return $ans; } my $res = new Resource("@propertydir@/register-ds-admin.res", "@propertydir@/setup-ds-admin.res", "@propertydir@/setup-ds.res"); my $setup = new Setup($res); $setup->msg('begin_ds_registration'); # get existing instances my $instconfigdir = $setup->{configdir}; my @instances = (); for my $dir (glob("$setup->{configdir}/slapd-*")) { if (-d $dir) { push @instances, basename($dir); } } if ( $#instances < 0 ) { $setup->msg($FATAL, 'error_no_ds'); $setup->doExit(1); } # see if there is already a configds my $admConf = AdminUtil::getAdmConf("$instconfigdir/admin-serv"); my @admConfKeys = keys %$admConf; my $orig_confdsid = ""; my $new_confdsid = ""; my $adminuid = ""; my @errs = (); my $fqdn = hostfqdn(); # set defaults if ( $#admConfKeys >= 0 ) { # Admin Server is installed; that is Config DS exists, which may be # replaced with a new one in the RegDSDialogs $orig_confdsid = getLocalConfigDS("$instconfigdir/admin-serv"); $setup->{inf}->{slapd}->{ServerIdentifier} = $orig_confdsid; $setup->{inf}->{slapd}->{Instances} = \@instances; $setup->{inf}->{General}->{ConfigDirectoryLdapURL} = $admConf->{ldapurl}; $setup->{inf}->{General}->{ConfigDirectoryAdminID} = $admConf->{userdn}; $setup->{inf}->{General}->{AdminDomain} = $admConf->{AdminDomain}; $setup->{inf}->{General}->{SuiteSpotUserID} = $admConf->{SuiteSpotUserID}; $setup->{inf}->{General}->{SuiteSpotGroup} = $admConf->{SuiteSpotGroup}; ($setup->{inf}->{General}->{FullMachineName} = $admConf->{ldapurl}) =~ s/.*:\/\/(.*):[0-9]*\/.*/\1/; $setup->{inf}->{admin}->{SysUser} = $admConf->{sysuser}; $adminuid = $admConf->{userdn}; # read additional config from config DS my $pset = AdminUtil::getPset($admConf); if ($pset && %{$pset}) { $setup->{inf}->{admin}->{Port} = $pset->{"configuration.nsserverport"}; $setup->{asorigport} = $pset->{"configuration.nsserverport"}; # save orig. port $setup->{inf}->{admin}->{ServerIpAddress} = $pset->{"configuration.nsserveraddress"}; } my $admpw = AdminUtil::getAdmpw($admConf); if ($admpw && %{$admpw}) { $setup->{inf}->{admin}->{ServerAdminID} = $admpw->{ServerAdminID}; $setup->{inf}->{admin}->{ServerAdminPwd} = $admpw->{ServerAdminPwd}; } $setup->{reconfigas} = 1; # allow AS reconfig my $dialogmgr = new DialogManager($setup, $res, $TYPICAL); require RegDSDialogs; my @dialogs = RegDSDialogs->getDialogs(); $dialogmgr->addDialog(@dialogs); my $rc = $dialogmgr->run(); if ($rc) { $setup->doExit(1); } $new_confdsid = $setup->{inf}->{slapd}->{ServerIdentifier}; my $newinst = "slapd-$new_confdsid"; my $inf = createInfFromConfig("$instconfigdir/$newinst", $newinst); if ( NULL == $inf ) { $setup->msg($FATAL, 'error_create_inf_from_config', "$instconfigdir/$newinst"); $setup->doExit(1); } if ( $orig_confdsid ne $new_confdsid ) { # To switch to the new Config DS, unregister the old one print("\n==============================================================================\n"); $setup->msg('unregister_old_confds', $orig_confdsid); # If we don't have it, prompt for the Admin password if (!$setup->{inf}->{General}->{ConfigDirectoryAdminPwd} || "" eq $setup->{inf}->{General}->{ConfigDirectoryAdminPwd}) { $ans = reg_get_passwd($setup, 'input_admin_passwd', $adminuid); $setup->{inf}->{General}->{ConfigDirectoryAdminPwd} = $ans; } while (!unregisterDSWithConfigDS($orig_confdsid, \@errs, $setup->{inf})) { $setup->msg($FATAL, 'error_unregister_ds', $orig_confdsid); $ans = reg_get_passwd($setup, 'input_admin_passwd', $adminuid); $setup->{inf}->{General}->{ConfigDirectoryAdminPwd} = $ans; @errs = (); } # updating the port number my $oldport = 0; my $newport = $inf->{slapd}->{ServerPort}; ($oldport = $setup->{inf}->{General}->{ldapurl}) =~ s/.*:([0-9]*)\/.*/\1/; $setup->{inf}->{General}->{ldapurl} =~ s/$oldport/$newport/; $setup->{inf}->{General}->{ConfigDirectoryLdapURL} = "ldap://" . $fqdn . ":". $newport . "/o=NetscapeRoot"; } # Set the new inf to $setup->{inf} $setup->{inf}->{slapd} = $inf->{slapd}; } else { # Admin Server is not set up. # @instances has more than one instance # note: this is orig_confdsid is just a candidate... ($orig_confdsid = $instances[0]) =~ s/slapd-(.*)/\1/; my $originst = "slapd-$orig_confdsid"; my $inf = createInfFromConfig("$instconfigdir/$originst", $originst); if ( NULL == $inf ) { $setup->msg($FATAL, 'error_create_inf_from_config', "$instconfigdir/$originst"); $setup->doExit(1); } $setup->{inf} = $inf; $setup->{inf}->{slapd}->{ServerIdentifier} = $orig_confdsid; $setup->{inf}->{slapd}->{Instances} = \@instances; my $dialogmgr = new DialogManager($setup, $res, $TYPICAL); require RegDSDialogs; require SetupDialogs; require ConfigDSDialogs; require ASDialogs; my @dialogs = RegDSDialogs->getDialogs(); $dialogmgr->addDialog(@dialogs); my $rc = $dialogmgr->run(); if ( $rc ) { $setup->doExit(1); } $new_confdsid = $setup->{inf}->{slapd}->{ServerIdentifier}; if ( $orig_confdsid ne $new_confdsid ) { my $newinst = "slapd-$new_confdsid"; $inf = createInfFromConfig("$instconfigdir/$newinst", $newinst); if ( NULL == $inf ) { $setup->msg($FATAL, 'error_create_inf_from_config', "$instconfigdir/$newinst"); $setup->doExit(1); } $setup->{inf}->{slapd} = $inf->{slapd}; $setup->{inf}->{slapd}->{Instances} = \@instances; } $setup->{inf}->{General}->{ConfigDirectoryLdapURL} = "ldap://" . $fqdn . ":". $setup->{inf}->{slapd}->{ServerPort} . "/o=NetscapeRoot"; $dialogmgr->resetDialog(); @dialogs = SetupDialogs->getRegDialogs(); push @dialogs, ConfigDSDialogs->getRegDialogs(); push @dialogs, ASDialogs->getDialogs(); $dialogmgr->addDialog(@dialogs); $rc = $dialogmgr->run(); if ( $rc ) { $setup->doExit(1); } $adminuid = $setup->{inf}->{General}->{ConfigDirectoryAdminID}; } # Get the ConfigDS's rootDN password print("\n==============================================================================\n"); $setup->msg('register_new_confds', $new_confdsid); $setup->{inf}->{slapd}->{RootDNPwd} = reg_get_passwd($setup, 'input_rootdn_passwd', $new_confdsid); if ( ($#admConfKeys >= 0 && ($orig_confdsid ne $new_confdsid)) || $#admConfKeys < 0 ) { @errs = (); # First, let's register the Configuration Directory itself while (!createConfigDS($setup->{inf}, \@errs)) { foreach my $err (@errs) { if ( $err eq "suffix_already_exists" ) { goto out; } } $setup->{inf}->{slapd}->{RootDNPwd} = reg_get_passwd($setup, 'input_rootdn_passwd', $new_confdsid); @errs = (); } out: } # If we don't have it, prompt for the Admin password if (!$setup->{inf}->{General}->{ConfigDirectoryAdminPwd} || "" eq $setup->{inf}->{General}->{ConfigDirectoryAdminPwd}) { $ans = reg_get_passwd($setup, 'input_admin_passwd', $adminuid); $setup->{inf}->{General}->{ConfigDirectoryAdminPwd} = $ans; } @errs = (); while (!registerDSWithConfigDS($new_confdsid, \@errs, $setup->{inf})) { $setup->msg($WARN, 'error_register_configds', $new_confdsid); $ans = reg_get_passwd($setup, 'input_admin_passwd', $adminuid); $setup->{inf}->{General}->{ConfigDirectoryAdminPwd} = $ans; @errs = (); } my $hassubinst = 0; # Then, register the rest of the Directory Servers, if any my @subinstances = (); # array without the Config DS foreach my $subinst (@instances) { if ( "$subinst" ne "slapd-" . $new_confdsid ) { if ( 0 == $hassubinst ) { $hassubinst = 1; print("\n==============================================================================\n"); $setup->msg('register_subds'); } my $subid = $subinst; $subid =~ s/slapd-//; push(@subinstances, ($subinst)); my $subinf = createInfFromConfig("$instconfigdir/$subinst", $subinst); if ( NULL == $subinf ) { $setup->msg($FATAL, 'error_create_inf_from_config', "$subinstconfigdir/$subinst"); $setup->doExit(1); } $setup->{inf}->{slapd} = $subinf->{slapd}; $setup->{inf}->{slapd}->{RootDNPwd} = reg_get_passwd($setup, 'input_rootdn_passwd', $subid); while (!createSubDS($setup->{inf}, \@errs)) { $setup->msg($FATAL, @errs); $setup->msg($FATAL, 'error_create_configds'); $setup->{inf}->{slapd}->{RootDNPwd} = reg_get_passwd($setup, 'input_rootdn_passwd', $subid); } } } if ( $#subinstances >= 0 ) { @errs = (); if ( !registerManyDSWithConfigDS($setup->{inf}, \@errs, $instconfigdir, @subinstances) ) { $setup->msg($FATAL, @errs); $setup->doExit(1); } } # configure and register the admin server instance # need these 3 values for ldapStart $setup->{inf}->{slapd}->{ServerIdentifier} = $new_confdsid; $setup->{inf}->{slapd}->{UseExistingMC} = "yes"; $setup->{inf}->{slapd}->{SlapdConfigForMC} = "yes"; if ( !$setup->{reconfigas} ) { if ( !createAdminServer($setup) ) { $setup->msg($FATAL, 'error_create_adminserver'); $setup->doExit(1); } } else { if ( !reconfigAdminServer($setup) ) { $setup->msg($FATAL, 'error_reconfig_adminserver'); $setup->doExit(1); } } $setup->msg('end_ds_registration'); $setup->doExit(0); --- NEW FILE register-ds-admin.res.in --- begin_ds_registration = Beginning registration of the Directory Server use_existing_configds_txt = Do you want to use this server as Configuration Directory Server?\n\n unregister_old_confds = Cleaning up old Config DS: %s\n register_new_confds = Registering new Config DS: %s\n register_subds = Registering Sub DSes: end_ds_registration = Finished registration of the Directory Server input_rootdn_passwd = Please input the Directory Manager password on the server %s: input_admin_uid = Please input the password for the Administrator User ID: [%s] input_admin_passwd = Please input the password for the Administrator User %s: input_userid = Please input the UNIX user id to run the server: [%s] input_groupid = Please input the UNIX group id to run the server: [%s] error_configds_txt = Error: the server ID %s does not exist. Choose server ID existing on the host.\n error_opening_instconfdir = Error: could not open config dir %s: %s\n\nDirectory Servers may not be set up yet.\nPlease run setup-ds-admin.pl.\nNote: once you run setup-ds-admin.pl, the server is automatically registered.\n error_no_ds = Error: could not find a Directory Server instance.\n\nDirectory Server may not be set up yet.\nPlease run setup-ds-admin.pl.\nNote: once you run setup-ds-admin.pl, the server is automatically registered.\n error_create_inf_from_config = Error: could not retrieve necessary info from %s. Please check the file.\n error_register_configds = Error: failed to register the configuration server info to the Configuration Directory Server %s.\n error_register_subds = Error: failed to register the additional server info to the Configuration Directory Server %s.\n error_unregister_ds = Error: failed to clean up the configuration info from the old Configuration\nDirectory Server %s.\n error_connection_failed = Error: failed to open an LDAP connection.\n Index: AdminServer.pm.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminServer.pm.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- AdminServer.pm.in 24 Jul 2007 20:10:16 -0000 1.7 +++ AdminServer.pm.in 27 Jul 2007 01:42:46 -0000 1.8 @@ -189,9 +189,9 @@ # This is how we extract the sie and isie as the as entries are # being added sub registercb { - my ($context, $entry, $errs) = @_; + my ($context, $entry, $errs) = @_; - my $rc = check_and_add_entry([$context->{conn}], $entry, $errs); + my $rc = check_and_add_entry([$context->{conn}, $context->{reconfig}], $entry, $errs); my $setup = $context->{setup}; if ($rc) { if ($entry->hasValue('objectclass', 'nsApplication', 1)) { @@ -218,6 +218,7 @@ my $setup = shift; my $inf = $setup->{inf}; my $configdir = shift; + my $reconfig = shift; my @errs; $setup->msg('registering_adminserver'); @@ -260,7 +261,7 @@ $setup->msg($FATAL, 'error_updating_localconf', $localconf, $!); return 0; } - my $context = {conn => $conn, localfh => \*LOCALCONF, setup => $setup}; + my $context = {conn => $conn, localfh => \*LOCALCONF, setup => $setup, reconfig => $reconfig}; getMappedEntries($mapper, \@ldiffiles, \@errs, \&registercb, $context); close(LOCALCONF); @@ -408,7 +409,7 @@ return 0; } - if (!registerASWithConfigDS($setup, $configdir)) { + if (!registerASWithConfigDS($setup, $configdir, $reconfig)) { return 0; } Index: ConfigDSDialogs.pm =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ConfigDSDialogs.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ConfigDSDialogs.pm 24 Jul 2007 20:10:16 -0000 1.5 +++ ConfigDSDialogs.pm 27 Jul 2007 01:42:46 -0000 1.6 @@ -167,6 +167,108 @@ ['dialog_configdsinfo_ca_prompt'] ); +my $regconfigdsinfo = new Dialog ( + $EXPRESS, + 'dialog_configdsinfo_text', + sub { + my $self = shift; + my $index = shift; + if ($index == 0) { # the url + my $url = $self->{manager}->{inf}->{General}->{ConfigDirectoryLdapURL}; + if (!defined($url)) { + my $host = $self->{manager}->{inf}->{General}->{FullMachineName} || + hostfqdn; + my $port = $self->{manager}->{inf}->{slapd}->{ServerPort} || 389; + if (!portAvailable($port)) { + $port = getAvailablePort(); + } + my $suffix = "o=NetscapeRoot"; + $url = "ldap://$host:$port/$suffix"; + } + return $url; + } elsif ($index == 1) { # the id + return $self->{manager}->{inf}->{General}->{ConfigDirectoryAdminID} || + "admin"; + } elsif ($index == 2 || $index == 3) { # the password + return undef; + } elsif ($index == 4) { # admin domain + my $admindomain = $self->{manager}->{inf}->{General}->{AdminDomain}; + if (!defined($admindomain)) { + $admindomain = $self->{manager}->{inf}->{General}->{FullMachineName} || + hostfqdn; + $admindomain =~ s/^[^\.]*\.//; # just the domain part + } + return $admindomain; + } else { # the CA cert + my $url = $self->{manager}->{inf}->{General}->{ConfigDirectoryLdapURL}; + my $cert = $self->{manager}->{inf}->{General}->{CACertificate}; + if (($url !~ /^ldaps/) or $self->{manager}->{inf}->{General}->{certdb} or + ($cert =~ /^-----BEGIN CERTIFICATE-----/)) { + # not using LDAPS, or already have a certdb - hide CA prompt + $self->{prompts}->[5]->[2] = 1; + } else { + $self->{prompts}->[5]->[2] = 0; # unhide CA prompt + } + return $self->{manager}->{inf}->{General}->{CACertificate}; + } + }, + sub { + my $self = shift; + my $ans = shift; + my $index = shift; + + my $res = $DialogManager::SAME; + if ($index == 0) { + # validate URL? + $self->{manager}->{inf}->{General}->{ConfigDirectoryLdapURL} = $ans; + my $url = $self->{manager}->{inf}->{General}->{ConfigDirectoryLdapURL}; + if (($url !~ /^ldaps/) or $self->{manager}->{inf}->{General}->{certdb}) { + # not using LDAPS, or already have a certdb - hide CA prompt + $self->{prompts}->[5]->[2] = 1; + } else { + $self->{prompts}->[5]->[2] = 0; # unhide CA prompt + } + $res = $DialogManager::NEXT; + } elsif ($index == 1) { # id + $self->{manager}->{inf}->{General}->{ConfigDirectoryAdminID} = $ans; + $res = $DialogManager::NEXT; + } elsif ($index == 2) { # pwd + my $test = $ans; + if ($test) { + $test =~ s/\s//g; + } + if (!$ans or (length($test) != length($ans))) { + $self->{manager}->alert("dialog_configdsadmin_invalid"); + } else { + $self->{firstpassword} = $ans; # save for next index + $res = $DialogManager::NEXT; + } + } elsif ($index == 3) { # verify second password + if ($ans ne $self->{firstpassword}) { + $self->{manager}->alert("dialog_configdsadmin_nomatch"); + } else { + $self->{manager}->{inf}->{General}->{ConfigDirectoryAdminPwd} = $ans; + $res = $DialogManager::NEXT; + } + } elsif ($index == 4) { # admin domain + $self->{manager}->{inf}->{General}->{AdminDomain} = $ans; + $res = $DialogManager::NEXT; + } else { # CA cert filename + if ($ans && length($ans) && + ($ans !~ /^-----BEGIN CERTIFICATE-----/) && ! -f $ans) { + $self->{manager}->alert("dialog_configdsinfo_ca_error", $ans); + } else { + $self->{manager}->{inf}->{General}->{CACertificate} = $ans; + $res = $DialogManager::NEXT; + } + } + return $res; + }, + ['dialog_configdsinfo_url_prompt'], ['dialog_configdsinfo_id_prompt'], + ['dialog_configdsinfo_pwd_prompt', 1], ['dialog_configdsinfo_pwd2_prompt', 1], + ['dialog_configdsinfo_domain_prompt', 0, 0], ['dialog_configdsinfo_ca_prompt'] +); + my $configdsadmin = new Dialog ( $EXPRESS, 'dialog_configdsadmin_text', @@ -311,4 +413,8 @@ return ($useconfigds, $configdsinfo, $configdsadmin, $configdsadmindomain); } +sub getRegDialogs { + return ($regconfigdsinfo, $configdsadmindomain); +} + 1; Index: setup-ds-admin.res.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.res.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- setup-ds-admin.res.in 13 Jul 2007 18:39:15 -0000 1.5 +++ setup-ds-admin.res.in 27 Jul 2007 01:42:46 -0000 1.6 @@ -46,6 +46,7 @@ dialog_configdsinfo_url_prompt = Configuration directory server URL dialog_configdsinfo_id_prompt = Configuration directory server admin ID dialog_configdsinfo_pwd_prompt = Configuration directory server admin password +dialog_configdsinfo_pwd2_prompt = Configuration directory server admin password (confirm) dialog_configdsinfo_domain_prompt = Configuration directory server admin domain dialog_configdsinfo_ca_prompt = CA certificate filename dialog_configdsinfo_ca_error = '%s' is not a valid CA certificate file. Please choose another one.\n\n @@ -57,7 +58,7 @@ dialog_configdsadmin_text = Please enter the administrator ID for the configuration directory\nserver. This is the ID typically used to log in to the console. You\nwill also be prompted for the password.\n\n dialog_configdsadmin_prompt = Configuration directory server\nadministrator ID dialog_configdsadmin_pw1_prompt = Password -dialog_configdsadmin_pw2_prompt = Password (again) +dialog_configdsadmin_pw2_prompt = Password (confirm) dialog_configdsadmin_error = The input '%s' is not a valid ID. Please choose another one.\n\n dialog_configdsadmin_invalid = The password contains invalid characters. Please choose another one.\n\n dialog_configdsadmin_nomatch = The passwords do not match. Please try again.\n\n

1 0

[Fedora-directory-commits] adminserver Makefile.am, 1.23, 1.24 Makefile.in, 1.23, 1.24
by Doctor Conrad 27 Jul '07

27 Jul '07

Author: nhosoi Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20804 Modified Files: Makefile.am Makefile.in Log Message: resolves: #249739 Summary: Implement a script registering DS to the Configuration DS (comment #1-4) Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/adminserver/Makefile.am,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Makefile.am 11 Jul 2007 01:20:21 -0000 1.23 +++ Makefile.am 27 Jul 2007 01:42:46 -0000 1.24 @@ -161,18 +161,22 @@ ds_start ds_restart ds_shutdown ds_ldif2db ds_db2ldif ds_bak2db \ ds_db2bak ds_listdb ds_rmdb ds_snmpctrl ds_vlvindex ds_addindex -bin_SCRIPTS = admserv/newinst/src/register_server.pl cgibin_SCRIPTS = admserv/cgi-src40/ds_create admserv/cgi-src40/ds_remove -nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin +nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin \ + admserv/cfgstuff/stop-ds-admin \ + admserv/cfgstuff/restart-ds-admin \ + admserv/cfgstuff/ds_removal cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl \ - admserv/newinst/src/migrate-ds-admin.pl + admserv/newinst/src/migrate-ds-admin.pl \ + admserv/newinst/src/register-ds-admin.pl perl_SCRIPTS = admserv/newinst/src/ASDialogs.pm \ admserv/newinst/src/AdminUtil.pm \ admserv/newinst/src/AdminServer.pm \ admserv/newinst/src/ConfigDSDialogs.pm \ - admserv/newinst/src/AdminMigration.pm + admserv/newinst/src/AdminMigration.pm \ + admserv/newinst/src/RegDSDialogs.pm libds_admin_serv_la_SOURCES = $(libbase_a_SOURCES) $(libsi18n_a_SOURCES) $(libadmin_a_SOURCES) libds_admin_serv_la_LINK = $(MYLINK) @@ -370,6 +374,7 @@ # regular property files go here property_DATA = admserv/newinst/src/setup-ds-admin.res \ admserv/newinst/src/migrate-ds-admin.res \ + admserv/newinst/src/register-ds-admin.res \ admserv/cgi-src40/ds_create.res \ admserv/cgi-src40/ds_remove.res Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/adminserver/Makefile.in,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Makefile.in 11 Jul 2007 01:20:21 -0000 1.23 +++ Makefile.in 27 Jul 2007 01:42:46 -0000 1.24 @@ -99,13 +99,13 @@ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" \ - "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cgibindir)" \ - "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(initdir)" \ - "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" \ - "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" \ - "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" \ - "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" \ - "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" + "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" \ + "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" \ + "$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" \ + "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" \ + "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" \ + "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" \ + "$(DESTDIR)$(propertydir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libds_admin_serv_la_LIBADD = @@ -238,14 +238,13 @@ am_viewlog_OBJECTS = admserv/cgi-src40/viewlog.$(OBJEXT) viewlog_OBJECTS = $(am_viewlog_OBJECTS) viewlog_DEPENDENCIES = $(am__DEPENDENCIES_2) -binSCRIPT_INSTALL = $(INSTALL_SCRIPT) cgibinSCRIPT_INSTALL = $(INSTALL_SCRIPT) cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) initSCRIPT_INSTALL = $(INSTALL_SCRIPT) nodist_cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) perlSCRIPT_INSTALL = $(INSTALL_SCRIPT) -SCRIPTS = $(bin_SCRIPTS) $(cgibin_SCRIPTS) $(cmdbin_SCRIPTS) \ - $(init_SCRIPTS) $(nodist_cmdbin_SCRIPTS) $(perl_SCRIPTS) +SCRIPTS = $(cgibin_SCRIPTS) $(cmdbin_SCRIPTS) $(init_SCRIPTS) \ + $(nodist_cmdbin_SCRIPTS) $(perl_SCRIPTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -588,17 +587,22 @@ admserv/newinst/src/dirserver.map \ admserv/newinst/src/asmigrate.map -bin_SCRIPTS = admserv/newinst/src/register_server.pl cgibin_SCRIPTS = admserv/cgi-src40/ds_create admserv/cgi-src40/ds_remove -nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin +nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin \ + admserv/cfgstuff/stop-ds-admin \ + admserv/cfgstuff/restart-ds-admin \ + admserv/cfgstuff/ds_removal + cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl \ - admserv/newinst/src/migrate-ds-admin.pl + admserv/newinst/src/migrate-ds-admin.pl \ + admserv/newinst/src/register-ds-admin.pl perl_SCRIPTS = admserv/newinst/src/ASDialogs.pm \ admserv/newinst/src/AdminUtil.pm \ admserv/newinst/src/AdminServer.pm \ admserv/newinst/src/ConfigDSDialogs.pm \ - admserv/newinst/src/AdminMigration.pm + admserv/newinst/src/AdminMigration.pm \ + admserv/newinst/src/RegDSDialogs.pm libds_admin_serv_la_SOURCES = $(libbase_a_SOURCES) $(libsi18n_a_SOURCES) $(libadmin_a_SOURCES) libds_admin_serv_la_LINK = $(MYLINK) @@ -775,6 +779,7 @@ # regular property files go here property_DATA = admserv/newinst/src/setup-ds-admin.res \ admserv/newinst/src/migrate-ds-admin.res \ + admserv/newinst/src/register-ds-admin.res \ admserv/cgi-src40/ds_create.res \ admserv/cgi-src40/ds_remove.res @@ -1272,25 +1277,6 @@ viewlog$(EXEEXT): $(viewlog_OBJECTS) $(viewlog_DEPENDENCIES) @rm -f viewlog$(EXEEXT) $(viewlog_LINK) $(viewlog_LDFLAGS) $(viewlog_OBJECTS) $(viewlog_LDADD) $(LIBS) -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ - else :; fi; \ - done - -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done install-cgibinSCRIPTS: $(cgibin_SCRIPTS) @$(NORMAL_INSTALL) test -z "$(cgibindir)" || $(mkdir_p) "$(DESTDIR)$(cgibindir)" @@ -2540,7 +2526,7 @@ $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive @@ -2612,7 +2598,7 @@ @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook -install-exec-am: install-binSCRIPTS install-libLTLIBRARIES +install-exec-am: install-libLTLIBRARIES install-info: install-info-recursive @@ -2640,14 +2626,14 @@ ps-am: -uninstall-am: uninstall-binSCRIPTS uninstall-cgibinPROGRAMS \ - uninstall-cgibinSCRIPTS uninstall-cmdbinSCRIPTS \ - uninstall-dist_helpDATA uninstall-dist_htmlDATA \ - uninstall-dist_iconDATA uninstall-infDATA uninstall-info-am \ - uninstall-initSCRIPTS uninstall-ldifDATA \ - uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \ - uninstall-nodist_configDATA uninstall-nodist_propertyDATA \ - uninstall-perlSCRIPTS uninstall-propertyDATA +uninstall-am: uninstall-cgibinPROGRAMS uninstall-cgibinSCRIPTS \ + uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \ + uninstall-dist_htmlDATA uninstall-dist_iconDATA \ + uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \ + uninstall-ldifDATA uninstall-libLTLIBRARIES \ + uninstall-nodist_cmdbinSCRIPTS uninstall-nodist_configDATA \ + uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \ + uninstall-propertyDATA uninstall-info: uninstall-info-recursive @@ -2659,12 +2645,11 @@ distclean-compile distclean-generic distclean-hdr \ distclean-libtool distclean-recursive distclean-tags \ distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-binSCRIPTS \ - install-cgibinPROGRAMS install-cgibinSCRIPTS \ - install-cmdbinSCRIPTS install-data install-data-am \ - install-data-hook install-dist_helpDATA install-dist_htmlDATA \ - install-dist_iconDATA install-exec install-exec-am \ - install-infDATA install-info install-info-am \ + html-am info info-am install install-am install-cgibinPROGRAMS \ + install-cgibinSCRIPTS install-cmdbinSCRIPTS install-data \ + install-data-am install-data-hook install-dist_helpDATA \ + install-dist_htmlDATA install-dist_iconDATA install-exec \ + install-exec-am install-infDATA install-info install-info-am \ install-initSCRIPTS install-ldifDATA install-libLTLIBRARIES \ install-man install-nodist_cmdbinSCRIPTS \ install-nodist_configDATA install-nodist_propertyDATA \ @@ -2674,14 +2659,14 @@ maintainer-clean-recursive mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-binSCRIPTS uninstall-cgibinPROGRAMS \ - uninstall-cgibinSCRIPTS uninstall-cmdbinSCRIPTS \ - uninstall-dist_helpDATA uninstall-dist_htmlDATA \ - uninstall-dist_iconDATA uninstall-infDATA uninstall-info-am \ - uninstall-initSCRIPTS uninstall-ldifDATA \ - uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \ - uninstall-nodist_configDATA uninstall-nodist_propertyDATA \ - uninstall-perlSCRIPTS uninstall-propertyDATA + uninstall-cgibinPROGRAMS uninstall-cgibinSCRIPTS \ + uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \ + uninstall-dist_htmlDATA uninstall-dist_iconDATA \ + uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \ + uninstall-ldifDATA uninstall-libLTLIBRARIES \ + uninstall-nodist_cmdbinSCRIPTS uninstall-nodist_configDATA \ + uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \ + uninstall-propertyDATA define NL \\n

1 0

[Fedora-directory-commits] adminserver/admserv/newinst/src AdminUtil.pm.in, 1.11, 1.12
by Doctor Conrad 27 Jul '07

27 Jul '07

Author: nhosoi Update of /cvs/dirsec/adminserver/admserv/newinst/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20336/admserv/newinst/src Modified Files: AdminUtil.pm.in Log Message: resolves: #247215 Summary: Reimplement ds_remove (cgi) and ds_removal (command line wrapper) without setuputil code (comment #23) Index: AdminUtil.pm.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminUtil.pm.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- AdminUtil.pm.in 24 Jul 2007 20:10:16 -0000 1.11 +++ AdminUtil.pm.in 27 Jul 2007 01:35:29 -0000 1.12 @@ -23,12 +23,12 @@ updateAdmConf updateAdmpw updateLocalConf importCACert getLocalConfigDS getPset registerDSWithConfigDS registerManyDSWithConfigDS createSubDSNoConn - unregisterDSWithConfigDS); + unregisterDSWithConfigDS isConfigDS); @EXPORT_OK = qw(getAdmConf getConfigDSConn createConfigDS createSubDS updateAdmConf updateAdmpw updateLocalConf importCACert getLocalConfigDS getPset registerDSWithConfigDS registerManyDSWithConfigDS createSubDSNoConn - unregisterDSWithConfigDS); + unregisterDSWithConfigDS isConfigDS); # load perldap use Mozilla::LDAP::Conn; @@ -130,6 +130,19 @@ return "$configdir/admin-serv"; } +sub isConfigDS { + my $inst = shift; + my $configdir = shift; + my $admConf = getAdmConf ($configdir); + my $ldapstart = $admConf->{ldapStart}; + my $expected = $inst . "/start-slapd"; + if ( "$ldapstart" eq "$expected" ) { + return 1; + } else { + return 0; + } +} + sub getConfigDSConn { my $url = shift; my $id = shift; @@ -229,6 +242,10 @@ $inf->{slapd}->{RootDN}, $inf->{slapd}->{RootDNPwd}, $inf->{General}->{certdir}); + if (!$conn) { + @{$errs} = ('error_connection_failed'); + return 0; + } # add the NetscapeRoot suffix @{$errs} = addSuffix($conn, "o=NetscapeRoot", "NetscapeRoot"); @@ -597,6 +614,7 @@ unlink($instinf->{filename}); $instinf->{General}->{ConfigDirectoryLdapURL} = $inf->{General}->{ConfigDirectoryLdapURL}; + $instinf->{General}->{AdminDomain} = $inf->{General}->{AdminDomain}; if (!registerDSWithConfigDS($inst, $errs, $instinf, $conn, $admConf, $configdir)) { return 0;

1 0

[Fedora-directory-commits] adminserver/admserv/cgi-src40 ds_remove.in, 1.3, 1.4
by Doctor Conrad 27 Jul '07

27 Jul '07

Author: nhosoi Update of /cvs/dirsec/adminserver/admserv/cgi-src40 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20336/admserv/cgi-src40 Modified Files: ds_remove.in Log Message: resolves: #247215 Summary: Reimplement ds_remove (cgi) and ds_removal (command line wrapper) without setuputil code (comment #23) Index: ds_remove.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_remove.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ds_remove.in 24 Jul 2007 20:10:15 -0000 1.3 +++ ds_remove.in 27 Jul 2007 01:35:29 -0000 1.4 @@ -30,16 +30,24 @@ use FileConn; use Resource; +# remove_tree($centry, $key, $instname, [$isparent, [$dontremove]]) +# $centry: entry to look for the path to be removed +# $key: key to look for the path in the entry +# $instname: instance name "slapd-<ID>" to check the path +# $isparent: specify 1 to remove from the parent dir +# $dontremove: pattern not to be removed (e.g., ".db$") sub remove_tree { my $centry = shift; my $key = shift; my $instname = shift; my $isparent = shift; + my $dontremove = shift; foreach my $path ( @{$centry->{$key}} ) { my $rmdir = ""; + my $rc = 0; if ( 1 == $isparent ) { $rmdir = dirname($path); @@ -50,8 +58,55 @@ } if ( -d $rmdir && $rmdir =~ /$instname/ ) { - my $rc = rmtree($rmdir); - print STDERR "rmtree: $rmdir => RC: $rc\n"; + if ( "" eq "$dontremove" ) + { + $rc = rmtree($rmdir); + if ( 0 == $rc ) + { + print "Content-type: text/plain\n\n"; + print "NMC_ErrInfo: $rmdir was not removed.\n"; + print STDERR "Warning: $rmdir was not removed.\n"; + } + } + else + { + # Skip the dontremove files + $rc = opendir(DIR, $rmdir); + if ($rc) + { + while (defined(my $file = readdir(DIR))) + { + next if ( "$file" =~ /$dontremove/ ); + next if ( "$file" eq "." ); + next if ( "$file" eq ".." ); + my $rmfile = $rmdir . "/" . $file; + my $rc0 = rmtree($rmfile); + if ( 0 == $rc0 ) + { + print "Content-type: text/plain\n\n"; + print "NMC_ErrInfo: $rmfile was not removed.\n"; + print STDERR "Warning: $rmfile was not removed.\n"; + } + } + closedir(DIR); + } + my $newrmdir = $rmdir . ".removed"; + my $rc1 = 1; + if ( -d $newrmdir ) + { + $rc1 = rmtree($newrmdir); + if ( 0 == $rc1 ) + { + print "Content-type: text/plain\n\n"; + print "NMC_ErrInfo: $newrmdir was not removed.\n"; + print STDERR "Warning: $newrmdir was not removed.\n"; + } + } + if ( 0 < $rc1 ) + { + rename($rmdir, $newrmdir); + } + } } } } @@ -83,12 +138,23 @@ my $instname = $query->param('InstanceName'); my ($slapd, $inst) = split(/-/, $instname, 2); +my $configdir = "@instconfigdir@/slapd-$inst"; +if ( ! -d $configdir ) +{ + print "Content-type: text/plain\n\n"; + print "NMC_ErrInfo: $configdir does not exist\n"; + print "NMC_Status: 1\n"; + print STDERR "Error: $configdir does not exist\n"; + exit 1; +} my @errs; -my $inf = createInfFromConfig("@instconfigdir@/slapd-$inst", $inst, \@errs); -if (@errs) { +my $inf = createInfFromConfig($configdir, $inst, \@errs); +if (@errs) +{ print "Content-type: text/plain\n\n"; print "NMC_ErrInfo: ", $res->getText(@errs), "\n"; print "NMC_Status: 1\n"; + print STDERR "Error: ", $res->getText(@errs), "\n"; exit 1; } @@ -108,14 +174,43 @@ my $dn = "cn=config"; my $entry = $conn->search($dn, "base", "(cn=*)", 0); -if (!$entry) { +if (!$entry) +{ print "Content-type: text/plain\n\n"; print "NMC_ErrInfo: Search $dn in $dseldif failed: $entry\n"; print "NMC_Status: 1\n"; + print STDERR "Error: Search $dn in $dseldif failed: $entry\n"; + exit 1; +} + +# Unregister the server from the configuration ds +# get config ds url from input or admconf +# get admin id from input or admconf +# must get admin password from input (PASSWORD_PIPE?) +# get admin domain +# config ds info +if (!unregisterDSWithConfigDS($inst, \@errs, $inf)) +{ + print "Content-type: text/plain\n\n"; + print "NMC_ErrInfo: ", $res->getText(@errs), "\n"; + print "NMC_Status: 1\n"; + print STDERR "Error:", $res->getText(@errs), "\n"; + exit 1; +} + +$dn = "cn=config,cn=ldbm database,cn=plugins,cn=config"; +my $dbentry = $conn->search($dn, "base", "(cn=*)", 0); +if (!$dbentry) +{ + print "Content-type: text/plain\n\n"; + print "NMC_ErrInfo: Search $dn in $dseldif failed: $dbentry\n"; + print "NMC_Status: 1\n"; + print "Error: Search $dn in $dseldif failed: $dbentry\n"; exit 1; } +$conn->close(); -# stop the server first +# stop the server my $instdir = ""; foreach my $path ( @{$entry->{"nsslapd-instancedir"}} ) { @@ -131,56 +226,51 @@ # Ignore the stop failure print "Content-type: text/plain\n\n"; print "NMC_ErrInfo: Could not stop directory server: $output\n"; + print STDERR "Warning: Could not stop directory server: $output\n"; } $instdir = $path; # need to use it later... } else { print "Content-type: text/plain\n\n"; print "NMC_ErrInfo: The program $prog does not exist\n"; print "NMC_Status: 1\n"; + print STDERR "Error: The program $prog does not exist\n"; exit 1; } } } - -# Unregister the server from the configuration ds -# get config ds url from input or admconf -# get admin id from input or admconf -# must get admin password from input (PASSWORD_PIPE?) -# get admin domain -# config ds info -if (!unregisterDSWithConfigDS($inst, \@errs, $inf)) { - print "Content-type: text/plain\n\n"; - print "NMC_ErrInfo: ", $res->getText(@errs), "\n"; - print "NMC_Status: 1\n"; - exit 1; -} - + # remove physical dirs/files -$dn = "cn=config,cn=ldbm database,cn=plugins,cn=config"; -my $dbentry = $conn->search($dn, "base", "(cn=*)", 0); -if (!$dbentry) { - print "Content-type: text/plain\n\n"; - print "NMC_ErrInfo: Search $dn in $dseldif failed: $dbentry\n"; - print "NMC_Status: 1\n"; - exit 1; -} remove_tree($dbentry, "nsslapd-directory", $instname, 1); remove_tree($dbentry, "nsslapd-db-logdirectory", $instname, 1); remove_tree($entry, "nsslapd-lockdir", $instname); remove_tree($entry, "nsslapd-tmpdir", $instname); remove_tree($entry, "nsslapd-bakdir", $instname, 1); remove_tree($entry, "nsslapd-errorlog", $instname, 1); -remove_tree($entry, "nsslapd-schemadir", $instname, 1); # instance dir -if ( -d $instdir ) +if ( -d $instdir && $instdir =~ /$instname/ ) { # clean up pid files (if any) remove_pidfile("STARTPIDFILE", $instdir, $instname); remove_pidfile("PIDFILE", $instdir, $instname); + if ( 1 == isConfigDS($instname, "@instconfigdir@/admin-serv") ) + { + # if it is the Config DS, adm.conf and local.conf needs to be removed. + unlink("@instconfigdir@/admin-serv/adm.conf"); + unlink("@instconfigdir@/admin-serv/local.conf"); + } + my $rc = rmtree($instdir); + if ( 0 == $rc ) + { + print "Content-type: text/plain\n\n"; + print "NMC_ErrInfo: $instdir was not removed.\n"; + print STDERR "Warning: $instdir was not removed.\n"; + } } +# Finally, config dir +remove_tree($entry, "nsslapd-schemadir", $instname, 1, "\.db\$"); # if we got here, report success print "Content-type: text/plain\n\n";

1 0

[Fedora-directory-commits] adminserver/admserv/cfgstuff ds_removal.in, NONE, 1.1
by Doctor Conrad 27 Jul '07

27 Jul '07

Author: nhosoi Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20336/admserv/cfgstuff Added Files: ds_removal.in Log Message: resolves: #247215 Summary: Reimplement ds_remove (cgi) and ds_removal (command line wrapper) without setuputil code (comment #23) --- NEW FILE ds_removal.in --- #!/bin/sh # BEGIN COPYRIGHT BLOCK # 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; version 2 of the License. # # 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., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # In addition, as a special exception, Red Hat, Inc. gives You the additional # right to link the code of this Program with code not covered under the GNU # General Public License ("Non-GPL Code") and to distribute linked combinations # including the two, subject to the limitations in this paragraph. Non-GPL Code # permitted under this exception must only link to the code of this Program # through those well defined interfaces identified in the file named EXCEPTION # found in the source code files (the "Approved Interfaces"). The files of # Non-GPL Code may instantiate templates or use macros or inline functions from # the Approved Interfaces without causing the resulting work to be covered by # the GNU General Public License. Only Red Hat, Inc. may make changes or # additions to the list of Approved Interfaces. You must obey the GNU General # Public License in all respects for all of the Program code and other code used # in conjunction with the Program except the Non-GPL Code covered by this # exception. If you modify this file, you may extend this exception to your # version of the file, but you are not obligated to do so. If you do not wish to # provide this exception without modification, you must delete this exception # statement from your version and license this file solely under the GPL without # exception. # # # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # Usage() { echo "Usage: $0 -s server_id -w admin_password" echo " server_id: Directory server identifier; slapd-<server_id>" echo " admin_password: Administration user password" } err0="" err1="" err2="" server_id="" admin_pw="" while [ "$1" != "" ] do if [ "$1" = "-s" ]; then shift server_id=$1 elif [ "$1" = "-w" ]; then shift admin_pw=$1 elif [ "$1" = "-h" -o "$1" = "-H" -o "$1" = "--help" ]; then Usage exit 0 else err0="Option $1 is not supported. " fi if [ "$1" != "" ]; then shift fi done if [ "$server_id" = "" ]; then err1="Directory Server identifier is missing. " fi if [ "$admin_pw" = "" ]; then err2="Administration user password is missing. " fi if [ "$err0" != "" -o "$err1" != "" -o "$err2" != "" ];then echo Error: ${err0}${err1}${err2} Usage exit 1 fi PASSWORD_PIPE=STDIN; export PASSWORD_PIPE QUERY_STRING="InstanceName=slapd-${server_id}"; export QUERY_STRING SERVER_NAMES=slapd-${server_id}; export SERVER_NAMES REQUEST_METHOD=GET; export REQUEST_METHOD if [ -c /dev/null ]; then NULL=/dev/null else NULL=/tmp/ds_remove.out fi @cgibindir@/ds_remove > $NULL << EOF Password: ${admin_pw} EOF exit $?

1 0

[Fedora-directory-commits] console/src/com/netscape/management/client/theme theme.properties, 1.3, 1.4
by Doctor Conrad 27 Jul '07

27 Jul '07

Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/theme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27292/src/com/netscape/management/client/theme Modified Files: theme.properties Log Message: Resolves: 249777 Summary: Moved preference dir name into theme. Did some cleanup to the specfile around post and preun steps. Renamed start script. Index: theme.properties =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/theme/theme.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- theme.properties 2 Jul 2007 18:49:25 -0000 1.3 +++ theme.properties 26 Jul 2007 23:08:49 -0000 1.4 @@ -20,6 +20,7 @@ console-title=Fedora Management Console console-useragent=Fedora-Management-Console +console-prefsdir=.fedora-console login-title=Fedora Management Console Login banner-console=Fedora Management Console

1 0

[Fedora-directory-commits] console/src/com/netscape/management/client/console Console.java, 1.10, 1.11
by Doctor Conrad 27 Jul '07

27 Jul '07

Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27292/src/com/netscape/management/client/console Modified Files: Console.java Log Message: Resolves: 249777 Summary: Moved preference dir name into theme. Did some cleanup to the specfile around post and preun steps. Renamed start script. Index: Console.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/Console.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Console.java 2 Jul 2007 18:49:24 -0000 1.10 +++ Console.java 26 Jul 2007 23:08:48 -0000 1.11 @@ -53,6 +53,15 @@ static long _t0 = System.currentTimeMillis(); // + // global values + // + public static Preferences _preferences; + public static ConsoleInfo _info; + public static String _consoleAdminURL; + public static ResourceSet _resource = new ResourceSet("com.netscape.management.client.console.console"); + public static ResourceSet _resource_theme = new ResourceSet("com.netscape.management.client.theme.theme"); + + // // preference information // public static final String IDENTIFIER = "Console"; @@ -70,22 +79,13 @@ public static final String PREFERENCE_Y = "Y"; public static final String PREFERENCE_DIR = System.getProperty("user.home") + File.separator + - ".fedora-console" + File.separator; + _resource_theme.getString("console","prefsdir") + File.separator; public static final String OPTION_NOWINPOS = "nowinpos"; public static final String OPTION_NOLOGO = "nologo"; public static final String OPTION_JAVALAF = "javalaf"; - public static final int MAX_RECENT_URLS = 5; - - // - // global values - // - public static Preferences _preferences; - public static ConsoleInfo _info; - public static String _consoleAdminURL; - public static ResourceSet _resource = new ResourceSet("com.netscape.management.client.console.console"); - public static ResourceSet _resource_theme = new ResourceSet("com.netscape.management.client.theme.theme"); + public static final int MAX_RECENT_URLS = 5; // // private values

1 0

[Fedora-directory-commits] console fedora-console, NONE, 1.1 build.properties, 1.11, 1.12 build.xml, 1.14, 1.15 fedora-console.spec, 1.2, 1.3 startconsole, 1.7, NONE
by Doctor Conrad 27 Jul '07

27 Jul '07

Author: nkinder Update of /cvs/dirsec/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27292 Modified Files: build.properties build.xml fedora-console.spec Added Files: fedora-console Removed Files: startconsole Log Message: Resolves: 249777 Summary: Moved preference dir name into theme. Did some cleanup to the specfile around post and preun steps. Renamed start script. --- NEW FILE fedora-console --- #!/bin/sh # # BEGIN COPYRIGHT BLOCK # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation version # 2.1 of the License. # # This library 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 # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # END COPYRIGHT BLOCK JAVA=`which java` if [ -z "$JAVA" -o ! -x "$JAVA" ] then echo "$0: The java program is not in your path, or is not executable."; exit 1 fi CLASSDEST=@classdest@ # # Launch the Console # java -ms8m -mx64m -cp @jssjar@:@ldapjdkjar@:$CLASSDEST/@basejar@:$CLASSDEST/@mccjar@:$CLASSDEST/@mcclangjar@:$CLASSDEST/@nmclfjar@:$CLASSDEST/@nmclflangjar@:$CLASSDEST/@themejar@ -Djava.library.path=@libdir@ -Djava.util.prefs.systemRoot="$HOME/.@prefsdir@" -Djava.util.prefs.userRoot="$HOME/.@prefsdir@" com.netscape.management.client.console.Console $* Index: build.properties =================================================================== RCS file: /cvs/dirsec/console/build.properties,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- build.properties 29 Jun 2007 20:32:26 -0000 1.11 +++ build.properties 26 Jul 2007 23:08:46 -0000 1.12 @@ -40,7 +40,7 @@ base.name=${base.core}-${console.dotversion} base.gen.name=${base.core}-${console.dotgenversion} -theme.core=${console.brand}-theme +theme.core=${console.brand}-console theme.name=${theme.core}-${console.dotversion} theme.gen.name=${theme.core}-${console.dotgenversion} Index: build.xml =================================================================== RCS file: /cvs/dirsec/console/build.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- build.xml 29 Jun 2007 20:32:26 -0000 1.14 +++ build.xml 26 Jul 2007 23:08:46 -0000 1.15 @@ -184,9 +184,9 @@ <classpath refid="console.classpath" /> </javac> -  - <copy file="startconsole" todir="${release.dir}"/> - <replace file="${release.dir}/startconsole"> +  + <copy file="fedora-console" todir="${release.dir}"/> + <replace file="${release.dir}/fedora-console"> <replacefilter token="@classdest@" value="${classdest}"/> <replacefilter token="@jssjar@" value="${jss.local.location}/${jss.jar.name}"/> <replacefilter token="@ldapjdkjar@" value="${ldapjdk.local.location}/${ldapjdk.jar.name}"/> @@ -196,6 +196,7 @@ <replacefilter token="@nmclfjar@" value="${nmclf.name}.jar"/> <replacefilter token="@nmclflangjar@" value="${nmclf.name}_${lang}.jar"/> <replacefilter token="@themejar@" value="${theme.name}_${lang}.jar"/> + <replacefilter token="@prefsdir@" value="${theme.core}"/> <replacefilter token="@libdir@" value="${lib.dir}"/> </replace> </target> Index: fedora-console.spec =================================================================== RCS file: /cvs/dirsec/console/fedora-console.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-console.spec 29 Jun 2007 20:32:26 -0000 1.2 +++ fedora-console.spec 26 Jul 2007 23:08:46 -0000 1.3 @@ -3,7 +3,7 @@ Name: fedora-console Version: %{major_version}.%{minor_version} -Release: 1 +Release: 2 Group: Applications Vendor: Fedora Project URL: http://directory.fedora.redhat.com @@ -46,15 +46,15 @@ install -d $RPM_BUILD_ROOT/usr/share/java install -m777 built/release/jars/fedora-* $RPM_BUILD_ROOT/usr/share/java install -d $RPM_BUILD_ROOT/usr/bin -install -m777 built/release/startconsole $RPM_BUILD_ROOT/usr/bin +install -m777 built/release/%{name} $RPM_BUILD_ROOT/usr/bin %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -/usr/share/java/fedora-theme-%{version}_en.jar -/usr/bin/startconsole +/usr/share/java/%{name}-%{version}_en.jar +/usr/bin/%{name} %files framework %defattr(-,root,root) @@ -63,9 +63,14 @@ /usr/share/java/fedora-mcc-%{version}_en.jar /usr/share/java/fedora-nmclf-%{version}.jar /usr/share/java/fedora-nmclf-%{version}_en.jar - + %post cd /usr/share/java +ln -s %{name}-%{version}_en.jar %{name}-%{major_version}_en.jar +ln -s %{name}-%{version}_en.jar %{name}_en.jar + +%post framework +cd /usr/share/java ln -s fedora-base-%{version}.jar fedora-base-%{major_version}.jar ln -s fedora-base-%{version}.jar fedora-base.jar ln -s fedora-mcc-%{version}.jar fedora-mcc-%{major_version}.jar @@ -76,10 +81,12 @@ ln -s fedora-nmclf-%{version}.jar fedora-nmclf.jar ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf-%{major_version}_en.jar ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf_en.jar -ln -s fedora-theme-%{version}_en.jar fedora-theme-%{major_version}_en.jar -ln -s fedora-theme-%{version}_en.jar fedora-theme_en.jar %preun +rm -rf /usr/share/java/%{name}-%{major_version}_en.jar +rm -rf /usr/share/java/%{name}_en.jar + +%preun framework rm -rf /usr/share/java/fedora-base-%{major_version}.jar rm -rf /usr/share/java/fedora-base.jar rm -rf /usr/share/java/fedora-mcc-%{major_version}.jar @@ -90,11 +97,13 @@ rm -rf /usr/share/java/fedora-nmclf.jar rm -rf /usr/share/java/fedora-nmclf-%{major_version}_en.jar rm -rf /usr/share/java/fedora-nmclf_en.jar -rm -rf /usr/share/java/fedora-theme-%{major_version}_en.jar -rm -rf /usr/share/java/fedora-theme_en.jar %changelog -* Fri Jun 29 2007 Nathan Kinder <nkinder(a)redhat.com 1.1.0-1 +* Thu Jul 26 2007 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-2 +- Updated start script and theme jar names. Fixed post and + preun steps for framework subpackage. + +* Fri Jun 29 2007 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-1 - Updated for 1.1.0 release * Mon Nov 14 2005 Nathan Kinder <nkinder(a)redhat.com> 1.0-1 --- startconsole DELETED ---

1 0

[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSCreate.pm.in, 1.2, 1.3
by Doctor Conrad 27 Jul '07

27 Jul '07

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22130 Modified Files: DSCreate.pm.in Log Message: Resolves: #249722 Summary: restart-slapd has an unreplaced token {{INST-DIR}} Description: hash key, value: INST-DIR => $inf->{slapd}->{inst_dir} is added Index: DSCreate.pm.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSCreate.pm.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DSCreate.pm.in 13 Jul 2007 19:51:48 -0000 1.2 +++ DSCreate.pm.in 26 Jul 2007 20:40:11 -0000 1.3 @@ -216,6 +216,7 @@ "BAK-DIR" => $inf->{slapd}->{bak_dir}, "SERVER-DIR" => $inf->{General}->{ServerRoot}, "CONFIG-DIR" => $inf->{slapd}->{config_dir}, + "INST-DIR" => $inf->{slapd}->{inst_dir}, "RUN-DIR" => $inf->{slapd}->{run_dir}, "PRODUCT-NAME" => "slapd", "SERVERBIN-DIR" => $inf->{slapd}->{sbindir},

1 0

[Fedora-directory-commits] console/src/com/netscape/management/client AboutDialog.java, 1.7, 1.8 FrameworkInitializer.java, 1.3, 1.4 default.properties, 1.7, 1.8
by Doctor Conrad 27 Jul '07

27 Jul '07

Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20155/src/com/netscape/management/client Modified Files: AboutDialog.java FrameworkInitializer.java default.properties Log Message: Resolves: 249642 Summary: Don't combine theme name with framework version. Index: AboutDialog.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/AboutDialog.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- AboutDialog.java 29 Jun 2007 20:32:27 -0000 1.7 +++ AboutDialog.java 26 Jul 2007 15:53:02 -0000 1.8 @@ -25,6 +25,7 @@ import java.awt.*; import com.netscape.management.client.util.*; +import com.netscape.management.client.console.*; /** * AboutDialog is a class to display a standard "about box", @@ -103,7 +104,10 @@ } - GridBagUtil.constrain(content, new MultilineLabel(copyright), + GridBagUtil.constrain(content, new MultilineLabel(copyright + "\n\n" + + (new ResourceSet("com.netscape.management.client.default")). + getString("aboutDialog", "dialogFrameworkPrefix") + " " + + VersionInfo.getVersionNumber()), 1, 0, 1, 1, 1, 0, GridBagConstraints.NORTH, GridBagConstraints.HORIZONTAL, 0, 0, SEPARATED_COMPONENT_SPACE, 0); Index: FrameworkInitializer.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/FrameworkInitializer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- FrameworkInitializer.java 2 Jul 2007 18:49:18 -0000 1.3 +++ FrameworkInitializer.java 26 Jul 2007 15:53:02 -0000 1.4 @@ -264,7 +264,7 @@ ResourceSet themeResource = new ResourceSet("com.netscape.management.client.theme.theme"); aboutDialog = new AboutDialog(parent, themeResource.getString("defaultAbout", - "dialogTitle") + " " + VersionInfo.getVersionNumber()); + "dialogTitle")); aboutDialog.setProduct( new RemoteImage( themeResource.getString("defaultAbout", "productLogo")), Index: default.properties =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/default.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- default.properties 29 Jun 2007 20:32:27 -0000 1.7 +++ default.properties 26 Jul 2007 15:53:02 -0000 1.8 @@ -90,6 +90,7 @@ dialog-closetext=There are unsaved changes. Would you like to close? aboutDialog-dialogTitlePrefix=About +aboutDialog-dialogFrameworkPrefix=Using Console Framework permTab-title=UI Permissions permTab-accessButton=&Permissions...

1 0

[Fedora-directory-commits] coolkey/src/coolkey slot.cpp,1.7,1.8
by Doctor Conrad 26 Jul '07

26 Jul '07

Author: rrelyea Update of /cvs/dirsec/coolkey/src/coolkey In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21854 Modified Files: slot.cpp Log Message: Don't filter based on ATR at all. Let the application deal with which cards it wants to work with Index: slot.cpp =================================================================== RCS file: /cvs/dirsec/coolkey/src/coolkey/slot.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- slot.cpp 16 Feb 2007 21:16:11 -0000 1.7 +++ slot.cpp 25 Jul 2007 23:49:56 -0000 1.8 @@ -564,15 +564,10 @@ state = CARD_PRESENT; } - if ( CKYBuffer_DataIsEqual(&cardATR, ATR, sizeof (ATR)) || - CKYBuffer_DataIsEqual(&cardATR, ATR1, sizeof(ATR1)) || - CKYBuffer_DataIsEqual(&cardATR, ATR2, sizeof(ATR2)) ) { - - if (Params::hasParam("noAppletOK")) - { - state |= APPLET_SELECTABLE; - mCoolkey = 1; - } + if (Params::hasParam("noAppletOK")) + { + state |= APPLET_SELECTABLE; + mCoolkey = 1; } /* support CAC card. identify the card based on applets, not the ATRS */

1 0

[Fedora-directory-commits] esc/win32 build.sh,1.1,1.2
by Doctor Conrad 26 Jul '07

26 Jul '07

Author: jmagne Update of /cvs/dirsec/esc/win32 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18494 Modified Files: build.sh Log Message: Cleanup. Index: build.sh =================================================================== RCS file: /cvs/dirsec/esc/win32/build.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.sh 25 Jul 2007 20:13:02 -0000 1.1 +++ build.sh 25 Jul 2007 23:12:15 -0000 1.2 @@ -274,12 +274,12 @@ return 0 fi -# if [ -d esc ]; -# then -# cvs -d $FEDORA_CVS_ROOT update esc -# else -# cvs -d $FEDORA_CVS_ROOT co esc -# fi + if [ -d esc ]; + then + cvs -d $FEDORA_CVS_ROOT update esc + else + cvs -d $FEDORA_CVS_ROOT co esc + fi if [ $? != 0 ]; then

1 0

[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSDialogs.pm, 1.3, 1.4
by Doctor Conrad 26 Jul '07

26 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6014 Modified Files: DSDialogs.pm Log Message: Resolves: bug 249633 Description: setup-ds.pl should create default org entries Fix Description: Make the default in interactive mode to be to add those entries. Index: DSDialogs.pm =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSDialogs.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- DSDialogs.pm 12 Jul 2007 13:52:42 -0000 1.3 +++ DSDialogs.pm 25 Jul 2007 22:05:26 -0000 1.4 @@ -220,7 +220,8 @@ my $self = shift; my $val = $self->{manager}->{inf}->{slapd}->{InstallLdifFile}; if (!defined($val)) { - $val = 'none'; + $val = 'suggest'; + $self->{manager}->{inf}->{slapd}->{AddOrgEntries} = 'Yes'; } return $val; },

1 0

[Fedora-directory-commits] esc/src/lib/coolkey CoolKey.cpp, 1.7, 1.8 CoolKey.h, 1.6, 1.7 NSSManager.cpp, 1.4, 1.5 NSSManager.h, 1.3, 1.4
by Doctor Conrad 26 Jul '07

26 Jul '07

Author: jmagne Update of /cvs/dirsec/esc/src/lib/coolkey In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18328 Modified Files: CoolKey.cpp CoolKey.h NSSManager.cpp NSSManager.h Log Message: Minor fix to diagnostics logging. Index: CoolKey.cpp =================================================================== RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- CoolKey.cpp 7 Jun 2007 21:21:17 -0000 1.7 +++ CoolKey.cpp 25 Jul 2007 20:43:22 -0000 1.8 @@ -1325,7 +1325,10 @@ return E_FAIL; if(g_Log->IsInitialized()) + { + CoolKeyLogNSSStatus(); return S_OK; + } else return E_FAIL; } @@ -1348,6 +1351,35 @@ return S_OK; } +COOLKEY_API HRESULT CoolKeyLogNSSStatus() +{ + + char tBuff[56]; + if (g_NSSManager) + { + unsigned int error = g_NSSManager->GetLastInitError(); + + if(error == NSS_NO_ERROR) + { + CoolKeyLogMsg( PR_LOG_ALWAYS, "%s NSS system intialized successfully!\n",GetTStamp(tBuff,56)); + return S_OK; + } + + if(error == NSS_ERROR_LOAD_COOLKEY) + { + CoolKeyLogMsg( PR_LOG_ERROR, "%s Failed to load CoolKey module! Keys will not be recognized!\n",GetTStamp(tBuff,56)); + } + + if(error == NSS_ERROR_SMART_CARD_THREAD) + { + CoolKeyLogMsg( PR_LOG_ERROR, "%s Problem initializing the Smart Card thread! Keys will not be recognized!\n",GetTStamp(tBuff,56)); + } + } + + return S_OK; + +} + //Utility function to get Time Stamp char *GetTStamp(char *aTime,int aSize) { Index: CoolKey.h =================================================================== RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- CoolKey.h 7 Jun 2007 21:21:17 -0000 1.6 +++ CoolKey.h 25 Jul 2007 20:43:22 -0000 1.7 @@ -180,6 +180,7 @@ COOLKEY_API HRESULT CoolKeyLogMsg(int logLevel, const char *fmt, ...); +COOLKEY_API HRESULT CoolKeyLogNSSStatus(); //Utility time function char *GetTStamp(char *aTime,int aSize); Index: NSSManager.cpp =================================================================== RCS file: /cvs/dirsec/esc/src/lib/coolkey/NSSManager.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- NSSManager.cpp 7 May 2007 23:51:46 -0000 1.4 +++ NSSManager.cpp 25 Jul 2007 20:43:22 -0000 1.5 @@ -46,11 +46,13 @@ static PRLogModuleInfo *coolKeyLogNSS = PR_NewLogModule("coolKeyNSS"); +unsigned int NSSManager::lastError; NSSManager::NSSManager() { char tBuff[56]; PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::NSSManager:\n",GetTStamp(tBuff,56))); mpSCMonitoringThread = NULL; + NSSManager::lastError = NSS_NO_ERROR; #ifdef LINUX systemCertDB = NULL; #endif @@ -111,6 +113,8 @@ if(!userModule || !userModule->loaded) { PR_LOG( coolKeyLogNSS, PR_LOG_ALWAYS, ("%s NSSManager::InitNSS problem loading PKCS11 module. No keys will be recognized!\n",GetTStamp(tBuff,56))); + + NSSManager::lastError = NSS_ERROR_LOAD_COOLKEY; return E_FAIL; } @@ -132,6 +136,7 @@ mpSCMonitoringThread = new SmartCardMonitoringThread(userModule); if (!mpSCMonitoringThread) { SECMOD_UnloadUserModule(userModule); + NSSManager::lastError = NSS_ERROR_SMART_CARD_THREAD; return E_FAIL; } mpSCMonitoringThread->Start(); Index: NSSManager.h =================================================================== RCS file: /cvs/dirsec/esc/src/lib/coolkey/NSSManager.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- NSSManager.h 7 May 2007 23:51:46 -0000 1.3 +++ NSSManager.h 25 Jul 2007 20:43:22 -0000 1.4 @@ -26,6 +26,10 @@ #define PROMISCUOUS_PARAMETER "noAppletOK=yes" #define NSS_PUBLIC_CERTS "slotFlags=PublicCerts" +#define NSS_NO_ERROR 0 +#define NSS_ERROR_LOAD_COOLKEY 1 +#define NSS_ERROR_SMART_CARD_THREAD 2 + #ifndef NSSMANAGER_H #define NSSMANAGER_H @@ -70,11 +74,14 @@ static HRESULT GetKeyIssuer(const CoolKey *aKey, char *aBuf, int aBufLength); + static unsigned int GetLastInitError() { return lastError;} private: static bool IsCACert(CERTCertificate *cert); + static unsigned int lastError; + #ifdef LINUX PK11SlotInfo *systemCertDB; #endif

1 0

[Fedora-directory-commits] esc/src Makefile,1.3,1.4
by Doctor Conrad 26 Jul '07

26 Jul '07

Author: jmagne Update of /cvs/dirsec/esc/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15693 Modified Files: Makefile Log Message: Build "eginstall" on Windows. Index: Makefile =================================================================== RCS file: /cvs/dirsec/esc/src/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 27 Sep 2006 17:50:24 -0000 1.3 +++ Makefile 25 Jul 2007 20:16:01 -0000 1.4 @@ -23,11 +23,11 @@ ifeq ($(OS_ARCH), WINNT) -DIRS += xulrunner app/xpcom/tray app/xpcom win32 +DIRS += xulrunner app/eginstall app/xpcom/tray app/xpcom endif ifeq ($(OS_ARCH), Darwin) -DIRS += xulrunner app/xpcom/tray app/xpcom mac +DIRS += xulrunner app/xpcom/tray app/xpcom endif ifeq ($(OS_ARCH), Linux)

1 0

[Fedora-directory-commits] esc/src/app/eginstall Makefile, NONE, 1.1 eginstall.c, NONE, 1.1 instlib.c, NONE, 1.1 instlib.h, NONE, 1.1
by Doctor Conrad 26 Jul '07

26 Jul '07

Author: jmagne Update of /cvs/dirsec/esc/src/app/eginstall In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15643 Added Files: Makefile eginstall.c instlib.c instlib.h Log Message: Initial revision. --- NEW FILE Makefile --- #! gmake # # BEGIN COPYRIGHT BLOCK # 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; version 2 of the License. # # 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., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK CORE_DEPTH = ../../.. include $(CORE_DEPTH)/coreconf/config.mk DIST = $(CORE_DEPTH)/dist/$(OBJDIR_NAME) ifeq ($(OS_ARCH), WINNT) WINNT = 1 endif ifeq ($(OS_ARCH), Darwin) MACOS = 1 endif ifndef BUILD_OPT ifdef WINNT CFLAGS = -Z7 else CFLAGS = -g endif CFLAGS += -DDEBUG endif ifdef WINNT LIBS = \ version.lib \ Setupapi.lib \ Advapi32.lib \ $(NULL) all: $(OBJDIR_NAME)/eginstall.exe import: @echo "Nothing to Import" clean: rm -f $(OBJDIR_NAME)/eginstall.exe $(OBJDIR_NAME)/eginstall.obj libs: $(OBJDIR_NAME)/eginstall.exe install: mkdir -p $(DIST)/coolkey_drivers/egate/ cp $(OBJDIR_NAME)/eginstall.exe $(DIST)/coolkey_drivers/egate/ $(OBJDIR_NAME)/eginstall.exe: $(OBJDIR_NAME)/eginstall.obj mkdir -p $(OBJDIR_NAME) cl $(CFLAGS) -o $(OBJDIR_NAME)/eginstall.exe $(OBJDIR_NAME)/eginstall.obj $(LIBS) # /link /subsystem:WINDOWS editbin /subsystem:WINDOWS $(OBJDIR_NAME)/eginstall.exe $(OBJDIR_NAME)/eginstall.obj: eginstall.c mkdir -p $(OBJDIR_NAME) cl -c -Fo$@ -DWINDOWS $(CFLAGS) eginstall.c else # MAC & Linux PC/SC-lite installer ifdef MACOS LIBS += -framework Security -framework Carbon CFLAGS += -DMAC RESTART = $(OBJDIR_NAME)/pcscd_restart endif COMMON_OBJS=$(OBJDIR_NAME)/instlib.o all: $(OBJDIR_NAME)/eginstall $(RESTART) import: @echo "Nothing to Import" clean: rm -f $(OBJDIR_NAME)/eginstall $(COMMON_OBJS) $(OBJDIR_NAME)/eginstall.o $(OBJDIR_NAME)/pcscd_restart.sh $(OBJDIR_NAME)/pcscd_restart $(OBJDIR_NAME)/pcscd_restart.o libs: $(OBJDIR_NAME)/eginstall $(RESTART) install: libs mkdir -p $(DIST)/coolkey_drivers/ cp $(OBJDIR_NAME)/eginstall $(DIST)/coolkey_drivers/ ifdef MACOS cp $(OBJDIR_NAME)/pcscd_restart $(DIST)/coolkey_drivers/ rm -f $(OBJDIR_NAME)/"COOL Key Install" ln $(OBJDIR_NAME)/eginstall $(OBJDIR_NAME)/"COOL Key Install" rm -f $(DIST)/coolkey_drivers/"COOL Key Install" ln $(DIST)/coolkey_drivers/eginstall $(DIST)/coolkey_drivers/"COOL Key Install" endif $(OBJDIR_NAME)/%.o: %.c mkdir -p $(OBJDIR_NAME) cc -c -o $@ $(CFLAGS) $< $(OBJDIR_NAME)/eginstall: $(OBJDIR_NAME)/eginstall.o $(COMMON_OBJS) mkdir -p $(OBJDIR_NAME) cc -o $(OBJDIR_NAME)/eginstall $< $(COMMON_OBJS) $(LIBS) $(OBJDIR_NAME)/pcscd_restart: $(OBJDIR_NAME)/pcscd_restart.o $(COMMON_OBJS) mkdir -p $(OBJDIR_NAME) cc -o $(OBJDIR_NAME)/pcscd_restart $< $(COMMON_OBJS) $(LIBS) $(OBJDIR_NAME)/pcscd_restart.sh: pcscd_restart.sh.$(OS_ARCH) cp $< $@ endif export: @echo "Nothing to Export" --- NEW FILE eginstall.c --- /* ***** BEGIN COPYRIGHT BLOCK ***** * * Copyright (C) 2005 Red Hat, Inc. * * All rights reserved. ** ** This library is free software; you can redistribute it and/or ** modify it under the terms of the GNU Lesser General Public ** License as published by the Free Software Foundation version ** 2.1 of the License. ** ** This library 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 ** Lesser General Public License for more details. ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software ** Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ** ***** END COPYRIGHT BLOCK *****/ #define LOGFILE "inst.log" #ifdef WIN32 #define INITGUID 1 #include <windows.h> #include <stdio.h> #include <setupapi.h> #include <direct.h> #include <time.h> #include <winver.h> #define DRIVER_COUNT 4 /* This structure defines that descriptor used for each egate driver. * the data described in the structure is static. */ typedef struct _driverInfo { char *devClass; /* microsoft device class */ char *infFile; /* original inf file escribing the device */ char *instFile; /* file in the installation */ char *deviceID; /* Typical Device ID */ DWORD createFlags; /* Flags for hand creating device */ BOOL devClassUnique; /* true only if class is unique for egate */ BOOL doInstall; /* this driver should be installed */ BOOL handInstall; } DriverInfo; /* dynamically determined driver information */ typedef struct _dyDriverInfo { char *oemFile; /* new OEM file */ char destPath[MAX_PATH]; } DyDriverInfo; static const DriverInfo driverInfo[DRIVER_COUNT] = { /* Egate PCSC device. Maps to a virtual reader. These are managed by The Egate bus driver. */ { "SmartCardReader", "egaterdr.inf", "egaterdr.sys", "EGATEBUS", 0, FALSE, TRUE, FALSE }, /* Driver handling the actual card driver. This one is managed by the plug and play handler. The first card is supposed to install the EgateBus handler */ { "EgateCard", "egate.inf", "egate.sys", "USB\\VID_0973&PID_0001", 0, TRUE, TRUE, FALSE }, /* Egatebus is the Reader Enumerator. It starts new readers as necessary. */ { "Egatebus", "egatebus.inf", "egatebus.sys", "EGATEBUS", DICD_GENERATE_ID, TRUE, TRUE, TRUE }, /* Unknown driver is necessary for uninstall. If an egate device was inserted before any egate drivers were installed, an Unknown device will have been created. We need to remove it before we start our install */ { "Unknown", "none.inf", "none.sys", "USB\\VID_0973&PID_0001", 0, FALSE, FALSE, FALSE }, }; static DyDriverInfo dyDriverInfo[DRIVER_COUNT] = { 0 }; #define FILE_COUNT 8 static const char *deviceFileList[FILE_COUNT] = { "drivers\\egate.sys", "drivers\\egateraw.sys", "egdrvins1.dll", "egdrvins.dll", "slbmqp98.dll", "slbmgpg.dll", "drivers\\egatebus.sys", "drivers\\egaterdr.sys", }; static char infFilePath[MAX_PATH]; static char logFilePath[MAX_PATH]; BOOL useOS = FALSE; typedef unsigned long TIME; void profile(FILE *logFile, BOOL doProfile, char *message, void *arg, TIME last, TIME *retCurrent) { static TIME epoc = 0; TIME current; if (!doProfile) { return; } current = GetTickCount(); if (epoc == 0) { epoc = current; } if (retCurrent) { *retCurrent = current; } if (!message) { return; } fprintf(logFile,"@TIME:"); fprintf(logFile, message, arg); fprintf(logFile," %d ms (%d ms total)\n", current - last, current - epoc); } #include <dbt.h> DEFINE_GUID(IDD_CLASS_EGATECARD,0x555e05a3,0x904c,0x42cf,0xae,0xf4, 0xee,0x40,0x35,0xec,0x63,0x62); DEFINE_GUID(IDD_CLASS_EGATERDR,0x50dd5230,0xba8a,0x11d1,0xbf,0x5d, 0x00,0x00,0xf8,0x05,0xf5,0x30); DEFINE_GUID(IDD_CLASS_EGATEBUS,0x9510ee5d,0x9613,0x439a,0xad,0xb9, 0xe4,0xde,0xa5,0xa6,0xb6,0x53); static void usage(char *prog) { fprintf(stderr,"usage: %s [-F][-q][-9][-u][-c][-p][-O][-l logfile] [egate_path]\n",prog); fprintf(stderr,"\tu uninstall\tc clean\n"); fprintf(stderr,"\tp profile\tO use slow OS calls\n"); fprintf(stderr,"\tq quiet\n"); fprintf(stderr,"\tF and 9 reserved for future use\n"); return; } /* Utility printing functions */ /* capture the window's error string */ static void winPerror(FILE *outFile, DWORD error, const char *msgString) { char buffer[256]; char *cp; DWORD ret; fprintf(outFile,"*** %s: ",msgString); sprintf(buffer,"Format message problem, error = %d (0x%x)\n", error, error); ret=FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, buffer, sizeof(buffer), NULL); for (cp=buffer; *cp; cp++) { if (*cp == '\r') *cp = ' '; } fprintf(outFile, buffer); } #ifdef DEBUG /* pretty raw dump a buffer in hex and ascii */ #define MAX_ROWS 16 void dump(FILE *logFile, void *p, int len) { unsigned char *c = (char *)p; char string[MAX_ROWS+1]; int i,j; fprintf(logFile,"Dumping buffer %x size=%d\n",p,len); for (i=0, j=0; i< len ; i++,j++) { if (j >= MAX_ROWS) { string[MAX_ROWS] = 0; fprintf(logFile," %s\n",string); j=0; } fprintf(logFile,"%02x ",c[i]); string[j] = (char) (c[i] >= ' ' && c[i] <0x7f) ? c[i] : '.' ; } if (j && j < MAX_ROWS) { string[j]= 0; for (; j < MAX_ROWS; j++) { fprintf(logFile," "); } fprintf(logFile," %s\n",string); } } /* dump an InfInformation buffer */ void printInf(FILE *logFile, const PSP_INF_INFORMATION sp_inf, DWORD len) { char *style = NULL; switch (sp_inf->InfStyle) { [...2099 lines suppressed...] Copy("/etc/reader.conf","/etc/_reader.conf", 0644); } } else { (void)RmFile("/etc/_reader.conf"); } sprintf(buf,"%s/slbEGate.bundle",path); install_path = strdup(buf); if (egate_path) { unsigned long current_version, install_version; current_version = GetBundleVersion(egate_path); install_version = GetBundleVersion(install_path); if (current_version <= install_version) { RmFile("/etc/reader.conf"); syslog(LOG_INFO,"Replacing version %d with version %d of %s\n", current_version, install_version, "slbEGate.bundle"); } else { syslog(LOG_INFO, "Newer version of E-Gate already installed" "(oldversion = %d, newversion = %d)\n", current_version, install_version); skip_reader_conf = 1; } free(egate_path); } if (!skip_reader_conf) { /* * we use _reader.conf so that we don't wind up with a partially * updated file that we can't later recover from. */ if(!IsTiger) { int readerfd; readerfd = open("/etc/_reader.conf", O_CREAT|O_APPEND|O_WRONLY, 0644); if (readerfd < 0) { syslog(LOG_ERR, "Couldn't open /etc/_reader.conf for update err=%d (%s)\n", errno, strerror(errno)); return RDRCNF_ERR(errno); } rc = write(readerfd, readerConf, sizeof(readerConf)-1); if (rc < 0) { syslog(LOG_ERR, "Write Failure on /etc/_reader.conf err=%d (%s) fd=%d\n", errno, strerror(errno), readerfd); return RDRCNF_ERR(errno); } else if (rc < sizeof(readerConf)-1) { syslog(LOG_ERR,"only wrote %d bytes to /etc/_reader.conf\n", rc); return RDRCNF_ERR(errno); } close(readerfd); } #ifdef MAC // Install in same place whether Panther or Tiger rc = Cpdir(install_path,TigerLibPath); #else rc = Cpdir(install_path,"/etc/reader/slbEGate.bundle"); #endif if (rc < 0) { syslog(LOG_ERR, "Failed to copy egate driver %s" " to slbEGate.bundle err=%d (%s)\n", install_path, errno, strerror(errno)); return RDRCNF_ERR(errno); } if(!IsTiger) { (void)RmFile("/etc/reader.conf"); rc = rename("/etc/_reader.conf","/etc/reader.conf"); if (rc < 0) { syslog(LOG_ERR, "Failed to rename /etc/_reader.conf" " to /etc/reader.conf err=%d\n", errno, strerror(errno)); return RDRCNF_ERR(errno); } } syslog(LOG_INFO, "Installed egate. "); } pid = FindProcessByName("pcscd"); /* If nothing to install, don't restart pcscd */ if (skip_reader_conf && pid != -1) { syslog(LOG_INFO, "Nothing new to install, pcscd running: skip restarting pcscd\n"); return return_code; } if (pid != -1) { syslog(LOG_INFO,"Killing PCSCD process id %d\n", pid); kill( pid, SIGTERM ); /* wait 10 seconds for the process to die */ rc = WaitForProcessDeath(pid,10); if (rc == PROCESS_ALIVE) { kill(pid, SIGKILL); rc = WaitForProcessDeath(pid,10); } if (rc != PROCESS_DEAD) { syslog(LOG_ERR,"PCSCD still running!!!"); return RESTART_ERR(errno); } } if (FileExists("/tmp/pcsc")) { /* clean up old pcsc files */ syslog(LOG_INFO,"Cleaning up Old PCSC Files\n"); rc = RmDir("/tmp/pcsc"); if (rc != 0) { syslog(LOG_ERR,"Failed to clean up /tmp/pcsc\n"); return_code = CLEANUP_ERR(errno); } } /* now start pcscd */ #ifdef MAC if(!IsTiger) { rc = system("/usr/sbin/pcscd"); } else { rc = 0; syslog(LOG_INFO,"Tiger 10.4.2 and later, does not start /usr/sbin/pcscd \n"); } #else rc = system("/usr/local/sbin/pcscd"); #endif if (rc < 0) { syslog(LOG_ERR,"Could't restart PCSCD err=%d (%s)\n", errno, strerror(errno)); return_code = EXEC_ERR(errno); } #ifdef MAC /* TODO this needs to be done for linux */ /* copy the restart command to /usr/sbin */ sprintf(buf,"%s/pcscd_restart",path); /* do we need to verify a hash to make sure we are installing * the correct pcscd_restart program? */ /* copy restart to /usr/sbin. We do this because once we install it, * it cannot be removed unless the user becomes root. This allows the * user to move around the photon installation without loosing the * restart program. */ rc = Copy(buf,"/usr/sbin/pcscd_restart",0755); if (rc < 0) { /* not fatal.. */ syslog(LOG_INFO,"Couldn't copy pcscd_restart to /usr/sbin err=%d\n", errno); } else { rc = Setuid("/usr/sbin/pcscd_restart"); if (rc < 0) { /* not fatal... */ syslog(LOG_INFO,"Couldn't setuid on pcscd_restart err=%d\n", errno); } } /* make sure the restart code works */ if(!isTigerDotTwo) { rc = SetupSystemBoot(); if (rc < 0) { /* not fatal.. */ syslog(LOG_INFO,"Couldn't setup restart on boot err=%d\n",errno); } } else { syslog(LOG_INFO,"Tiger 10.4.2 and later, don't do SetupSystemBoot to setup restart on boot.\n"); rc = RemoveSystemBoot(); if( rc < 0) { syslog(LOG_INFO,"Couldn't remove restart on boot err=%d\n",errno); } } #endif syslog(LOG_INFO,"Installation complete. return_code=%d\n",return_code); return return_code; } #endif --- NEW FILE instlib.c --- /* ***** BEGIN COPYRIGHT BLOCK ***** ** * Copyright (C) 2005 Red Hat, Inc. ** * All rights reserved. *** *** This library is free software; you can redistribute it and/or *** modify it under the terms of the GNU Lesser General Public *** License as published by the Free Software Foundation version *** 2.1 of the License. *** *** This library 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 *** Lesser General Public License for more details. *** *** You should have received a copy of the GNU Lesser General Public *** License along with this library; if not, write to the Free Software *** Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *** ***** END COPYRIGHT BLOCK *****/ /* MAC & Linux */ #ifndef WIN32 #include <sys/types.h> #include <sys/stat.h> #include <sys/param.h> #include <stdlib.h> #include <stdio.h> #include <signal.h> #include <fcntl.h> #include <errno.h> #include <string.h> #include <unistd.h> #include <syslog.h> #include <fts.h> #include <sys/sysctl.h> #include "instlib.h" #define LOWER(c) (isalpha(c) ? tolower(c) : c) int HasString(const char *target,const char *search) { char c = LOWER(*search); int len = strlen(search); for ( ; *target; target++) { if (LOWER(*target) == c) { if (strncasecmp(target,search,len) == 0) { return 1; } } } return 0; } int IsDirectory(const char *dir) { struct stat sbuf; int rc; rc = stat(dir,&sbuf); if (rc == 0) { return ((sbuf.st_mode & S_IFDIR) == S_IFDIR); } return 0; } int FileExists(const char *file) { struct stat sbuf; int rc; rc = stat(file,&sbuf); if (rc == 0) { return 1; } return 0; } #define MAX_RECURSE_LEVEL 15 #define DIR_MODE 0755 /* * Create a directory. Create any missing or broken * components we need along the way. If we already have a * directory, return success. */ int Makedir(const char *directory, int level, int mode) { int rc; char *buf, *cp; /* prevent arbitrary stack overflow */ if (level > MAX_RECURSE_LEVEL) { errno = ENAMETOOLONG; return -1; } umask(0); /* just try it first */ rc = mkdir(directory,DIR_MODE); if (rc != 0) { if (errno == EEXIST) { if (IsDirectory(directory)) { /* we have a directory, use it */ return 0; } else { /* must be a file */ /* remove the file and try again */ rc = RmFile(directory); if (rc == 0) { rc = mkdir(directory, mode); } return rc; } } /* if we fail because on of the subdirectory entries was a * file, or one of the subdirectory entries didn't exist, * move back one component and try the whole thing again */ if ((errno != ENOENT) && (errno != ENOTDIR)) { return rc; } buf = (char *)malloc(strlen(directory)+1); strcpy(buf,directory); if (cp = strrchr(buf,'/')) { *cp = 0; rc = Makedir(buf,level+1, mode); if (rc == 0) { rc = mkdir(directory, mode); } } free(buf); } return rc; } #define INFO_FILE "/Contents/Info.plist" #define MAX_VERSION_TYPES 3 /* try to find the version number. NOTE: this is not a full xml parser. A full * xml parser would be a bit better to use */ unsigned long GetBundleVersion(const char *bundle) { #ifdef xMAC CFBundleRef bundle; CURLRef url; unsigned long version; url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, bundle, kCFURLPOSIXPathStyle, true ); if (!url) { return 0; } bundle = CFBundleCreate(kCFAllocatorDefault, url); CFRelease(url); if (!bundle) { return 0; } version = (unsigned long) CFBundleGetVersionNumber(bundle); CFRelease(bundle); return version; #else FILE *infoFile; char *bundleFile; char *str; char buf[256]; int versions[MAX_VERSION_TYPES]; int i, currentType; unsigned long version; bundleFile = (char *)malloc(strlen(bundle) + strlen(INFO_FILE)+1); if (bundleFile == NULL) { return 0; } sprintf(bundleFile,"%s"INFO_FILE,bundle); infoFile = fopen(bundleFile,"r"); free(bundleFile); if (infoFile == NULL) { return 0; } while ((str=fgets(buf, sizeof(buf),infoFile)) != NULL) { if (HasString(str,"CFBundleVersion")) { str=fgets(buf, sizeof(buf),infoFile); break; } } fclose(infoFile); if (str == NULL) { return 0; } while (*str && !isdigit(*str)) { str++; } if (*str == 0) { return 0; } for (i=0; i < MAX_VERSION_TYPES; i++) { versions[i] = 0; } currentType = 0; for (; currentType < MAX_VERSION_TYPES && *str && (isdigit(*str) || *str == '.'); str++) { if (*str == '.') { currentType++; if (currentType >= MAX_VERSION_TYPES) { break; } continue; } /* only record up to 2 digits for minor versions */ if ((currentType != 0) && (versions[currentType] >= 10)) { versions[currentType] = 99; continue; } versions[currentType] = versions[currentType] * 10 + (*str) - '0'; } /* now assemble the decoded version number */ version = 0; for (i=0; i < MAX_VERSION_TYPES; i++) { version = version * 100 + versions[i]; } return version; #endif } #define BUFSIZE 32*1024 int Copy(const char *src, const char *target, int mode) { int fdsrc,fdtarget; int bytes,wbytes,rc = 0; char buf[BUFSIZE]; fdsrc = open(src,O_RDONLY); if (fdsrc < 0) { return fdsrc; } fdtarget = open(target, O_WRONLY|O_CREAT|O_TRUNC, mode); if (fdtarget < 0) { close(fdsrc); return fdtarget; } while ((bytes = read(fdsrc,buf,sizeof(buf))) > 0) { wbytes = write(fdtarget,buf, bytes); if (wbytes != bytes) { rc = -1; break; } } if (bytes < 0) { rc = bytes; } close(fdtarget); close(fdsrc); return rc; } int Cpdir(const char *source,const char *target) { FTS *dir; FTSENT *entry; int rc = 0; char buf[MAXPATHLEN]; char *files[2]; int mode; int cdir; files[0]="."; files[1]= 0; cdir = open(".",O_RDONLY); rc = chdir(source); if (rc != 0) { close(cdir); return rc; } rc = Makedir(target, 0, DIR_MODE); if (rc != 0) { return rc; } dir = fts_open(files,FTS_NOCHDIR|FTS_LOGICAL,NULL); if (dir == NULL) { return -1; } while (entry = fts_read(dir)) { sprintf(buf,"%s/%s",target,entry->fts_accpath); mode = DIR_MODE; if (entry->fts_statp) { mode = entry->fts_statp->st_mode; } switch (entry->fts_info) { case FTS_D: /* need more .... */ rc = Makedir(buf, 0, mode); break; case FTS_F: rc = Copy(entry->fts_path, buf, mode); break; } if (rc != 0) break; } fchdir(cdir); close(cdir); fts_close(dir); return rc; } int RmFile(const char *fileName) { int rc = unlink(fileName); if ((rc < 0) && (errno == EPERM)) { chmod(fileName,0644); rc = unlink(fileName); } return rc; } int RmDir(const char *dirName) { int rc = 0; int count = 0; FTS *dir; FTSENT *entry; char *files[2]; files[0] = (char *) dirName; files[1] = 0; if (FileExists(dirName)) { if (IsDirectory(dirName)) { dir = fts_open(files,FTS_NOCHDIR|FTS_PHYSICAL,NULL); if (dir == NULL) { return -1; } while (entry = fts_read(dir)) { switch (entry->fts_info) { case FTS_DP: count++; rc = rmdir(entry->fts_path); break; case FTS_DEFAULT: case FTS_SL: case FTS_SLNONE: case FTS_NS: case FTS_NSOK: case FTS_F: rc = RmFile(entry->fts_path); break; } if (rc != 0) break; } fts_close(dir); if (count == 0) { rc = rmdir(dirName); } return rc; } else { return RmFile(dirName); } } return 0; } char * GetFullPath(const char *prog, int includeProg) { char *instDir, *end; char *cwd = NULL; char *new = NULL; /* get the install directory */ instDir = strdup(prog); if ((end = strrchr(instDir, '/')) == 0) { if (includeProg) { cwd = getcwd(NULL, 0); new = (char *)malloc(strlen(cwd)+strlen(instDir)+2); sprintf(new,"%s/%s",cwd,instDir); } else { new = getcwd(NULL,0); } } else { if (!includeProg) { *end = 0; } if (*instDir != '/') { cwd = getcwd(NULL,0); new = (char *)malloc(strlen(cwd)+strlen(instDir)+2); char *instPtr = instDir; /* handle . and .. prefixes */ if (*instDir == '.') { if ((instDir[1] = 0) || /* . only */ ((instDir[1] == '.') && /* .. & ../ */ ((instDir[2] == '/') || (instDir[2] == 0))) || (instDir[1] == '/') ) { /* ./ */ instPtr++; if (*instPtr == '.') { /* back up one element */ if ((end = strrchr(cwd,'/')) == 0) { *end = 0; } else { *cwd = 0; } instPtr++; } if (*instPtr == '/') { instPtr ++; } } } sprintf(new,"%s/%s",cwd,instPtr); } } if (cwd) { free(cwd); } if (new) { free(instDir); instDir = new; } return instDir; } #ifdef MAC typedef struct kinfo_proc kinfo_proc; static const int listProc[] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL, 0 }; static const int listProcLen=(sizeof(listProc)/sizeof(int)) -1; #endif /* * find the PCSCD process */ #define MAX_RETRIES 100 int FindProcessByName(const char *procName) { #ifdef MAC int ret; kinfo_proc * pList; size_t length; int processCount; int proc; int i; int pid = -1; /* * the process table is always changing. we may need to loop several times * before we actually get the process list. We start with a large static * buffer hoping that we don't have to actually allocate anything in the * normal case */ pList = NULL; length = 0; /* don't hang forever */ for (i=0; i< MAX_RETRIES; i++) { length = 0; ret = sysctl( (int *) listProc, listProcLen, NULL, &length, NULL, 0); if (ret < 0) { break; } pList = malloc(length); if (pList == NULL) { break; } ret = sysctl( (int *) listProc, listProcLen, pList, &length, NULL, 0); if (ret < 0) { if (errno == ENOMEM) { free(pList); pList = NULL; continue; } } break; } /* just couldn't get our process list */ if (pList == NULL) { perror("process list failed:"); return -1; } /* now loop through lookin for our process */ processCount = length / sizeof(kinfo_proc); for (proc=0; proc < processCount; proc++) { if (strcmp(pList[proc].kp_proc.p_comm,procName) == 0) { pid = pList[proc].kp_proc.p_pid; break; } } free(pList); return pid; #else return -1; #endif } int WaitForProcessDeath(int pid, int retries) { int rc; int i; /* loop for our retries until we can't send a signal to the process */ for (i=0; i < retries; i++) { rc = kill(pid, 0); if ( rc!= 0 ) { break; } sleep(1); } if (rc == 0) { /* process is still around past the retries */ return PROCESS_ALIVE; } if (errno == EPERM) { /* we don't even have permission to kill the process */ return PROCESS_IMPERVIOUS; } /* process has been killed */ return PROCESS_DEAD; } #ifndef O_EXLOCK #define O_EXLOCK 0 #endif int Setuid(const char *path) { /* NULL for now */ struct stat statbuf; int fd; int rc, mode; int ret = 0; fd = open(path, O_NONBLOCK|O_RDONLY|O_EXLOCK, 0); if (fd < 0) { return errno; } /* Get info about the file */ rc = fstat(fd, &statbuf); if (rc < 0) { close(fd); return errno; } /* make sure the file is owned by root */ if (statbuf.st_uid != 0) { rc = fchown(fd, 0, statbuf.st_gid); if (rc < 0) { close(fd); return errno; } } /* turn off group and other write permission so the * file can't be replaced */ mode = statbuf.st_mode & ~(S_IWGRP|S_IWOTH); rc = fchmod(fd, mode | S_ISUID); /* set the uid bit */ if (rc < 0) ret = errno; close(fd); return ret; } const char smartCardServices[] = { "#!/bin/sh\n" "\n" "##\n" "# Start PC/SC\n" "##\n" "\n" ". /etc/rc.common\n" "\n" " ConsoleMessage \"Starting SmartCard Services\"\n" " /usr/sbin/pcscd\n" "\n" }; /* SmartcardServices */ /* StartupParameters.plist */ const char startupParametersPList[] = { "{\n" " Description = \"PC/SC Daemon\";\n" " Provides = (\"SmartCardServices\");\n" " Requires = ();\n" " OrderPreference = \"None\";\n" " Messages =\n" " {\n" " start = \"Starting SmartCard Services\";\n" " stop = \"Stopping SmartCard Services\";\n" " };\n" "}\n" "\n" }; #define STARTUP_DIR "/System/Library/StartupItems" int RemoveSystemBoot() { int rc; if (IsDirectory(STARTUP_DIR"/SmartCardServices")) { /*Blow it away **/ rc = RmDir(STARTUP_DIR"/SmartCardServices"); if (rc < 0) { return -1; } } return rc; } int SetupSystemBoot() { int rc,fd; if (!IsDirectory(STARTUP_DIR"/SmartCardServices")) { /*check for errors and clean up so we don't have any partial installs*/ rc = Makedir(STARTUP_DIR"/SmartCardServices", 0, DIR_MODE); if (rc < 0) { return -1; } } if (!FileExists(STARTUP_DIR"/SmartCardServices/SmartcardServices")) { fd = open(STARTUP_DIR"/SmartCardServices/_SmartcardServices", O_CREAT|O_TRUNC|O_WRONLY); if (fd < 0) { return -1; } rc = write(fd,smartCardServices,sizeof(smartCardServices)-1); if (rc < 0) { return -1; } if (rc < sizeof(smartCardServices)-1) { return -1; errno = ENOSPC; return -1; } close(fd); rc = rename(STARTUP_DIR"/SmartCardServices/_SmartcardServices", STARTUP_DIR"/SmartCardServices/SmartcardServices"); if (rc < 0) { return -1; } } if (!FileExists(STARTUP_DIR"/SmartCardServices/StartupParameters.plist")) { fd = open(STARTUP_DIR"/SmartCardServices/_StartupParameters.plist", O_CREAT|O_TRUNC|O_WRONLY); if (fd < 0) { return -1; } rc = write(fd, startupParametersPList, sizeof(startupParametersPList)-1); if (rc < 0) { return -1; } if (rc < sizeof(startupParametersPList)-1) { errno = ENOSPC; return -1; } close(fd); rc = rename(STARTUP_DIR"/SmartCardServices/_StartupParameters.plist", STARTUP_DIR"/SmartCardServices/StartupParameters.plist"); if (rc < 0) { return -1; } } return 0; } #endif --- NEW FILE instlib.h --- /* ***** BEGIN COPYRIGHT BLOCK ***** *** * Copyright (C) 2005 Red Hat, Inc. *** * All rights reserved. *** *** This library is free software; you can redistribute it and/or *** modify it under the terms of the GNU Lesser General Public *** License as published by the Free Software Foundation version *** 2.1 of the License. *** *** This library 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 *** Lesser General Public License for more details. *** *** You should have received a copy of the GNU Lesser General Public *** License along with this library; if not, write to the Free Software *** Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *** ***** END COPYRIGHT BLOCK *****/ #ifndef _INSTLILB_H_ #define _INSTLILB_H_ 1 /* macros for encoding function return codes to pass to the calling * process so it can present reasonable UI for when things go wrong */ #define MK_ERR(type,val) (((type)<<16)|((val)&0xffff)) #define _ABS(x) ((x) < 0 ? (x)*-1:(x)) #define _NORMALIZE(x,base,op) ((x) op (base) ? (x -(base)) : (x)) #define ARG_ERR(x) MK_ERR(0, x) /* 1, 2, 3 for x */ #define PID_ERR(x) MK_ERR(1, x) /* returned status */ #define AUTH_ERR(x) MK_ERR(2, _ABS(_NORMALIZE(x,-6000,<))) /* Mac auth */ #define RDRCNF_ERR(x) MK_ERR(3, x) /* errno */ #define EXEC_ERR(x) MK_ERR(4, x) /* errno */ #define RESTART_ERR(x) MK_ERR(5, x) /* errno */ #define CLEANUP_ERR(x) MK_ERR(6, x) /* errno */ #define BUFSIZE 32*1024 /* does the target string exist in search string. Case insensitive compare */ int HasString(const char *target,const char *search); /* is the given file a directory */ int IsDirectory(const char *dir); /* does the given file exist */ int FileExists(const char *file); /* Make a directory path. removes regular files found along the path, * recursively builds all the directories needed along the path * (like mkdir -p) */ int Makedir(const char *directory, int level, int mode); /* find the version number of a bundle */ unsigned long GetBundleVersion(const char *bundle); /* copy file src to file specified by target */ int Copy(const char *src, const char *target, int mode); /* copy a directory and all it's contents from source to target. * symbolic links are followed */ int Cpdir(const char *source,const char *target); /* Remove a File... force the removal with chown if necessary */ int RmFile(const char *file); /* Remove a directory and all it's contents */ int RmDir(const char *directory); /* expand the path name of a program name. if includeProg is true, the * path includes the program name, otherwise it's just the directory path * of the program */ char * GetFullPath(const char *prog, int includeProg); /* find a process id from it's name. if more than on, only the first one is * returned */ int FindProcessByName(const char *procName); #define PROCESS_ALIVE 1 #define PROCESS_IMPERVIOUS 2 #define PROCESS_DEAD 3 /* wait for a process to die */ int WaitForProcessDeath(int pid, int retries); /* set the permissions and UID bits on a file */ int Setuid(const char *path); /* setup pcscd to restart on system boot */ int SetupSystemBoot(void); #endif /* !_INSTLIB_H_ */

1 0

[Fedora-directory-commits] esc/src/app/eginstall - New directory
by Doctor Conrad 26 Jul '07

26 Jul '07

Author: jmagne Update of /cvs/dirsec/esc/src/app/eginstall In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15578/eginstall Log Message: Directory /cvs/dirsec/esc/src/app/eginstall added to the repository

1 0

[Fedora-directory-commits] esc Makefile,1.2,1.3
by Doctor Conrad 26 Jul '07

26 Jul '07

Author: jmagne Update of /cvs/dirsec/esc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15541 Modified Files: Makefile Log Message: Make sure dist OBJDIR is created. Index: Makefile =================================================================== RCS file: /cvs/dirsec/esc/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 13 Sep 2006 17:43:54 -0000 1.2 +++ Makefile 25 Jul 2007 20:14:17 -0000 1.3 @@ -22,3 +22,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk +ifeq ($(OS_ARCH), WINNT) +import:: + mkdir -p $(SOURCE_XP_DIR)/$(OBJDIR) +endif +

1 0

[Fedora-directory-commits] esc/win32 build.sh, NONE, 1.1 esc-image-large.bmp, NONE, 1.1 esc-license.txt, NONE, 1.1 info-after.txt, NONE, 1.1 info-before.txt, NONE, 1.1 setup.iss, NONE, 1.1
by Doctor Conrad 26 Jul '07

26 Jul '07

Author: jmagne Update of /cvs/dirsec/esc/win32 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15462 Added Files: build.sh esc-image-large.bmp esc-license.txt info-after.txt info-before.txt setup.iss Log Message: Initial revision. --- NEW FILE build.sh --- #!/bin/bash # Command line arg values # BEGIN COPYRIGHT BLOCK # 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; version 2 of the License. # # 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., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK ###### Supported enrivonment variables ############ ### MSVC_PATH - Path to the directory containing usual Microsoft dlls ### INNO_PATH - Path name of Inno installer executable ### CSP_PATH - Path to the directory containing the CSP if desired NUM_ARGS=0 ARG_COMMAND= # NSS values # NSS needed just to help coolkey build NSS_NAME=nss-3.11.4 NSS_ARCHIVE=$NSS_NAME-with-nspr-4.6.4 NSS_SOURCE_URL=https://ftp.mozilla.org/pub/mozilla.org/security/nss/release… #Inno installer values #INNO_PATH="C:/Program Files/Inno Setup 5/ISCC.exe" #Egate driver values EGATE_DRIVER_URL=http://www.reflexreaders.com/Support/Downloads EGATE_DRIVER_NAME=e-gate_W2k_XP_24.zip #Zlib values ZLIB_NAME=zlib ZLIB_DLL=zlib1 ZLIB_ARCHIVE=zlib123-dll ZLIB_BIN_URL=http://www.zlib.net #CoolKey values COOLKEY_NAME=coolkey COOLKEY_TAG=COOLKEY_1_1_0 #Fedora repo for CoolKey and ESC FEDORA_CVS_ROOT=:pserver:anonymous@cvs.fedora.redhat.com:/cvs/dirsec #Xulrunner values XULRUNNER_ARCHIVE_NAME=xulrunner-1.8.0.4-source.tar.bz2 XULRUNNER_SRC_URL=http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases… #Base Dirctory calc BASE_DIR=${PWD} #ESC values ESC_NAME=esc ESC_VERSION_NO=1.0.1-5 #Cygwin values ORIG_PATH=${PATH} CYGWIN_BIN_PATH=/cygdrive/c/cygwin/bin #Value for the location of Moz Tools needed to compile MOZ_TOOLS_BIN_PATH=/cygdrive/c/moztools/bin:/cygdrive/d/moztools/bin export PATH=${MOZ_TOOLS_BIN_PATH}:${ORIG_PATH} CORE_OBJ_DIR=`uname``uname -r`_OPT.OBJ export PATH=${ORIG_PATH} function buildNSS { echo "BUILDING NSS..." if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doNSS ]; then echo "Do not build NSS." return 0 fi cd $BASE_DIR wget --no-check-certificate $NSS_SOURCE_URL if [ ! -f ./$NSS_ARCHIVE.tar.gz ]; then echo "Can't download NSS" return 1 fi tar -xzvf $NSS_ARCHIVE.tar.gz if [ $? != 0 ]; then echo "Can't untar NSS." return 1 fi cd $NSS_NAME/mozilla/security/nss make BUILD_OPT=1 nss_build_all if [ $? != 0 ]; then echo "Can't make nss." return 1 fi return 0 } function buildCOOLKEY { echo "BUILDING COOLKEY..." cd $BASE_DIR if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doCoolKey ]; then echo "Do not build CoolKey" return 0 fi export PATH=$CYGWIN_BIN_PATH:${PATH} if [ -d coolkey ]; then cvs -d $FEDORA_CVS_ROOT update -r $COOLKEY_TAG coolkey else cvs -d $FEDORA_CVS_ROOT co -r $COOLKEY_TAG coolkey fi cd $COOLKEY_NAME autoconf-2.5x if [ $? != 0 ]; then echo "Coolkey autoconf failed.." export PATH=${ORIG_PATH} return 1 fi ZLIB_INC_PATH=${BASE_DIR}/zlib/include ZLIB_LIB_PATH=${BASE_DIR}/zlib/lib ZLIB_LIB_FLAGS=${BASE_DIR}/zlib/$ZLIB_DLL.dll ZLIB_INC_PATH=`cygpath -m $ZLIB_INC_PATH` ZLIB_LIB_PATH=`cygpath -m $ZLIB_LIB_PATH` ZLIB_LIB_FLAGS=`cygpath -m $ZLIB_LIB_FLAGS` NSS_CFLAGS_BASE_PATH=${BASE_DIR}/$NSS_NAME/mozilla/dist NSS_CFLAGS_BASE_PATH=`cygpath -m $NSS_CFLAGS_BASE_PATH` NSS_CFLAGS="-I$NSS_CFLAGS_BASE_PATH/public/nss -I$NSS_CFLAGS_BASE_PATH/$CORE_OBJ_DIR/include" NSS_LIBS="$NSS_CFLAGS_BASE_PATH/$CORE_OBJ_DIR/lib/softokn3.lib advapi32.lib shell32.lib" export ZLIB_LIB=$ZLIB_LIB_PATH export ZLIB_INCLUDE=$ZLIB_INC_PATH ./configure NSS_CFLAGS="$NSS_CFLAGS" NSS_LIBS="$NSS_LIBS" --enable-pk11install if [ $? != 0 ]; then echo "Coolkey configure failed...." export PATH=${ORIG_PATH} return 1 fi make LDFLAGS+="version.lib Setupapi.lib" if [ $? != 0 ]; then echo "Can't make coolkey." export PATH=${ORIG_PATH} return 1 fi cd $BASE_DIR # Grab coolkey and zlib cp -f coolkey/src/coolkey/.libs/libcoolkeypk11.dll BUILD/coolkeypk11.dll cp -f coolkey/src/libckyapplet/.libs/libckyapplet-1.dll BUILD cp -f zlib/$ZLIB_DLL.dll BUILD # Grab pk11install cp -f coolkey/src/install/pk11install.exe BUILD export PATH=${ORIG_PATH} return 0 } function obtainZLIB { echo "OBTAINING ZLIB..." cd $BASE_DIR if [ -d ./$ZLIB_NAME ]; then echo "ZLIB already done." return 0 fi mkdir -p $ZLIB_NAME cd $ZLIB_NAME wget $ZLIB_BIN_URL/$ZLIB_ARCHIVE.zip if [ $? != 0 ]; then echo "Can't obtain zlib bundle...." return 1 fi unzip $ZLIB_ARCHIVE.zip if [ $? != 0 ]; then echo "Can't unzip zlib bundle....." return 1 fi cp lib/zdll.lib ./$ZLIB_DLL.lib return 0 } function buildESC { echo "BUILDING ESC" cd $BASE_DIR if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doEsc ]; then echo "Do not build ESC." return 0 fi # if [ -d esc ]; # then # cvs -d $FEDORA_CVS_ROOT update esc # else # cvs -d $FEDORA_CVS_ROOT co esc # fi if [ $? != 0 ]; then echo "Can't check out ESC..." return 1 fi cd $ESC_NAME mkdir -p dist/src #mkdir -p dist/$CORE_OBJ_DIR cd dist/src if [ ! -d mozilla ]; then echo "Obtaining XULRUNNER src..." wget $XULRUNNER_SRC_URL tar -xjvf $XULRUNNER_ARCHIVE_NAME else echo "Already have XULRUNNER src..." fi ZLIB_INC_PATH=${BASE_DIR}/zlib/include ZLIB_INC_PATH=`cygpath -m $ZLIB_INC_PATH` CKY_INCLUDE_PATH=${BASE_DIR}/coolkey/src/libckyapplet CKY_INCLUDE_PATH=`cygpath -m $CKY_INCLUDE_PATH` cd ../.. make BUILD_OPT=1 import make BUILD_OPT=1 CKY_INCLUDE="-I$ZLIB_INC_PATH -I$CKY_INCLUDE_PATH" CKY_LIB_LDD=$CKY_INCLUDE_PATH/.libs ESC_VERSION=$ESC_VERSION_NO if [ $? != 0 ]; then echo "Can't make ESC." return 1 fi #take care of eginstall cd src/app/eginstall make BUILD_OPT=1 install cd ../../.. cp dist/WIN*/coolkey_drivers/egate/eginstall.exe ../BUILD/egate if [ $? != 0 ]; then echo "Can't copy egate installer!" return 1 fi # hoist the build into the installer staging area cd .. cp -rf esc/dist/WIN*/esc_build/ESC BUILD if [ $? != 0 ]; then echo "Can't copy ESC to BUILD directory." return 1 fi return 0 } function obtainCAPI { cd $BASE_DIR echo "OBTAINING the CAPI driver... CSP_PATH $CSP_PATH" if [ -z $CSP_PATH ]; then echo "No CSP path specified." echo "Set environ var: CSP_PATH if desired . " return 0 fi cp $CSP_PATH/* BUILD return 0 } function obtainEGATE { echo "OBTAINING EGINSTALL" cd $BASE_DIR if [ -d BUILD/egate ]; then echo "Egate already obtained!" return 0 fi wget $EGATE_DRIVER_URL/$EGATE_DRIVER_NAME if [ $? != 0 ]; then echo "Can't obtain egate driver!" return 1 fi mkdir -p BUILD/egate unzip $EGATE_DRIVER_NAME -d BUILD/egate return 0 } function initializeBUILD { cd $BASE_DIR echo "INITIALIZING BUILD..." mkdir -p BUILD if [ $? != 0 ]; then echo "Can't initilize ESC Build...." return 1 fi return 0 } function cleanupBUILD { cd $BASE_DIR echo "CLEANING up BUILD ..." rm -rf *.gz #rm -rf *.zip return 0 } function createINSTALLER { echo "CREATING INSTALLER..." cd $BASE_DIR if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doInstaller ]; then echo "Do not build the installer." return 0 fi if [ -z $MSVC_PATH ]; then echo "NO MSVC path specified!" echo "Set environ var: MSVC_PATH ." fi cp $MSVC_PATH/*.dll BUILD if [ $? != 0 ]; then echo "Cant copy over MSVC dlls." fi if [ -z "$INNO_PATH" ]; then echo "No Path to the INNO installer specified!" echo "Set environ var: INNO_PATH ." return 0 fi #Move over extra files we don't keep in the open source world cp esc-image-large.bmp BUILD/ESC/chrome/content/esc # Build the INNO executable installer "$INNO_PATH" setup.iss if [ $? != 0 ]; then echo "Can't build final ESC installer...." return 1 fi return 0 } function usage { echo "usage: ./build.sh [ -doEsc || -doCoolKey || -doNSS || -doInstaller ]" } function processARGS { if [ $NUM_ARGS -ne 1 ] ; then if [ $NUM_ARGS -ne 0 ]; then echo "Number of args must be 1 or 0 !" usage exit 1 fi fi if [ -z $THE_ARG ]; then return fi if [ $THE_ARG != -doEsc ] && [ $THE_ARG != -doCoolKey ] && [ $THE_ARG != -doNSS ] && [ $THE_ARG != -doInstaller ]; then echo "Incorrect arguments!" usage exit 1 fi } ########### Main program execution NUM_ARGS=$# echo "args $NUM_ARGS" THE_ARG=$1 processARGS initializeBUILD if [ $? != 0 ]; then exit 1 fi obtainCAPI if [ $? != 0 ]; then exit 1 fi obtainEGATE if [ $? != 0 ]; then exit 1 fi buildNSS if [ $? != 0 ]; then echo "Issue building NSS." fi obtainZLIB if [ $? != 0 ]; then exit 1 fi buildCOOLKEY if [ $? != 0 ]; then exit 1 fi buildESC if [ $? != 0 ]; then exit 1 fi createINSTALLER if [ $? != 0 ]; then exit 1 fi cleanupBUILD exit 0 --- NEW FILE esc-image-large.bmp --- BM`+ Dh��D@ �� dD@ D �� &D ��h� DH��D D@ D@ D@ F�� D@ D D@ D@ D D@ dDDN� H�� D D@ ��M� D D@ �dD��D D@ D D@ D@ D@ DJ��D D@ D@ Dh�� DJ��D D@ D@ D@ D@ ��D D@ D@ ��D D@ D��D D@ D@ D@ D@ D@ D@ D@ DF��dD��dD D@ L�DDn D@ DL�D D@ D@ �DDL� D@ D@ � D@ D@ D@ D D@ D@ D D@ D D@ D@ D@ D@ D@ D@ D D@ D@ ��D D@ D@ ��d D@ L�DF� F�� D@ ��DF� D@ �DDF� D@ �DDF� D@ �DDF� D@ �DDF� D@ �DDF� D@ �DDF� D@ �DDF� D D@ Dh��dD D@ �DDF� D@ �DDF� D@ �DDF� ��DJ D@ ��DJ D@ DN�D D@ D D@ D@ D D@ D@ ��LD DF��"D@ dDDj� D Dj��Dj�� D ��DH ��0D@ ��DH ��0D@ ��DH ��Dh��Dj��D ��DH Dj��DH��Dj�� 6D@ ��Dh� ��>D@ h�� drD@ ��rD@ �� fD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �tD@ �DHD�dD@ �DHD��D@ �DHD��D@ �DHD��D@ �D �D �D �D �D �D �D �D �D �D �D �D �D �D �D �D �D �D �f � � ^W^�� yPp --- NEW FILE esc-license.txt --- GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS --- NEW FILE info-after.txt --- Now that Smart Card Manager has been successfully installed, the program is currently running and ready to use. Place a supported smart card into the computer to begin using Smart Card Manager. --- NEW FILE info-before.txt --- This installation program will install the following: 1. Smart Card Manager. 2. Drivers for Smart Cards. 3. The PKCS #11 module needed for Smart Cards. --- NEW FILE setup.iss --- ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; BEGIN COPYRIGHT BLOCK ; 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; version 2 of the License. ; ; 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., 59 Temple ; Place, Suite 330, Boston, MA 02111-1307 USA. ; ; Copyright (C) 2005 Red Hat, Inc. ; All rights reserved. ; END COPYRIGHT BLOCK [Setup] AppName=Smart Card Manager AppMutex=ESCMutex AppVerName=Smart Card Manager 1.0.1-6 AppPublisher=Fedora CreateAppDir=true Compression=lzma SolidCompression=true MinVersion=0,5.0.2195 ShowLanguageDialog=yes OutputBaseFilename=SmartCardManagerSetup-1.0.1-6.win32.i386 DefaultDirName={pf}\Fedora\ESC DisableProgramGroupPage=false DefaultGroupName=Fedora SetupIconFile=BUILD\ESC\components\esc.ico UninstallDisplayIcon={app}\components\esc.ico ;WizardImageFile=BUILD\ESC\chrome\content\esc\esc-image-large.bmp WizardImageFile=esc-image-large.bmp WizardSmallImageFile=BUILD\ESC\components\esc.bmp AllowNoIcons=yes LicenseFile=esc-license.txt InfoBeforeFile=info-before.txt InfoAfterFile=info-after.txt PrivilegesRequired=admin VersionInfoVersion=1.0.1.4 [Files] Source: BUILD\egate\slbmgpg.dll; DestDir: {win}\egate2.4; Flags: uninsneveruninstall Source: BUILD\egate\egate.cat; DestDir: {win}\egate2.4; Flags: uninsneveruninstall Source: BUILD\egate\egate.inf; DestDir: {win}\egate2.4; Flags: uninsneveruninstall Source: BUILD\egate\egate.sys; DestDir: {win}\egate2.4; Flags: uninsneveruninstall Source: BUILD\egate\egate_License.txt; DestDir: {win}\egate2.4; Flags: uninsneveruninstall Source: BUILD\egate\egatebus.cat; DestDir: {win}\egate2.4; Flags: uninsneveruninstall Source: BUILD\egate\egatebus.inf; DestDir: {win}\egate2.4; Flags: uninsneveruninstall Source: BUILD\egate\egatebus.sys; DestDir: {win}\egate2.4; Flags: uninsneveruninstall Source: BUILD\egate\egaterdr.cat; DestDir: {win}\egate2.4; Flags: uninsneveruninstall Source: BUILD\egate\egaterdr.inf; DestDir: {win}\egate2.4; Flags: uninsneveruninstall Source: BUILD\egate\egaterdr.sys; DestDir: {win}\egate2.4; Flags: uninsneveruninstall Source: BUILD\egate\egdrvins1.dll; DestDir: {win}\egate2.4; Flags: uninsneveruninstall Source: BUILD\egate\eginstall.exe; DestDir: {win}\egate2.4; Flags: ignoreversion Source: BUILD\pk11install.exe; DestDir: {app}\PKCS11 ;Files related to CSP, comment out if not available Source: BUILD\clkcsp.dll; DestDir: {sys}; Flags: regserver restartreplace Source: BUILD\cspres.dll; DestDir: {sys}; Flags: restartreplace Source: BUILD\clkcsp.sig; DestDir: {sys} Source: BUILD\atl71.dll; DestDir: {sys}; Flags: uninsneveruninstall onlyifdoesntexist Source: BUILD\msvcr71.dll; DestDir: {sys}; Flags: uninsneveruninstall onlyifdoesntexist Source: BUILD\msvcp71.dll; DestDir: {sys}; Flags: uninsneveruninstall onlyifdoesntexist Source: BUILD\mfc71.dll; DestDir: {sys}; Flags: uninsneveruninstall onlyifdoesntexist ; NOTE: Don't use "Flags: ignoreversion" on any shared system files Source: BUILD\ESC\components\rhTray.xpt; DestDir: {app}\components Source: BUILD\ESC\components\rhCoolKey.xpt; DestDir: {app}\components Source: BUILD\ESC\components\rhICoolKey.xpt; DestDir: {app}\components Source: BUILD\ESC\components\rhIKeyNotify.xpt; DestDir: {app}\components Source: BUILD\ESC\components\rhITray.xpt; DestDir: {app}\components Source: BUILD\ESC\components\rhITrayWindNotify.xpt; DestDir: {app}\components Source: BUILD\ESC\components\rhTray.dll; DestDir: {app}\components Source: BUILD\ESC\components\esc.ico; DestDir: {app}\components Source: BUILD\ESC\components\rhCoolKey.dll; DestDir: {app}\components Source: BUILD\coolkeypk11.dll; DestDir: {sys}; Flags: restartreplace Source: BUILD\libckyapplet-1.dll; DestDir: {sys}; Flags: restartreplace Source: BUILD\zlib1.dll;DestDir: {sys}; Flags: restartreplace ;Source: BUILD\coolkeypk11.dll; DestDir: {app}\PKCS11 Source: BUILD\ESC\esc.exe; DestDir: {app} ;Source: BUILD\ESC\esc.bat; Destdir: {app} Source: BUILD\ESC\application.ini; DestDir: {app} Source: BUILD\ESC\chrome\chrome.manifest; DestDir: {app}\chrome Source: BUILD\ESC\chrome\content\esc\TRAY.js; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\CertInfo.js; DestDir: {app}\chrome\content\esc ;Source: BUILD\ESC\chrome\content\esc\certinfo.xul; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\config.xul; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\contents.rdf; DestDir: {app}\chrome\content\esc ;Source: BUILD\ESC\chrome\content\esc\EnrollPopupInclude.html; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\esc.css; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\ESC.js; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\esc.xul; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\security.xul; DestDir: {app}\chrome\content\esc ;Source: BUILD\ESC\chrome\content\esc\esc_browser.xul; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\GenericAuth.js; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\GenericAuth.xul; DestDir: {app}\chrome\content\esc ;Source: BUILD\ESC\chrome\content\esc\GenericAuthInclude.html; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\logo.gif; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\settings.xul; DestDir: {app}\chrome\content\esc ;Source: BUILD\ESC\chrome\content\esc\style.css; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\bg.jpg; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\xulrunner\chrome\toolkit.manifest; DestDir: {app}\xulrunner\chrome Source: BUILD\ESC\xulrunner\chrome\classic.jar; DestDir: {app}\xulrunner\chrome Source: BUILD\ESC\xulrunner\chrome\classic.manifest; DestDir: {app}\xulrunner\chrome Source: BUILD\ESC\xulrunner\chrome\comm.jar; DestDir: {app}\xulrunner\chrome Source: BUILD\ESC\xulrunner\chrome\comm.manifest; DestDir: {app}\xulrunner\chrome Source: BUILD\ESC\xulrunner\chrome\en-US.jar; DestDir: {app}\xulrunner\chrome Source: BUILD\ESC\xulrunner\chrome\en-US.manifest; DestDir: {app}\xulrunner\chrome Source: BUILD\ESC\xulrunner\chrome\pippki.jar; DestDir: {app}\xulrunner\chrome Source: BUILD\ESC\xulrunner\chrome\pippki.manifest; DestDir: {app}\xulrunner\chrome Source: BUILD\ESC\xulrunner\chrome\toolkit.jar; DestDir: {app}\xulrunner\chrome Source: BUILD\ESC\xulrunner\chrome\chromelist.txt; DestDir: {app}\xulrunner\chrome Source: BUILD\ESC\xulrunner\xulrunner-stub.exe; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\dependentlibs.list; DestDir: {app}\xulrunner ;Source: BUILD\ESC\xulrunner\GenerateJavaInterfaces.exe; DestDir: {app}\xulrunner ;Source: BUILD\ESC\xulrunner\javaxpcom.jar; DestDir: {app}\xulrunner ;Source: BUILD\ESC\xulrunner\javaxpcomglue.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\js3250.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\LICENSE; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\mozctl.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\mozctlx.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\nspr4.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\nspr4.dll; DestDir: {app}\PKCS11 Source: BUILD\ESC\xulrunner\nss3.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\nss3.dll; DestDir: {app}\PKCS11 Source: BUILD\ESC\xulrunner\nssckbi.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\plc4.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\plc4.dll; DestDir: {app}\PKCS11 Source: BUILD\ESC\xulrunner\plds4.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\plds4.dll; DestDir: {app}\PKCS11 Source: BUILD\ESC\xulrunner\README.txt; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\smime3.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\softokn3.chk; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\softokn3.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\softokn3.dll; DestDir: {app}\PKCS11 Source: BUILD\ESC\xulrunner\ssl3.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\updater.exe; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\xpcom.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\xpicleanup.exe; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\xul.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\xulrunner.exe; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\AccessibleMarshal.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\components\xulutil.dll; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\accessibility-msaa.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\alerts.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\appshell.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\appstartup.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\auth.dll; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\autocomplete.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\autoconfig.dll; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\autoconfig.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\caps.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\chardet.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\chrome.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\commandhandler.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\commandlines.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\composer.xpt; DestDir: {app}\xulrunner\components ;Source: BUILD\ESC\xulrunner\components\compreg.dat; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\content_base.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\content_html.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\content_htmldoc.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\content_xmldoc.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\content_xslt.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\content_xtf.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\directory.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\docshell_base.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\dom.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\dom_base.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\dom_canvas.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\dom_core.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\dom_css.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\dom_events.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\dom_html.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\dom_loadsave.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\dom_range.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\dom_stylesheets.xpt; DestDir: {app}\xulrunner\components ;Source: BUILD\ESC\xulrunner\components\dom_svg.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\dom_traversal.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\dom_views.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\dom_xbl.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\dom_xpath.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\dom_xul.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\downloads.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\editor.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\embed_base.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\extensions.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\exthandler.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\fastfind.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\find.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\gfx.xpt; DestDir: {app}\xulrunner\components ;Source: BUILD\ESC\xulrunner\components\gksvgrenderer.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\history.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\htmlparser.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\imgicon.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\imglib2.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\intl.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\intlcmpt.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\jar.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\jsconsole.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\jsconsole-clhandler.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\jsdservice.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\layout_base.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\layout_printing.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\layout_xul.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\layout_xul_tree.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\locale.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\lwbrk.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\mimetype.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\mozbrwsr.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\mozfind.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko_about.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko_cache.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko_cookie.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko_data.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko_dns.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko_file.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko_ftp.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko_http.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko_res.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko_socket.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko_strconv.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko_viewsource.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsCloseAllWindows.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsDefaultCLH.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsDictionary.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsExtensionManager.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsHelperAppDlg.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsInterfaceInfoToIDL.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsKillAll.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsPostUpdateWin.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsProgressDialog.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsProxyAutoConfig.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsResetPref.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsUpdateService.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsXmlRpcClient.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsXULAppInstall.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\oji.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\passwordmgr.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\pipboot.dll; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\pipboot.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\pipnss.dll; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\pipnss.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\pippki.dll; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\pippki.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\plugin.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\pref.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\prefetch.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\profile.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\progressDlg.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\proxyObject.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\rdf.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\satchel.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\shistory.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\toolkitprofile.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\transformiix.dll; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\txmgr.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\txtsvc.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\uconv.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\unicharutil.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\universalchardet.dll; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\update.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\uriloader.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\webBrowser_core.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\webbrowserpersist.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\webshell_idls.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\websrvcs.dll; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\websrvcs.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\widget.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\windowds.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\windowwatcher.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xmlextras.dll; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xmlextras.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xml-rpc.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xpcom_base.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xpcom_components.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xpcom_ds.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xpcom_io.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xpcom_obsolete.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xpcom_thread.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xpcom_xpti.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xpconnect.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xpinstall.xpt; DestDir: {app}\xulrunner\components ;Source: BUILD\ESC\xulrunner\components\xpti.dat; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xulapp.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xulapp_setup.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xuldoc.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xulrunner.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xultmpl.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\accessibility.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\defaults\autoconfig\prefcalls.js; DestDir: {app}\xulrunner\defaults\autoconfig Source: BUILD\ESC\xulrunner\defaults\autoconfig\platform.js; DestDir: {app}\xulrunner\defaults\autoconfig Source: BUILD\ESC\xulrunner\defaults\pref\xulrunner.js; DestDir: {app}\xulrunner\defaults\pref Source: BUILD\ESC\xulrunner\defaults\profile\chrome\userContent-example.css; DestDir: {app}\xulrunner\defaults\profile\chrome Source: BUILD\ESC\xulrunner\defaults\profile\chrome\userChrome-example.css; DestDir: {app}\xulrunner\defaults\profile\chrome Source: BUILD\ESC\xulrunner\defaults\profile\extensions\installed-extensions.txt; DestDir: {app}\xulrunner\defaults\profile\extensions Source: BUILD\ESC\xulrunner\defaults\profile\extensions\Extensions.rdf; DestDir: {app}\xulrunner\defaults\profile\extensions Source: BUILD\ESC\xulrunner\defaults\profile\US\localstore.rdf; DestDir: {app}\xulrunner\defaults\profile\US Source: BUILD\ESC\xulrunner\defaults\profile\US\chrome\userContent-example.css; DestDir: {app}\xulrunner\defaults\profile\US\chrome Source: BUILD\ESC\xulrunner\defaults\profile\US\chrome\userChrome-example.css; DestDir: {app}\xulrunner\defaults\profile\US\chrome Source: BUILD\ESC\xulrunner\greprefs\xpinstall.js; DestDir: {app}\xulrunner\greprefs Source: BUILD\ESC\xulrunner\greprefs\security-prefs.js; DestDir: {app}\xulrunner\greprefs Source: BUILD\ESC\xulrunner\greprefs\all.js; DestDir: {app}\xulrunner\greprefs Source: BUILD\ESC\xulrunner\plugins\npnul32.dll; DestDir: {app}\xulrunner\plugins Source: BUILD\ESC\xulrunner\res\dtd\xhtml11.dtd; DestDir: {app}\xulrunner\res\dtd Source: BUILD\ESC\xulrunner\res\dtd\mathml.dtd; DestDir: {app}\xulrunner\res\dtd Source: BUILD\ESC\xulrunner\res\entityTables\transliterate.properties; DestDir: {app}\xulrunner\res\entityTables Source: BUILD\ESC\xulrunner\res\entityTables\html40Special.properties; DestDir: {app}\xulrunner\res\entityTables Source: BUILD\ESC\xulrunner\res\entityTables\html40Symbols.properties; DestDir: {app}\xulrunner\res\entityTables Source: BUILD\ESC\xulrunner\res\entityTables\htmlEntityVersions.properties; DestDir: {app}\xulrunner\res\entityTables Source: BUILD\ESC\xulrunner\res\entityTables\mathml20.properties; DestDir: {app}\xulrunner\res\entityTables Source: BUILD\ESC\xulrunner\res\entityTables\html40Latin1.properties; DestDir: {app}\xulrunner\res\entityTables Source: BUILD\ESC\xulrunner\res\fonts\mathfontSymbol.properties; DestDir: {app}\xulrunner\res\fonts Source: BUILD\ESC\xulrunner\res\fonts\fontNameMap.properties; DestDir: {app}\xulrunner\res\fonts Source: BUILD\ESC\xulrunner\res\fonts\mathfont.properties; DestDir: {app}\xulrunner\res\fonts Source: BUILD\ESC\xulrunner\res\fonts\mathfontCMEX10.properties; DestDir: {app}\xulrunner\res\fonts Source: BUILD\ESC\xulrunner\res\fonts\mathfontCMSY10.properties; DestDir: {app}\xulrunner\res\fonts Source: BUILD\ESC\xulrunner\res\fonts\mathfontMath1.properties; DestDir: {app}\xulrunner\res\fonts Source: BUILD\ESC\xulrunner\res\fonts\mathfontMath2.properties; DestDir: {app}\xulrunner\res\fonts Source: BUILD\ESC\xulrunner\res\fonts\mathfontMath4.properties; DestDir: {app}\xulrunner\res\fonts Source: BUILD\ESC\xulrunner\res\fonts\mathfontMTExtra.properties; DestDir: {app}\xulrunner\res\fonts Source: BUILD\ESC\xulrunner\res\fonts\mathfontPUA.properties; DestDir: {app}\xulrunner\res\fonts Source: BUILD\ESC\xulrunner\res\fonts\fontEncoding.properties; DestDir: {app}\xulrunner\res\fonts Source: BUILD\ESC\xulrunner\res\html\gopher-unknown.gif; DestDir: {app}\xulrunner\res\html Source: BUILD\ESC\xulrunner\res\html\gopher-binary.gif; DestDir: {app}\xulrunner\res\html Source: BUILD\ESC\xulrunner\res\html\gopher-find.gif; DestDir: {app}\xulrunner\res\html Source: BUILD\ESC\xulrunner\res\html\gopher-image.gif; DestDir: {app}\xulrunner\res\html Source: BUILD\ESC\xulrunner\res\html\gopher-menu.gif; DestDir: {app}\xulrunner\res\html Source: BUILD\ESC\xulrunner\res\html\gopher-movie.gif; DestDir: {app}\xulrunner\res\html Source: BUILD\ESC\xulrunner\res\html\gopher-sound.gif; DestDir: {app}\xulrunner\res\html Source: BUILD\ESC\xulrunner\res\html\gopher-telnet.gif; DestDir: {app}\xulrunner\res\html Source: BUILD\ESC\xulrunner\res\html\gopher-text.gif; DestDir: {app}\xulrunner\res\html Source: BUILD\ESC\xulrunner\res\html\gopher-audio.gif; DestDir: {app}\xulrunner\res\html ;Source: BUILD\ESC\xulrunner\sdk\lib\MozillaInterfaces-src.jar; DestDir: {app}\xulrunner\sdk\lib ;Source: BUILD\ESC\xulrunner\sdk\lib\MozillaInterfaces.jar; DestDir: {app}\xulrunner\sdk\lib Source: BUILD\ESC\defaults\preferences\esc-prefs.js; DestDir: {app}\defaults\preferences Source: BUILD\ESC\xulrunner\res\wincharset.properties; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\arrowd.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\bloatcycle.html; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\broken-image.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\charsetalias.properties; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\charsetData.properties; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\cmessage.txt; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\EditorOverride.css; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\forms.css; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\grabber.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\hiddenWindow.html; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\html.css; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\langGroups.properties; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\language.properties; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\loading-image.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\mathml.css; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\quirk.css; DestDir: {app}\xulrunner\res ;Source: BUILD\ESC\xulrunner\res\svg.css; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\table-add-column-after.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\table-add-column-after-active.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\table-add-column-after-hover.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\table-add-column-before.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\table-add-column-before-active.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\table-add-column-before-hover.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\table-add-row-after.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\table-add-row-after-active.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\table-add-row-after-hover.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\table-add-row-before.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\table-add-row-before-active.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\table-add-row-before-hover.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\table-remove-column.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\table-remove-column-active.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\table-remove-column-hover.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\table-remove-row.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\table-remove-row-active.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\table-remove-row-hover.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\ua.css; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\viewer.properties; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\viewsource.css; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\arrow.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\chrome\icons\default\esc-window.ico; DestDir: {app}\chrome\icons\default Source: BUILD\ESC\chrome\icons\default\settings-window.ico; DestDir: {app}\chrome\icons\default Source: BUILD\ESC\chrome\locale\en-US\esc.properties; DestDir: {app}\chrome\locale\en-US Source: BUILD\ESC\chrome\locale\en-US\esc.dtd; DestDir: {app}\chrome\locale\en-US Source: BUILD\ESC\chrome\content\esc\throbber-anim5.gif; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\2-vweak.png; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\3-weak.png; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\4-fair.png; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\5-good.png; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\6-strong.png; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\blank-card.png; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\enrolled-key.png; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\initializecard.png; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\progress.7.gif; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\1-none.png; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\components\escCLH.js; DestDir: {app}\components ;Source: BUILD\ESC\chrome\content\esc\hiddenWindow.html; DestDir: {app}\chrome\content\esc ;Source: BUILD\ESC\chrome\content\esc\aol.gif; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\AdvancedInfo.js; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\advancedinfo.xul; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\blank-cardx2.png; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\password.xul; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\enroll.png; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\enrolled-keyx2.png; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\enrollx2.png; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\esc-client-24.png; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\formatcard.png; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\formatcardx2.png; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\hiddenWindow.xul; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\initializecardx2.png; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\MineOverlay.xul; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\password.js; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\certManager.xul; DestDir: {app}\chrome\content\esc [Run] Filename: {win}\egate2.4\eginstall.exe; Parameters: -f -l eginstall.txt; WorkingDir: {win}\egate2.4; Flags: waituntilterminated; StatusMsg: Installing smart card drivers.... Filename: {app}\PKCS11\pk11install.exe; Parameters: "-v ""name='CoolKey Module' library=coolkeypk11.dll NSS=""slotParams={{0x1=[slotFlags=PublicCerts]}"""""; WorkingDir: {sys}; StatusMsg: Configuring System for smart cards... Filename: {app}\esc.exe; WorkingDir: {app}; StatusMsg: {code:GetEscStatusMsg} Flags: nowait [UninstallDelete] Type: filesandordirs; Name: {app} [_ISTool] OutputExeFilename=BUILD\coolkey-setup.exe UseAbsolutePaths=false LogFile=inst.log LogFileAppend=false [Registry] ;The following lines register the CSP. Comment out if not available Root: HKLM; Subkey: Software\Microsoft\Cryptography\Defaults\Provider\CoolKey PKCS#11 CSP; ValueType: string; ValueName: PKCS11Module; ValueData: coolkeypk11.dll; Flags: uninsdeletekey Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: binary; ValueName: ATRMask; ValueData: ff ff ff ff ff ff ff ff 00 00; Flags: uninsdeletekey Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS#11 CSP Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: binary; ValueName: ATR; ValueData: 3b 75 94 00 00 62 02 02 00 00 ;End CSP registration Root: HKLM; Subkey: Software\ ; Turn off the "pick a cert" dialog box Root: HKCU; Subkey: Software\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3; ValueType: dword; ValueName: 1A04; ValueData: 0 ; Enable TLS 1.0 Root: HKCU; Subkey: Software\Microsoft\Windows\CurrentVersion\Internet Settings; ValueType: dword; ValueName: SecureProtocols; ValueData: 168 [Icons] Name: {userdesktop}\Smart Card Manager; Filename: {app}\esc.exe; WorkingDir: {app}; IconFileName : {app}\components\esc.ico Name: {group}\ESC\Smart Card Manager; Filename: {app}\esc.exe; WorkingDir: {app}; IconFileName : {app}\components\esc.ico Name: {commonstartup}\Smart Card Manager; Filename: {app}\esc.exe; WorkingDir: {app}; IconFileName : {app}\components\esc.ico [Dirs] Name: {app}\PKCS11 Name: {app}\components; Flags: deleteafterinstall uninsalwaysuninstall Name: {app}\chrome Name: {app}\defaults Name: {app}\xulrunner Name: {app}\chrome\content Name: {app}\chrome\icons Name: {app}\chrome\content\esc Name: {app}\chrome\locale Name: {app}\chrome\locale\en-US Name: {app}\chrome\icons\default Name: {app}\xulrunner\chrome Name: {app}\xulrunner\components Name: {app}\xulrunner\defaults Name: {app}\xulrunner\greprefs Name: {app}\xulrunner\plugins Name: {app}\xulrunner\res Name: {app}\xulrunner\sdk Name: {app}\xulrunner\defaults\autoconfig Name: {app}\xulrunner\defaults\pref Name: {app}\xulrunner\defaults\profile Name: {app}\xulrunner\defaults\profile\chrome Name: {app}\xulrunner\defaults\profile\extensions Name: {app}\xulrunner\defaults\profile\US Name: {app}\xulrunner\defaults\profile\US\chrome Name: {app}\xulrunner\res\dtd Name: {app}\xulrunner\res\entityTables Name: {app}\xulrunner\res\fonts Name: {app}\xulrunner\res\html Name: {app}\xulrunner\sdk\lib Name: {app}\xulrunner\estensions Name: {app}\xulrunner\updates Name: {app}\xulrunner\updates\0 Name: {app}\defaults\preferences [Code] function GetEscStatusMsg(Param: String) :string; var MyMillis: LongInt; begin MyMillis := 5000; Sleep(MyMillis); Result := 'Starting Smart Card Manager.....'; end;

1 0

[Fedora-directory-commits] esc/win32 - New directory
by Doctor Conrad 26 Jul '07

26 Jul '07

Author: jmagne Update of /cvs/dirsec/esc/win32 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14991/win32 Log Message: Directory /cvs/dirsec/esc/win32 added to the repository

1 0

[Fedora-directory-commits] console/src/com/netscape/management/client/theme/images login.gif, NONE, 1.1 OldServer.gif, 1.1, NONE
by Doctor Conrad 26 Jul '07

26 Jul '07

Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/theme/images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8255/src/com/netscape/management/client/theme/images Added Files: login.gif Removed Files: OldServer.gif Log Message: Resolves: 249484 Summary: Moved login splash screen image into the theme jar file.

1 0

[Fedora-directory-commits] console/src/com/netscape/management/client/console SplashScreen.java, 1.1.1.1, 1.2
by Doctor Conrad 26 Jul '07

26 Jul '07

Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8255/src/com/netscape/management/client/console Modified Files: SplashScreen.java Log Message: Resolves: 249484 Summary: Moved login splash screen image into the theme jar file. Index: SplashScreen.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/SplashScreen.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- SplashScreen.java 18 Jul 2005 00:34:15 -0000 1.1.1.1 +++ SplashScreen.java 25 Jul 2007 15:41:16 -0000 1.2 @@ -134,7 +134,7 @@ GridBagConstraints c = new GridBagConstraints(); - JLabel splashLabel = new JLabel(new RemoteImage("com/netscape/management/client/console/images/login.gif")); + JLabel splashLabel = new JLabel(new RemoteImage("com/netscape/management/client/theme/images/login.gif")); c.gridwidth = 1; c.gridheight = 1; c.gridx = 0;

1 0

[Fedora-directory-commits] console/src/com/netscape/management/client/console/images login.gif, 1.1.1.1, NONE
by Doctor Conrad 26 Jul '07

26 Jul '07

Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/console/images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8255/src/com/netscape/management/client/console/images Removed Files: login.gif Log Message: Resolves: 249484 Summary: Moved login splash screen image into the theme jar file.

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm ldbm_instance_config.c, 1.7, 1.8
by Doctor Conrad 26 Jul '07

26 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4391/ldapserver/ldap/servers/slapd/back-ldbm Modified Files: ldbm_instance_config.c Log Message: Resolves: bug 249470 Bug Description: cn equality index missing by default Reviewed by: nhosoi (Thanks!) Fix Description: When creating the database instance during dse.ldif processing, we do not create the user defined indexes from the defaults for this backend. This used to work in the old setup code because that code would always add the configuration for the indexes for the new instance. The way it is supposed to work is that a new instance should just copy the default indexes for that backend. This works fine when adding an instance via LDAP but not during startup. I just added a call to have this done during startup. I also removed some obsolete indexes from the default indexes. Platforms tested: RHEL4 Flag Day: no Doc impact: no Index: ldbm_instance_config.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ldbm_instance_config.c 4 Dec 2006 18:36:57 -0000 1.7 +++ ldbm_instance_config.c 25 Jul 2007 15:20:01 -0000 1.8 @@ -837,6 +837,10 @@ if (pb == NULL) { /* called during startup -- do the rest now */ rc = ldbm_instance_generate(li, instance_name, NULL); + if (!rc) { + inst = ldbm_instance_find_by_name(li, instance_name); + rc = ldbm_instance_create_default_user_indexes(inst); + } } /* if called during a normal ADD operation, the postadd callback * will do the rest.

1 0

[Fedora-directory-commits] ldapserver/ldap/ldif template-dse.ldif.in, 1.3, 1.4
by Doctor Conrad 26 Jul '07

26 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/ldif In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4391/ldapserver/ldap/ldif Modified Files: template-dse.ldif.in Log Message: Resolves: bug 249470 Bug Description: cn equality index missing by default Reviewed by: nhosoi (Thanks!) Fix Description: When creating the database instance during dse.ldif processing, we do not create the user defined indexes from the defaults for this backend. This used to work in the old setup code because that code would always add the configuration for the indexes for the new instance. The way it is supposed to work is that a new instance should just copy the default indexes for that backend. This works fine when adding an instance via LDAP but not during startup. I just added a call to have this done during startup. I also removed some obsolete indexes from the default indexes. Platforms tested: RHEL4 Flag Day: no Doc impact: no Index: template-dse.ldif.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/ldif/template-dse.ldif.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- template-dse.ldif.in 13 Jul 2007 18:35:33 -0000 1.3 +++ template-dse.ldif.in 25 Jul 2007 15:20:01 -0000 1.4 @@ -603,22 +603,6 @@ nssystemindex: false nsindextype: eq -dn: cn=nsCalXItemId,cn=default indexes, cn=config,cn=ldbm database,cn=plugins,cn=config -objectclass: top -objectclass: nsIndex -cn: nsCalXItemId -nssystemindex: false -nsindextype: pres -nsindextype: eq -nsindextype: sub - -dn: cn=nsLIProfileName,cn=default indexes, cn=config,cn=ldbm database,cn=plugins,cn=config -objectclass: top -objectclass: nsIndex -cn: nsLIProfileName -nssystemindex: false -nsindextype: eq - dn: cn=nsUniqueId,cn=default indexes, cn=config,cn=ldbm database,cn=plugins,cn=config objectclass: top objectclass: nsIndex @@ -626,13 +610,6 @@ nssystemindex: true nsindextype: eq -dn: cn=nswcalCALID,cn=default indexes, cn=config,cn=ldbm database,cn=plugins,cn=config -objectclass: top -objectclass: nsIndex -cn: nswcalCALID -nssystemindex: false -nsindextype: eq - dn: cn=numsubordinates,cn=default indexes, cn=config,cn=ldbm database,cn=plugins,cn=config objectclass: top objectclass: nsIndex @@ -661,20 +638,6 @@ nssystemindex: true nsindextype: eq -dn: cn=pipstatus,cn=default indexes, cn=config,cn=ldbm database,cn=plugins,cn=config -objectclass: top -objectclass: nsIndex -cn: pipstatus -nssystemindex: false -nsindextype: eq - -dn: cn=pipuid,cn=default indexes, cn=config,cn=ldbm database,cn=plugins,cn=config -objectclass: top -objectclass: nsIndex -cn: pipuid -nssystemindex: false -nsindextype: pres - dn: cn=seeAlso,cn=default indexes, cn=config,cn=ldbm database,cn=plugins,cn=config objectclass: top objectclass: nsIndex

1 0

[Fedora-directory-commits] adminserver/lib/libdsa dsalib_conf.c, 1.3, 1.4 dsalib_confs.c, 1.1, 1.2 dsalib_db.c, 1.3, 1.4 dsalib_debug.c, 1.1, 1.2 dsalib_dn.c, 1.1, 1.2 dsalib_filename.c, 1.1, 1.2 dsalib_ldif.c, 1.2, 1.3 dsalib_location.c, 1.3, 1.4 dsalib_pw.c, 1.1, 1.2 dsalib_tailf.c, 1.1, 1.2 dsalib_updown.c, 1.3, 1.4 dsalib_util.c, 1.1, 1.2
by Doctor Conrad 25 Jul '07

25 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/lib/libdsa In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/adminserver/lib/libdsa Modified Files: dsalib_conf.c dsalib_confs.c dsalib_db.c dsalib_debug.c dsalib_dn.c dsalib_filename.c dsalib_ldif.c dsalib_location.c dsalib_pw.c dsalib_tailf.c dsalib_updown.c dsalib_util.c Log Message: remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server Index: dsalib_conf.c =================================================================== RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_conf.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dsalib_conf.c 26 Jun 2007 18:34:47 -0000 1.3 +++ dsalib_conf.c 24 Jul 2007 20:10:18 -0000 1.4 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: dsalib_confs.c =================================================================== RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_confs.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dsalib_confs.c 13 Jun 2007 01:37:17 -0000 1.1 +++ dsalib_confs.c 24 Jul 2007 20:10:18 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: dsalib_db.c =================================================================== RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_db.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dsalib_db.c 26 Jun 2007 18:34:47 -0000 1.3 +++ dsalib_db.c 24 Jul 2007 20:10:18 -0000 1.4 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: dsalib_debug.c =================================================================== RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_debug.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dsalib_debug.c 13 Jun 2007 01:37:17 -0000 1.1 +++ dsalib_debug.c 24 Jul 2007 20:10:18 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: dsalib_dn.c =================================================================== RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_dn.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dsalib_dn.c 13 Jun 2007 01:37:17 -0000 1.1 +++ dsalib_dn.c 24 Jul 2007 20:10:18 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: dsalib_filename.c =================================================================== RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_filename.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dsalib_filename.c 13 Jun 2007 01:37:17 -0000 1.1 +++ dsalib_filename.c 24 Jul 2007 20:10:18 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: dsalib_ldif.c =================================================================== RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_ldif.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dsalib_ldif.c 26 Jun 2007 18:34:47 -0000 1.2 +++ dsalib_ldif.c 24 Jul 2007 20:10:18 -0000 1.3 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: dsalib_location.c =================================================================== RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_location.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dsalib_location.c 26 Jun 2007 18:34:47 -0000 1.3 +++ dsalib_location.c 24 Jul 2007 20:10:18 -0000 1.4 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: dsalib_pw.c =================================================================== RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_pw.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dsalib_pw.c 13 Jun 2007 01:37:17 -0000 1.1 +++ dsalib_pw.c 24 Jul 2007 20:10:18 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: dsalib_tailf.c =================================================================== RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_tailf.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dsalib_tailf.c 13 Jun 2007 01:37:17 -0000 1.1 +++ dsalib_tailf.c 24 Jul 2007 20:10:18 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: dsalib_updown.c =================================================================== RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_updown.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dsalib_updown.c 26 Jun 2007 18:34:47 -0000 1.3 +++ dsalib_updown.c 24 Jul 2007 20:10:18 -0000 1.4 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: dsalib_util.c =================================================================== RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_util.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dsalib_util.c 13 Jun 2007 01:37:17 -0000 1.1 +++ dsalib_util.c 24 Jul 2007 20:10:18 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved.

1 0

[Fedora-directory-commits] adminserver/include/libdsa dsalib.h, 1.3, 1.4 dsalib_pw.h, 1.1, 1.2 dsalib_schema.h, 1.1, 1.2
by Doctor Conrad 25 Jul '07

25 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/include/libdsa In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/adminserver/include/libdsa Modified Files: dsalib.h dsalib_pw.h dsalib_schema.h Log Message: remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server Index: dsalib.h =================================================================== RCS file: /cvs/dirsec/adminserver/include/libdsa/dsalib.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dsalib.h 26 Jun 2007 18:34:47 -0000 1.3 +++ dsalib.h 24 Jul 2007 20:10:18 -0000 1.4 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: dsalib_pw.h =================================================================== RCS file: /cvs/dirsec/adminserver/include/libdsa/dsalib_pw.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dsalib_pw.h 13 Jun 2007 01:37:17 -0000 1.1 +++ dsalib_pw.h 24 Jul 2007 20:10:18 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: dsalib_schema.h =================================================================== RCS file: /cvs/dirsec/adminserver/include/libdsa/dsalib_schema.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dsalib_schema.h 13 Jun 2007 01:37:17 -0000 1.1 +++ dsalib_schema.h 24 Jul 2007 20:10:18 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved.

1 0

[Fedora-directory-commits] adminserver/include netsite.h, 1.4, 1.5 version.h, 1.7, NONE
by Doctor Conrad 25 Jul '07

25 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/adminserver/include Modified Files: netsite.h Removed Files: version.h Log Message: remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server Index: netsite.h =================================================================== RCS file: /cvs/dirsec/adminserver/include/netsite.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- netsite.h 18 Aug 2005 19:14:21 -0000 1.4 +++ netsite.h 24 Jul 2007 20:10:16 -0000 1.5 @@ -48,78 +48,10 @@ #define EXTERNC #endif -#ifndef VERSION_H -#include "version.h" -#endif /* !VERSION_H */ - #ifndef BASE_SYSTEMS_H #include "base/systems.h" #endif /* !BASE_SYSTEMS_H */ -#define MAGNUS_VENDER_NAME VI_COMPANYNAME - -#ifdef MCC_PROXY -#define MAGNUS_VERSION PROXY_VERSION_DEF -#define MAGNUS_VERSION_STRING PROXY_VERSION_STRING - -#elif defined(NS_CMS) -#define MAGNUS_VERSION CMS_VERSION_DEF -#define MAGNUS_VERSION_STRING CMS_VERSION_STRING - -#elif defined(NS_DS) -#define MAGNUS_VERSION DS_VERSION_DEF -#define MAGNUS_VERSION_STRING DS_VERSION_STRING - -#elif defined(MCC_ADMSERV) -#define MAGNUS_VERSION ADMSERV_VERSION_DEF -#define MAGNUS_VERSION_STRING ADMSERV_VERSION_STRING -#define MAGNUS_SERVER_NAME ADMSERV_NAME - -#elif defined(NS_CATALOG) -#define MAGNUS_VERSION CATALOG_VERSION_DEF -#define MAGNUS_VERSION_STRING CATALOG_VERSION_STRING - -#elif defined(NS_RDS) -#define MAGNUS_VERSION RDS_VERSION_DEF -#define MAGNUS_VERSION_STRING RDS_VERSION_STRING - -#elif defined(MCC_HTTPD) - -#ifdef NS_PERSONAL -#define MAGNUS_VERSION PERSONAL_VERSION_DEF -#else -#define MAGNUS_VERSION ENTERPRISE_VERSION_DEF -#endif - -#if defined(XP_UNIX) || defined(USE_ADMSERV) -#if defined(NS_DS) -#define MAGNUS_VERSION_STRING DS_VERSION_STRING -#elif defined(NS_PERSONAL) -#define MAGNUS_VERSION_STRING PERSONAL_VERSION_STRING -#elif defined(NS_CATALOG) -#define MAGNUS_VERSION_STRING CATALOG_VERSION_STRING -#elif defined(NS_RDS) -#define MAGNUS_VERSION_STRING RDS_VERSION_STRING -#elif defined(NS_CMS) -#define MAGNUS_VERSION_STRING CMS_VERSION_STRING -#else -#define MAGNUS_VERSION_STRING ENTERPRISE_VERSION_STRING -#endif -#endif /* XP_UNIX */ - -#elif defined(MCC_NEWS) -#define MAGNUS_VERSION_STRING NEWS_VERSION_STRING - -#elif defined(NS_MAIL) -#define MAGNUS_VERSION MAIL_VERSION_DEF -#define MAGNUS_VERSION_STRING MAIL_VERSION_STRING - -#elif defined(MCC_BATMAN) -#define MAGNUS_VERSION BATMAN_VERSION_DEF -#define MAGNUS_VERSION_STRING BATMAN_VERSION_STRING - -#endif - #ifndef VOID #define VOID void #endif --- version.h DELETED ---

1 0

[Fedora-directory-commits] adminserver/admserv/cgi-src40 ds_create.in, 1.3, 1.4 ds_remove.in, 1.2, 1.3
by Doctor Conrad 25 Jul '07

25 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cgi-src40 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/adminserver/admserv/cgi-src40 Modified Files: ds_create.in ds_remove.in Log Message: remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server Index: ds_create.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_create.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ds_create.in 13 Jul 2007 18:39:15 -0000 1.3 +++ ds_create.in 24 Jul 2007 20:10:15 -0000 1.4 @@ -12,26 +12,6 @@ # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK Index: ds_remove.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_remove.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ds_remove.in 11 Jul 2007 21:36:47 -0000 1.2 +++ ds_remove.in 24 Jul 2007 20:10:15 -0000 1.3 @@ -12,26 +12,6 @@ # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK

1 0

[Fedora-directory-commits] adminserver/admserv/newinst/src ASDialogs.pm.in, 1.5, 1.6 AdminMigration.pm.in, 1.2, 1.3 AdminServer.pm.in, 1.6, 1.7 AdminUtil.pm.in, 1.10, 1.11 ConfigDSDialogs.pm, 1.4, 1.5 adminserver.map.in, 1.6, 1.7 asmigrate.map.in, 1.1, 1.2 configdsroot.map.in, 1.5, 1.6 dirserver.map.in, 1.6, 1.7 migrate-ds-admin.pl.in, 1.5, 1.6 register_param.map.in, 1.7, 1.8 register_server.pl.in, 1.4, 1.5 setup-ds-admin.pl.in, 1.9, 1.10
by Doctor Conrad 25 Jul '07

25 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/newinst/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/adminserver/admserv/newinst/src Modified Files: ASDialogs.pm.in AdminMigration.pm.in AdminServer.pm.in AdminUtil.pm.in ConfigDSDialogs.pm adminserver.map.in asmigrate.map.in configdsroot.map.in dirserver.map.in migrate-ds-admin.pl.in register_param.map.in register_server.pl.in setup-ds-admin.pl.in Log Message: remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server Index: ASDialogs.pm.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ASDialogs.pm.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ASDialogs.pm.in 13 Jul 2007 19:53:17 -0000 1.5 +++ ASDialogs.pm.in 24 Jul 2007 20:10:16 -0000 1.6 @@ -11,26 +11,6 @@ # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK Index: AdminMigration.pm.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminMigration.pm.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AdminMigration.pm.in 4 Jul 2007 01:31:33 -0000 1.2 +++ AdminMigration.pm.in 24 Jul 2007 20:10:16 -0000 1.3 @@ -11,26 +11,6 @@ # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK Index: AdminServer.pm.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminServer.pm.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- AdminServer.pm.in 13 Jul 2007 18:39:15 -0000 1.6 +++ AdminServer.pm.in 24 Jul 2007 20:10:16 -0000 1.7 @@ -11,26 +11,6 @@ # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK Index: AdminUtil.pm.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminUtil.pm.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- AdminUtil.pm.in 13 Jul 2007 18:39:15 -0000 1.10 +++ AdminUtil.pm.in 24 Jul 2007 20:10:16 -0000 1.11 @@ -11,26 +11,6 @@ # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK Index: ConfigDSDialogs.pm =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ConfigDSDialogs.pm,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ConfigDSDialogs.pm 20 Jun 2007 16:35:02 -0000 1.4 +++ ConfigDSDialogs.pm 24 Jul 2007 20:10:16 -0000 1.5 @@ -11,26 +11,6 @@ # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK Index: adminserver.map.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/adminserver.map.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- adminserver.map.in 11 Jul 2007 01:20:21 -0000 1.6 +++ adminserver.map.in 24 Jul 2007 20:10:16 -0000 1.7 @@ -11,26 +11,6 @@ # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK Index: asmigrate.map.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/asmigrate.map.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- asmigrate.map.in 29 Jun 2007 21:29:05 -0000 1.1 +++ asmigrate.map.in 24 Jul 2007 20:10:16 -0000 1.2 @@ -11,26 +11,6 @@ # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK Index: configdsroot.map.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/configdsroot.map.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- configdsroot.map.in 11 Jul 2007 01:20:21 -0000 1.5 +++ configdsroot.map.in 24 Jul 2007 20:10:16 -0000 1.6 @@ -11,26 +11,6 @@ # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK Index: dirserver.map.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/dirserver.map.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dirserver.map.in 11 Jul 2007 01:20:21 -0000 1.6 +++ dirserver.map.in 24 Jul 2007 20:10:16 -0000 1.7 @@ -11,26 +11,6 @@ # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK Index: migrate-ds-admin.pl.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/migrate-ds-admin.pl.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- migrate-ds-admin.pl.in 18 Jul 2007 20:43:14 -0000 1.5 +++ migrate-ds-admin.pl.in 24 Jul 2007 20:10:16 -0000 1.6 @@ -12,26 +12,6 @@ # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK Index: register_param.map.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_param.map.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- register_param.map.in 11 Jul 2007 01:20:21 -0000 1.7 +++ register_param.map.in 24 Jul 2007 20:10:16 -0000 1.8 @@ -11,26 +11,6 @@ # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK Index: register_server.pl.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_server.pl.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- register_server.pl.in 4 Jul 2007 01:31:33 -0000 1.4 +++ register_server.pl.in 24 Jul 2007 20:10:16 -0000 1.5 @@ -12,26 +12,6 @@ # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK Index: setup-ds-admin.pl.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.pl.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- setup-ds-admin.pl.in 18 Jul 2007 20:43:14 -0000 1.9 +++ setup-ds-admin.pl.in 24 Jul 2007 20:10:16 -0000 1.10 @@ -12,26 +12,6 @@ # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK

1 0

[Fedora-directory-commits] adminserver/admserv/schema/ldif adminglobal.ldif, 1.1, NONE admintasks.ldif, 1.2, NONE readme.txt, 1.1.1.1, NONE
by Doctor Conrad 25 Jul '07

25 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/schema/ldif In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/adminserver/admserv/schema/ldif Removed Files: adminglobal.ldif admintasks.ldif readme.txt Log Message: remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server --- adminglobal.ldif DELETED --- --- admintasks.ldif DELETED --- --- readme.txt DELETED ---

1 0

[Fedora-directory-commits] adminserver/admserv/cgi-ds addindex.c, 1.1, 1.2 ds_bak2db.c, 1.1, 1.2 ds_db2bak.c, 1.1, 1.2 ds_db2ldif.c, 1.1, 1.2 ds_ldif2db.c, 1.1, 1.2 ds_listdb.c, 1.1, 1.2 ds_remove.c, 1.2, 1.3 ds_rmdb.c, 1.1, 1.2 ds_snmpctrl.c, 1.2, 1.3 init_ds_env.c, 1.1, 1.2 init_ds_env.h, 1.1, 1.2 restart.c, 1.1, 1.2 shutdown.c, 1.1, 1.2 start.c, 1.1, 1.2 vlvindex.c, 1.1, 1.2
by Doctor Conrad 25 Jul '07

25 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cgi-ds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/adminserver/admserv/cgi-ds Modified Files: addindex.c ds_bak2db.c ds_db2bak.c ds_db2ldif.c ds_ldif2db.c ds_listdb.c ds_remove.c ds_rmdb.c ds_snmpctrl.c init_ds_env.c init_ds_env.h restart.c shutdown.c start.c vlvindex.c Log Message: remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server Index: addindex.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/addindex.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- addindex.c 13 Jun 2007 01:37:16 -0000 1.1 +++ addindex.c 24 Jul 2007 20:10:15 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: ds_bak2db.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/ds_bak2db.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ds_bak2db.c 13 Jun 2007 01:37:16 -0000 1.1 +++ ds_bak2db.c 24 Jul 2007 20:10:15 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: ds_db2bak.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/ds_db2bak.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ds_db2bak.c 13 Jun 2007 01:37:16 -0000 1.1 +++ ds_db2bak.c 24 Jul 2007 20:10:15 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: ds_db2ldif.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/ds_db2ldif.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ds_db2ldif.c 13 Jun 2007 01:37:16 -0000 1.1 +++ ds_db2ldif.c 24 Jul 2007 20:10:15 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: ds_ldif2db.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/ds_ldif2db.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ds_ldif2db.c 13 Jun 2007 01:37:16 -0000 1.1 +++ ds_ldif2db.c 24 Jul 2007 20:10:15 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: ds_listdb.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/ds_listdb.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ds_listdb.c 13 Jun 2007 01:37:16 -0000 1.1 +++ ds_listdb.c 24 Jul 2007 20:10:15 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: ds_remove.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/ds_remove.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ds_remove.c 26 Jun 2007 18:34:46 -0000 1.2 +++ ds_remove.c 24 Jul 2007 20:10:15 -0000 1.3 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: ds_rmdb.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/ds_rmdb.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ds_rmdb.c 13 Jun 2007 01:37:16 -0000 1.1 +++ ds_rmdb.c 24 Jul 2007 20:10:15 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: ds_snmpctrl.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/ds_snmpctrl.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ds_snmpctrl.c 26 Jun 2007 18:34:46 -0000 1.2 +++ ds_snmpctrl.c 24 Jul 2007 20:10:15 -0000 1.3 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: init_ds_env.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/init_ds_env.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- init_ds_env.c 13 Jun 2007 01:37:16 -0000 1.1 +++ init_ds_env.c 24 Jul 2007 20:10:15 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: init_ds_env.h =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/init_ds_env.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- init_ds_env.h 13 Jun 2007 01:37:16 -0000 1.1 +++ init_ds_env.h 24 Jul 2007 20:10:15 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: restart.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/restart.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- restart.c 13 Jun 2007 01:37:16 -0000 1.1 +++ restart.c 24 Jul 2007 20:10:15 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: shutdown.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/shutdown.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- shutdown.c 13 Jun 2007 01:37:16 -0000 1.1 +++ shutdown.c 24 Jul 2007 20:10:15 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: start.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/start.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- start.c 13 Jun 2007 01:37:16 -0000 1.1 +++ start.c 24 Jul 2007 20:10:15 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: vlvindex.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/vlvindex.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vlvindex.c 13 Jun 2007 01:37:16 -0000 1.1 +++ vlvindex.c 24 Jul 2007 20:10:15 -0000 1.2 @@ -11,26 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * - * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved.

1 0

[Fedora-directory-commits] adminserver LICENSE,NONE,1.1
by Doctor Conrad 25 Jul '07

25 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/adminserver Added Files: LICENSE Log Message: remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server --- NEW FILE LICENSE --- 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; version 2 of the License. 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.

1 0

[Fedora-directory-commits] adminserver/admserv/cfgstuff mime.types, 1.4, NONE
by Doctor Conrad 25 Jul '07

25 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/adminserver/admserv/cfgstuff Removed Files: mime.types Log Message: remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server --- mime.types DELETED ---

1 0

[Fedora-directory-commits] ldapserver Makefile.am, 1.51, 1.52 aclocal.m4, 1.43, 1.44 configure, 1.54, 1.55 missing, 1.33, 1.34 install-sh, 1.33, 1.34 depcomp, 1.33, 1.34 compile, 1.33, 1.34 Makefile.in, 1.60, 1.61 config.sub, 1.32, 1.33 config.guess, 1.32, 1.33
by Doctor Conrad 25 Jul '07

25 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28126 Modified Files: Makefile.am aclocal.m4 configure missing install-sh depcomp compile Makefile.in config.sub config.guess Log Message: forgot to tell Makefile.am about removed obsolete files Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- Makefile.am 20 Jul 2007 21:29:24 -0000 1.51 +++ Makefile.am 24 Jul 2007 20:06:39 -0000 1.52 @@ -131,14 +131,11 @@ $(srcdir)/ldap/schema/slapd-collations.conf sampledata_DATA = $(srcdir)/ldap/ldif/Ace.ldif \ - $(srcdir)/ldap/ldif/commonTasks.ldif \ $(srcdir)/ldap/ldif/European.ldif \ $(srcdir)/ldap/ldif/Eurosuffix.ldif \ $(srcdir)/ldap/ldif/Example.ldif \ $(srcdir)/ldap/ldif/Example-roles.ldif \ $(srcdir)/ldap/ldif/Example-views.ldif \ - $(srcdir)/ldap/ldif/roledit.ldif \ - $(srcdir)/ldap/ldif/tasks.ldif \ $(srcdir)/ldap/ldif/template.ldif \ ldap/ldif/template-dse.ldif \ ldap/ldif/template-suffix-db.ldif \ Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- Makefile.in 20 Jul 2007 21:29:25 -0000 1.60 +++ Makefile.in 24 Jul 2007 20:06:40 -0000 1.61 @@ -1039,14 +1039,11 @@ $(srcdir)/ldap/schema/slapd-collations.conf sampledata_DATA = $(srcdir)/ldap/ldif/Ace.ldif \ - $(srcdir)/ldap/ldif/commonTasks.ldif \ $(srcdir)/ldap/ldif/European.ldif \ $(srcdir)/ldap/ldif/Eurosuffix.ldif \ $(srcdir)/ldap/ldif/Example.ldif \ $(srcdir)/ldap/ldif/Example-roles.ldif \ $(srcdir)/ldap/ldif/Example-views.ldif \ - $(srcdir)/ldap/ldif/roledit.ldif \ - $(srcdir)/ldap/ldif/tasks.ldif \ $(srcdir)/ldap/ldif/template.ldif \ ldap/ldif/template-dse.ldif \ ldap/ldif/template-suffix-db.ldif \

1 0

[Fedora-directory-commits] adminutil configure.ac, 1.6, 1.7 aclocal.m4, 1.9, 1.10 configure, 1.9, 1.10 missing, 1.8, 1.9 install-sh, 1.8, 1.9 depcomp, 1.8, 1.9 compile, 1.8, 1.9 Makefile.in, 1.9, 1.10 config.sub, 1.8, 1.9 config.guess, 1.8, 1.9
by Doctor Conrad 25 Jul '07

25 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4261 Modified Files: configure.ac aclocal.m4 configure missing install-sh depcomp compile Makefile.in config.sub config.guess Log Message: bump version to 1.1.3 Index: configure.ac =================================================================== RCS file: /cvs/dirsec/adminutil/configure.ac,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- configure.ac 22 Jun 2007 22:51:01 -0000 1.6 +++ configure.ac 24 Jul 2007 18:40:44 -0000 1.7 @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([adminutil], [1.1.2], [http://bugzilla.redhat.com/] +AC_INIT([adminutil], [1.1.3], [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.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- configure 22 Jun 2007 22:51:00 -0000 1.9 +++ configure 24 Jul 2007 18:40:44 -0000 1.10 @@ -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.2. +# Generated by GNU Autoconf 2.59 for adminutil 1.1.3. # # 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.2' -PACKAGE_STRING='adminutil 1.1.2' +PACKAGE_VERSION='1.1.3' +PACKAGE_STRING='adminutil 1.1.3' 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.2 to adapt to many kinds of systems. +\`configure' configures adminutil 1.1.3 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.2:";; + short | recursive ) echo "Configuration of adminutil 1.1.3:";; esac cat <<\_ACEOF @@ -1180,7 +1180,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -adminutil configure 1.1.2 +adminutil configure 1.1.3 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1194,7 +1194,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.2, which was +It was created by adminutil $as_me 1.1.3, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1837,7 +1837,7 @@ # Define the identity of the package. PACKAGE='adminutil' - VERSION='1.1.2' + VERSION='1.1.3' cat >>confdefs.h <<_ACEOF @@ -24367,7 +24367,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by adminutil $as_me 1.1.2, which was +This file was extended by adminutil $as_me 1.1.3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24425,7 +24425,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -adminutil config.status 1.1.2 +adminutil config.status 1.1.3 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/plugins/pam_passthru config.ldif, 1.5, NONE
by Doctor Conrad 24 Jul '07

24 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/pam_passthru In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462/ldapserver/ldap/servers/plugins/pam_passthru Removed Files: config.ldif Log Message: removed more obsolete files --- config.ldif DELETED ---

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/plugins/dna dna.ldif, 1.1, NONE
by Doctor Conrad 24 Jul '07

24 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/dna In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462/ldapserver/ldap/servers/plugins/dna Removed Files: dna.ldif Log Message: removed more obsolete files --- dna.ldif DELETED ---

1 0

[Fedora-directory-commits] ldapserver/ldap/schema ns-calendar-globopt.conf, 1.6, NONE ns-certificate-globopt.conf, 1.4, NONE ns-compass-globopt.conf, 1.6, NONE ns-directory-globopt.conf, 1.6, NONE ns-mail-globopt.conf, 1.6, NONE ns-mcd-li-globopt.conf, 1.4, NONE ns-media-globopt.conf, 1.6, NONE ns-news-globopt.conf, 1.4, NONE ns-proxy-globopt.conf, 1.6, NONE ns-wcal-globopt.conf, 1.6, NONE ns-web-globopt.conf, 1.6, NONE
by Doctor Conrad 24 Jul '07

24 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/schema In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462/ldapserver/ldap/schema Removed Files: ns-calendar-globopt.conf ns-certificate-globopt.conf ns-compass-globopt.conf ns-directory-globopt.conf ns-mail-globopt.conf ns-mcd-li-globopt.conf ns-media-globopt.conf ns-news-globopt.conf ns-proxy-globopt.conf ns-wcal-globopt.conf ns-web-globopt.conf Log Message: removed more obsolete files --- ns-calendar-globopt.conf DELETED --- --- ns-certificate-globopt.conf DELETED --- --- ns-compass-globopt.conf DELETED --- --- ns-directory-globopt.conf DELETED --- --- ns-mail-globopt.conf DELETED --- --- ns-mcd-li-globopt.conf DELETED --- --- ns-media-globopt.conf DELETED --- --- ns-news-globopt.conf DELETED --- --- ns-proxy-globopt.conf DELETED --- --- ns-wcal-globopt.conf DELETED --- --- ns-web-globopt.conf DELETED ---

1 0

[Fedora-directory-commits] ldapserver/ldap/ldif commonTasks.ldif, 1.5, NONE roledit.ldif, 1.7, NONE tasks.ldif, 1.8, NONE
by Doctor Conrad 24 Jul '07

24 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/ldif In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462/ldapserver/ldap/ldif Removed Files: commonTasks.ldif roledit.ldif tasks.ldif Log Message: removed more obsolete files --- commonTasks.ldif DELETED --- --- roledit.ldif DELETED --- --- tasks.ldif DELETED ---

1 0

[Fedora-directory-commits] ldapserver/include netsite.h, 1.6, 1.7 version.h, 1.12, NONE
by Doctor Conrad 24 Jul '07

24 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462/ldapserver/include Modified Files: netsite.h Removed Files: version.h Log Message: removed more obsolete files Index: netsite.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/netsite.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- netsite.h 10 Nov 2006 23:44:24 -0000 1.6 +++ netsite.h 23 Jul 2007 22:03:44 -0000 1.7 @@ -70,10 +70,6 @@ #define EXTERNC #endif -#ifndef VERSION_H -#include "version.h" -#endif /* !VERSION_H */ - #ifndef BASE_SYSTEMS_H #include "base/systems.h" #endif /* !BASE_SYSTEMS_H */ --- version.h DELETED ---

1 0

[Fedora-directory-commits] ldapserver Makefile.am, 1.50, 1.51 aclocal.m4, 1.42, 1.43 configure, 1.53, 1.54 missing, 1.32, 1.33 install-sh, 1.32, 1.33 depcomp, 1.32, 1.33 compile, 1.32, 1.33 Makefile.in, 1.59, 1.60 config.sub, 1.31, 1.32 config.guess, 1.31, 1.32
by Doctor Conrad 21 Jul '07

21 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18120/ldapserver Modified Files: Makefile.am aclocal.m4 configure missing install-sh depcomp compile Makefile.in config.sub config.guess Log Message: move setup-ds.pl and migrate-ds.pl to sbindir Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- Makefile.am 18 Jul 2007 20:37:07 -0000 1.50 +++ Makefile.am 20 Jul 2007 21:29:24 -0000 1.51 @@ -178,6 +178,9 @@ $(srcdir)/ldap/schema/60pam-plugin.ldif \ $(srcdir)/ldap/schema/99user.ldif +sbin_SCRIPTS = ldap/admin/src/scripts/setup-ds.pl \ + ldap/admin/src/scripts/migrate-ds.pl + bin_SCRIPTS = ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \ wrappers/dbscan \ wrappers/dsktune \ @@ -193,9 +196,7 @@ wrappers/cl-dump \ ldap/admin/src/scripts/cl-dump.pl \ wrappers/repl-monitor \ - ldap/admin/src/scripts/repl-monitor.pl \ - ldap/admin/src/scripts/setup-ds.pl \ - ldap/admin/src/scripts/migrate-ds.pl + ldap/admin/src/scripts/repl-monitor.pl perl_SCRIPTS = ldap/admin/src/scripts/SetupLog.pm \ ldap/admin/src/scripts/Resource.pm \ Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- Makefile.in 18 Jul 2007 20:37:08 -0000 1.59 +++ Makefile.in 20 Jul 2007 21:29:25 -0000 1.60 @@ -94,10 +94,10 @@ "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(initdir)" "$(DESTDIR)$(perldir)" \ - "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" \ - "$(DESTDIR)$(infdir)" "$(DESTDIR)$(propertydir)" \ - "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" \ - "$(DESTDIR)$(schemadir)" + "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" \ + "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" \ + "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" \ + "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)" serverLTLIBRARIES_INSTALL = $(INSTALL) serverpluginLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(server_LTLIBRARIES) $(serverplugin_LTLIBRARIES) @@ -688,9 +688,10 @@ binSCRIPT_INSTALL = $(INSTALL_SCRIPT) initSCRIPT_INSTALL = $(INSTALL_SCRIPT) perlSCRIPT_INSTALL = $(INSTALL_SCRIPT) +sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) taskSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) $(init_SCRIPTS) $(perl_SCRIPTS) \ - $(task_SCRIPTS) + $(sbin_SCRIPTS) $(task_SCRIPTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -1085,6 +1086,9 @@ $(srcdir)/ldap/schema/60pam-plugin.ldif \ $(srcdir)/ldap/schema/99user.ldif +sbin_SCRIPTS = ldap/admin/src/scripts/setup-ds.pl \ + ldap/admin/src/scripts/migrate-ds.pl + bin_SCRIPTS = ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \ wrappers/dbscan \ wrappers/dsktune \ @@ -1100,9 +1104,7 @@ wrappers/cl-dump \ ldap/admin/src/scripts/cl-dump.pl \ wrappers/repl-monitor \ - ldap/admin/src/scripts/repl-monitor.pl \ - ldap/admin/src/scripts/setup-ds.pl \ - ldap/admin/src/scripts/migrate-ds.pl + ldap/admin/src/scripts/repl-monitor.pl perl_SCRIPTS = ldap/admin/src/scripts/SetupLog.pm \ ldap/admin/src/scripts/Resource.pm \ @@ -3745,6 +3747,25 @@ echo " rm -f '$(DESTDIR)$(perldir)/$$f'"; \ rm -f "$(DESTDIR)$(perldir)/$$f"; \ done +install-sbinSCRIPTS: $(sbin_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)" + @list='$(sbin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(sbinSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ + $(sbinSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(sbindir)/$$f"; \ + else :; fi; \ + done + +uninstall-sbinSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(sbin_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \ + rm -f "$(DESTDIR)$(sbindir)/$$f"; \ + done install-taskSCRIPTS: $(task_SCRIPTS) @$(NORMAL_INSTALL) test -z "$(taskdir)" || $(mkdir_p) "$(DESTDIR)$(taskdir)" @@ -8831,7 +8852,7 @@ all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \ $(DATA) config.h installdirs: - for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \ + for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -8963,7 +8984,7 @@ install-taskSCRIPTS install-exec-am: install-binPROGRAMS install-binSCRIPTS \ - install-sbinPROGRAMS + install-sbinPROGRAMS install-sbinSCRIPTS install-info: install-info-am @@ -8996,8 +9017,9 @@ uninstall-initSCRIPTS uninstall-nodist_propertyDATA \ uninstall-perlSCRIPTS uninstall-propertyDATA \ uninstall-sampledataDATA uninstall-sbinPROGRAMS \ - uninstall-schemaDATA uninstall-serverLTLIBRARIES \ - uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS + uninstall-sbinSCRIPTS uninstall-schemaDATA \ + uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \ + uninstall-taskSCRIPTS .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool \ @@ -9013,7 +9035,8 @@ install-infDATA install-info install-info-am \ install-initSCRIPTS install-man install-nodist_propertyDATA \ install-perlSCRIPTS install-propertyDATA \ - install-sampledataDATA install-sbinPROGRAMS install-schemaDATA \ + install-sampledataDATA install-sbinPROGRAMS \ + install-sbinSCRIPTS install-schemaDATA \ install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \ install-strip install-taskSCRIPTS installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ @@ -9024,8 +9047,9 @@ uninstall-initSCRIPTS uninstall-nodist_propertyDATA \ uninstall-perlSCRIPTS uninstall-propertyDATA \ uninstall-sampledataDATA uninstall-sbinPROGRAMS \ - uninstall-schemaDATA uninstall-serverLTLIBRARIES \ - uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS + uninstall-sbinSCRIPTS uninstall-schemaDATA \ + uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \ + uninstall-taskSCRIPTS dirver.h: Makefile

1 0

[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts Util.pm.in, 1.9, 1.10
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17397 Modified Files: Util.pm.in Log Message: Resolves: bug 248820 Bug Description: quick install failed when login userid doesn't match install user's id Reviewed by: me Fix Description: getlogin returns the _login_ ID which is the initial login id (from utmp). We want the username of the effective user ID, so I just needed to change getLogin to do that. Platforms tested: RHEL4 Flag Day: no Doc impact: no Index: Util.pm.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Util.pm.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Util.pm.in 13 Jul 2007 19:51:48 -0000 1.9 +++ Util.pm.in 19 Jul 2007 00:23:40 -0000 1.10 @@ -111,8 +111,11 @@ return $servid =~ /^[$validchars]+$/o; } +# we want the name of the effective user id of this process e.g. if someone did +# an su root, we want getLogin to return "root" not the originating id (getlogin) +# in perl, $> is the effective numeric user id - we need to turn it into a string sub getLogin { - return getlogin || (getpwuid($>))[0] || $ENV{USER} || die "Error: could not determine the current user ID: $!"; + return (getpwuid($>))[0] || $ENV{USER} || die "Error: could not determine the current user ID: $!"; } sub isValidUser {

1 0

[Fedora-directory-commits] adminserver dirver.pl,1.3,NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28836 Removed Files: dirver.pl Log Message: remove obsolete files --- dirver.pl DELETED ---

1 0

[Fedora-directory-commits] adminserver/lib/libsi18n gsadmserv.h, 1.5, 1.6 Makefile, 1.8, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/lib/libsi18n In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/lib/libsi18n Modified Files: gsadmserv.h Removed Files: Makefile Log Message: remove obsolete files and directories Index: gsadmserv.h =================================================================== RCS file: /cvs/dirsec/adminserver/lib/libsi18n/gsadmserv.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gsadmserv.h 10 Oct 2006 19:56:30 -0000 1.5 +++ gsadmserv.h 18 Jul 2007 22:10:31 -0000 1.6 @@ -24,9 +24,7 @@ #ifdef RESOURCE_STR #undef LIBRARY_NAME -#include "../admserv/src/dbtadmserv.h" -#undef LIBRARY_NAME -#include "../admserv/cgi-src/dbtcgiadmin.h" +#include "../admserv/cgi-src40/dbtcgiadmin.h" #undef LIBRARY_NAME #include "base/dbtbase.h" #undef LIBRARY_NAME --- Makefile DELETED ---

1 0

[Fedora-directory-commits] adminserver/lib/libadmin Makefile, 1.7, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/lib/libadmin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/lib/libadmin Removed Files: Makefile Log Message: remove obsolete files and directories --- Makefile DELETED ---

1 0

[Fedora-directory-commits] adminserver/lib/ldaputil Makefile, 1.6, NONE cert.c, 1.3, NONE certmap.c, 1.5, NONE certmap.conf, 1.2, NONE dbconf.c, 1.3, NONE encode.c, 1.3, NONE errors.c, 1.3, NONE init.c, 1.5, NONE ldapauth.c, 1.4, NONE ldapdb.c, 1.3, NONE ldapu-changes.html, 1.2, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/lib/ldaputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/lib/ldaputil Removed Files: Makefile cert.c certmap.c certmap.conf dbconf.c encode.c errors.c init.c ldapauth.c ldapdb.c ldapu-changes.html Log Message: remove obsolete files and directories --- Makefile DELETED --- --- cert.c DELETED --- --- certmap.c DELETED --- --- certmap.conf DELETED --- --- dbconf.c DELETED --- --- encode.c DELETED --- --- errors.c DELETED --- --- init.c DELETED --- --- ldapauth.c DELETED --- --- ldapdb.c DELETED --- --- ldapu-changes.html DELETED ---

1 0

[Fedora-directory-commits] adminserver/lib/ldaputil/utest Makefile, 1.4, NONE auth.cpp, 1.4, NONE authtest, 1.4, NONE certmap.conf, 1.4, NONE dblist.conf, 1.1.1.1, NONE example.c, 1.3, NONE plugin.c, 1.3, NONE plugin.h, 1.3, NONE stubs.c, 1.4, NONE stubs.cpp, 1.4, NONE test.ref, 1.3, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/lib/ldaputil/utest In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/lib/ldaputil/utest Removed Files: Makefile auth.cpp authtest certmap.conf dblist.conf example.c plugin.c plugin.h stubs.c stubs.cpp test.ref Log Message: remove obsolete files and directories --- Makefile DELETED --- --- auth.cpp DELETED --- --- authtest DELETED --- --- certmap.conf DELETED --- --- dblist.conf DELETED --- --- example.c DELETED --- --- plugin.c DELETED --- --- plugin.h DELETED --- --- stubs.c DELETED --- --- stubs.cpp DELETED --- --- test.ref DELETED ---

1 0

[Fedora-directory-commits] adminserver/lib/ldaputil/examples Certmap.mak, 1.3, NONE Makefile, 1.3, NONE README, 1.1.1.1, NONE init.c, 1.3, NONE plugin.c, 1.3, NONE plugin.h, 1.3, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/lib/ldaputil/examples In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/lib/ldaputil/examples Removed Files: Certmap.mak Makefile README init.c plugin.c plugin.h Log Message: remove obsolete files and directories --- Certmap.mak DELETED --- --- Makefile DELETED --- --- README DELETED --- --- init.c DELETED --- --- plugin.c DELETED --- --- plugin.h DELETED ---

1 0

[Fedora-directory-commits] adminserver/lib/base Makefile,1.9,NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/lib/base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/lib/base Removed Files: Makefile Log Message: remove obsolete files and directories --- Makefile DELETED ---

1 0

[Fedora-directory-commits] adminserver/include/ldaputil cert.h, 1.3, NONE certmap.h, 1.3, NONE dbconf.h, 1.3, NONE encode.h, 1.3, NONE errors.h, 1.3, NONE extcmap.h, 1.3, NONE init.h, 1.3, NONE ldapauth.h, 1.3, NONE ldaputil.h, 1.3, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/include/ldaputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/include/ldaputil Removed Files: cert.h certmap.h dbconf.h encode.h errors.h extcmap.h init.h ldapauth.h ldaputil.h Log Message: remove obsolete files and directories --- cert.h DELETED --- --- certmap.h DELETED --- --- dbconf.h DELETED --- --- encode.h DELETED --- --- errors.h DELETED --- --- extcmap.h DELETED --- --- init.h DELETED --- --- ldapauth.h DELETED --- --- ldaputil.h DELETED ---

1 0

[Fedora-directory-commits] adminserver/include/public/base Makefile, 1.5, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/include/public/base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/include/public/base Removed Files: Makefile Log Message: remove obsolete files and directories --- Makefile DELETED ---

1 0

[Fedora-directory-commits] adminserver/include/public Makefile, 1.6, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/include/public In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/include/public Removed Files: Makefile Log Message: remove obsolete files and directories --- Makefile DELETED ---

1 0

[Fedora-directory-commits] adminserver/base/nt Makefile, 1.8, NONE base.inf, 1.6, NONE fixPI.pl, 1.3, NONE insbase.c, 1.4, NONE insbase.h, 1.3, NONE insbase.rc, 1.1.1.1, NONE resource.h, 1.1.1.1, NONE wizard.bmp, 1.1.1.1, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/base/nt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/base/nt Removed Files: Makefile base.inf fixPI.pl insbase.c insbase.h insbase.rc resource.h wizard.bmp Log Message: remove obsolete files and directories --- Makefile DELETED --- --- base.inf DELETED --- --- fixPI.pl DELETED --- --- insbase.c DELETED --- --- insbase.h DELETED --- --- insbase.rc DELETED --- --- resource.h DELETED --- --- wizard.bmp DELETED ---

1 0

[Fedora-directory-commits] adminserver/include/base Makefile, 1.5, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/include/base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/include/base Removed Files: Makefile Log Message: remove obsolete files and directories --- Makefile DELETED ---

1 0

[Fedora-directory-commits] adminserver/i18npkg/apollo AdjustInf.pl, 1.3, NONE CheckInfZip.pl, 1.3, NONE GetL10nFiles.pl, 1.3, NONE LocaleToLocale.pl, 1.3, NONE MakeL10nPkg.pl, 1.3, NONE Makefile, 1.5, NONE PackageL10n.pl, 1.3, NONE UnpackageL10n.pl, 1.3, NONE htmlsplit.rules, 1.2, NONE server.flt, 1.6, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/i18npkg/apollo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/i18npkg/apollo Removed Files: AdjustInf.pl CheckInfZip.pl GetL10nFiles.pl LocaleToLocale.pl MakeL10nPkg.pl Makefile PackageL10n.pl UnpackageL10n.pl htmlsplit.rules server.flt Log Message: remove obsolete files and directories --- AdjustInf.pl DELETED --- --- CheckInfZip.pl DELETED --- --- GetL10nFiles.pl DELETED --- --- LocaleToLocale.pl DELETED --- --- MakeL10nPkg.pl DELETED --- --- Makefile DELETED --- --- PackageL10n.pl DELETED --- --- UnpackageL10n.pl DELETED --- --- htmlsplit.rules DELETED --- --- server.flt DELETED ---

1 0

[Fedora-directory-commits] adminserver/base LICENSE.TXT, 1.4, NONE Makefile, 1.18, NONE base.inf, 1.6, NONE fixPI.pl, 1.3, NONE svrcore.inf, 1.5, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/base Removed Files: LICENSE.TXT Makefile base.inf fixPI.pl svrcore.inf Log Message: remove obsolete files and directories --- LICENSE.TXT DELETED --- --- Makefile DELETED --- --- base.inf DELETED --- --- fixPI.pl DELETED --- --- svrcore.inf DELETED ---

1 0

[Fedora-directory-commits] adminserver/admserv/icons40 Makefile, 1.5, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/icons40 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/admserv/icons40 Removed Files: Makefile Log Message: remove obsolete files and directories --- Makefile DELETED ---

1 0

[Fedora-directory-commits] adminserver/admserv/schema/ldif Makefile, 1.6, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/schema/ldif In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/admserv/schema/ldif Removed Files: Makefile Log Message: remove obsolete files and directories --- Makefile DELETED ---

1 0

[Fedora-directory-commits] adminserver/admserv/src dbtadmserv.h, 1.3, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/admserv/src Removed Files: dbtadmserv.h Log Message: remove obsolete files and directories --- dbtadmserv.h DELETED ---

1 0

[Fedora-directory-commits] adminserver/admserv/html Makefile, 1.7, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/html In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/admserv/html Removed Files: Makefile Log Message: remove obsolete files and directories --- Makefile DELETED ---

1 0

[Fedora-directory-commits] adminserver/admserv/cgi-src40 dbtcgiadmin.h, NONE, 1.1 dsconfig.c, 1.8, 1.9 ugdsconfig.c, 1.8, 1.9
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cgi-src40 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/admserv/cgi-src40 Modified Files: dsconfig.c ugdsconfig.c Added Files: dbtcgiadmin.h Log Message: remove obsolete files and directories --- NEW FILE dbtcgiadmin.h --- /** BEGIN COPYRIGHT BLOCK * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 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 **/ #define LIBRARY_NAME "cgiadmin" static char dbtcgiadminid[] = "$DBT: cgiadmin referenced v1 $"; #include "i18n.h" BEGIN_STR(cgiadmin) ResDef( DBT_LibraryID_, -1, dbtcgiadminid )/* extracted from dbtcgiadmin.h*/ ResDef( DBT_missingRequestMethod_, 1, "Missing REQUEST_METHOD" )/*extracted from cladd.c*/ ResDef( DBT_thisShouldOnlyBeInvokedAsCgiProg_, 2, "This should only be invoked as CGI program" )/*extracted from cladd.c*/ ResDef( DBT_missingAdmservRoot_, 3, "Missing ADMSERV_ROOT" )/*extracted from cladd.c*/ ResDef( DBT_thisShouldOnlyBeInvokedAsCgiProg_1, 4, "This should only be invoked as CGI program" )/*extracted from cladd.c*/ ResDef( DBT_unrecognizedRequestType_, 5, "Unrecognized request type." )/*extracted from cladd.c*/ ResDef( DBT_startup_, 6, "Startup" )/*extracted from cladd.c*/ ResDef( DBT_failedToInitializeWinsock_, 7, "Failed to initialize WinSock" )/*extracted from cladd.c*/ ResDef( DBT_badFile_, 8, "Bad file" )/*extracted from cladd.c*/ ResDef( DBT_expectedServersLst_, 9, "Expected servers.lst" )/*extracted from cladd.c*/ ResDef( DBT_clusterMergeProductLstFromS_, 10, "Cluster: merge product.lst from %s" )/*extracted from cladd.c*/ ResDef( DBT_IObtainingProductInformationFrom_, 11, "Obtaining product information from %s://%s:%d \n" )/*extracted from cladd.c*/ ResDef( DBT_updatedSBrN_, 12, "Updated %s \n" )/*extracted from cladd.c*/ ResDef( DBT_badFile_1, 13, "Bad file" )/*extracted from cladd.c*/ ResDef( DBT_expectedServersInstanceLst_, 14, "Expected servers-instance.lst" )/*extracted from cladd.c*/ ResDef( DBT_warningSAlreadyExistsInformation_, 15, "Warning: %s already exists, information not added \n" )/*extracted from cladd.c*/ ResDef( DBT_errorFailedToCreateFileSBrN_, 16, "Error: failed to create file %s \n" )/*extracted from cladd.c*/ ResDef( DBT_warningDirectorySWillBeRemovedBe_, 17, "Warning: directory %s will be removed because of above error \n" )/*extracted from cladd.c*/ ResDef( DBT_errorSSErrnoDBrN_, 19, "Error: %s %s (errno = %d) \n" )/*extracted from cladd.c*/ ResDef( DBT_errorSSSBrN_, 20, "Error: %s %s, %s \n" )/*extracted from cladd.c*/ ResDef( DBT_allowAllOperations_, 21, "ALLOW ALL OPERATIONS" )/*extracted from snmpcomm.c*/ ResDef( DBT_allowGetOperations_, 22, "ALLOW GET OPERATIONS" )/*extracted from snmpcomm.c*/ ResDef( DBT_allowSetOperations_, 23, "ALLOW SET OPERATIONS" )/*extracted from snmpcomm.c*/ ResDef( DBT_youAccessedThisFormWithAnInvalid_, 24, "You accessed this form with an invalid query string." )/*extracted from snmpcomm.c*/ ResDef( DBT_communityHasBeenRemoved_, 25, "community has been removed." )/*extracted from snmpcomm.c*/ ResDef( DBT_communityStrings_, 26, "Community Strings" )/*extracted from snmpcomm.c*/ ResDef( DBT_editACommunity_, 27, "Edit a Community" )/*extracted from snmpcomm.c*/ ResDef( DBT_addAnotherCommunity_, 28, "Add Another Community" )/*extracted from snmpcomm.c*/ ResDef( DBT_edit_, 30, "Edit" )/*extracted from snmpcomm.c*/ ResDef( DBT_remove_, 31, "Remove" )/*extracted from snmpcomm.c*/ ResDef( DBT_doYouReallyWantToRemoveThisEntry_, 32, "Do you really want to remove this entry?" )/*extracted from snmpcomm.c*/ ResDef( DBT_BCommunityBSN_, 33, "Community: %s\n" )/*extracted from snmpcomm.c*/ ResDef( DBT_BrBOperationBSN_, 34, " Operation: %s\n" )/*extracted from snmpcomm.c*/ ResDef( DBT_noCommunitiesExist_, 35, "No communities exist." )/*extracted from snmpcomm.c*/ ResDef( DBT_youShouldEnterACommunityString_, 36, "You should enter a community string." )/*extracted from snmpcomm.c*/ ResDef( DBT_youShouldEnterOperationYouWantFo_, 37, "You should enter operation you want for this community." )/*extracted from snmpcomm.c*/ ResDef( DBT_theCommunityEntryHasBeenChanged_, 38, "the community entry has been changed" )/*extracted from snmpcomm.c*/ ResDef( DBT_SHasBeenAdded_, 39, "%s has been added" )/*extracted from snmpcomm.c*/ ResDef( DBT_failsToStartUpMasterAgent_, 40, "fails to start up master agent" )/*extracted from snmpcomm.c*/ ResDef( DBT_pleaseReferToDocumentsToStartIt_, 41, "Please refer to documents to start it" )/*extracted from snmpcomm.c*/ ResDef( DBT_masterAgentStartUp_, 42, "master agent start up" )/*extracted from snmpcomm.c*/ ResDef( DBT_canTOpenConfigFile_, 43, "can't open config file" )/*extracted from snmpcomm.c*/ ResDef( DBT_openTempFileFails_, 44, "open temp file fails" )/*extracted from snmpcomm.c*/ ResDef( DBT_openConfigFails_, 45, "open CONFIG fails" )/*extracted from snmpcomm.c*/ ResDef( DBT_openConfigFails_1, 46, "open CONFIG fails" )/*extracted from snmpcomm.c*/ ResDef( DBT_noPermissionToStartMasterAgent_, 47, "No permission to start master agent" )/*extracted from snmpcomm.c*/ ResDef( DBT_youMustBeRunningAsSuperUserPleas_, 48, "You must be running as super user. Please refer to documents" )/*extracted from snmpcomm.c*/ ResDef( DBT_canTGetTcpProtocolEntryN_, 49, "can't get tcp protocol entry\n" )/*extracted from snmpcomm.c*/ ResDef( DBT_canTCreateASockect_, 50, "can't create a sockect" )/*extracted from snmpcomm.c*/ ResDef( DBT_pleaseReferToDocumentsForItsConf_, 51, "Please refer to documents for its configuration" )/*extracted from snmpcomm.c*/ ResDef( DBT_aSmuxMasterAgentIsRunningOrTheSm_, 52, "a smux master agent is running or the smux port is not free yet" )/*extracted from snmpcomm.c*/ ResDef( DBT_pleaseReferToDocumentsForItsConf_1, 53, "Please refer to documents for its configuration" )/*extracted from snmpcomm.c*/ ResDef( DBT_canTGetUdpProtocolEntryN_, 54, "can't get udp protocol entry\n" )/*extracted from snmpcomm.c*/ ResDef( DBT_canTCreateASocket_, 55, "can't create a socket" )/*extracted from snmpcomm.c*/ ResDef( DBT_pleaseReferToDocumentsForItsConf_2, 56, "Please refer to documents for its configuration" )/*extracted from snmpcomm.c*/ ResDef( DBT_aSnmpdIsRunningOrSnmpPortIsNotFr_, 57, "a snmpd is running or snmp port is not free yet" )/*extracted from snmpcomm.c*/ ResDef( DBT_pleaseReferToDocumentsForItsConf_3, 58, "Please refer to documents for its configuration" )/*extracted from snmpcomm.c*/ ResDef( DBT_canTGetUdpProtocolEntryN_1, 59, "can't get udp protocol entry\n" )/*extracted from snmpcomm.c*/ ResDef( DBT_canTCreateASocket_1, 60, "can't create a socket" )/*extracted from snmpcomm.c*/ ResDef( DBT_pleaseReferToDocumentsForItsConf_4, 61, "Please refer to documents for its configuration" )/*extracted from snmpcomm.c*/ ResDef( DBT_failToStart_, 62, "Fail to start" )/*extracted from snmpcomm.c*/ ResDef( DBT_pleaseReferToDocumentsForItsConf_5, 63, "Please refer to documents for its configuration" )/*extracted from snmpcomm.c*/ END_STR(cgiadmin) Index: dsconfig.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/dsconfig.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dsconfig.c 11 May 2007 19:44:05 -0000 1.8 +++ dsconfig.c 18 Jul 2007 22:10:22 -0000 1.9 @@ -44,10 +44,6 @@ #include "libadmin/libadmin.h" #include "string.h" -#include "ldaputil/errors.h" -#include "ldaputil/ldaputil.h" -#include "ldaputil/dbconf.h" - #include "libadminutil/resource.h" #include "libadminutil/admutil.h" #include "libadminutil/distadm.h" Index: ugdsconfig.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ugdsconfig.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ugdsconfig.c 11 May 2007 19:44:05 -0000 1.8 +++ ugdsconfig.c 18 Jul 2007 22:10:22 -0000 1.9 @@ -50,10 +50,6 @@ #include "libadmin/libadmin.h" #include "string.h" -#include "ldaputil/errors.h" -#include "ldaputil/ldaputil.h" -#include "ldaputil/dbconf.h" - #include "libadminutil/admutil.h" #include "libadminutil/resource.h" #include "libadminutil/admutil.h"

1 0

[Fedora-directory-commits] adminserver/admserv/console/cmdln Makefile, 1.6, NONE admconfig, 1.6, NONE admconfig_testscript, 1.2, NONE admconfig_testscript.bat, 1.3, NONE testinput, 1.1.1.1, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/console/cmdln In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/admserv/console/cmdln Removed Files: Makefile admconfig admconfig_testscript admconfig_testscript.bat testinput Log Message: remove obsolete files and directories --- Makefile DELETED --- --- admconfig DELETED --- --- admconfig_testscript DELETED --- --- admconfig_testscript.bat DELETED --- --- testinput DELETED ---

1 0

[Fedora-directory-commits] adminserver/admserv/cgi-src dbtcgiadmin.h, 1.3, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cgi-src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/admserv/cgi-src Removed Files: dbtcgiadmin.h Log Message: remove obsolete files and directories --- dbtcgiadmin.h DELETED ---

1 0

[Fedora-directory-commits] adminserver/admserv/cfgstuff Makefile, 1.5, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/admserv/cfgstuff Removed Files: Makefile Log Message: remove obsolete files and directories --- Makefile DELETED ---

1 0

[Fedora-directory-commits] adminserver bchecker.ini, 1.1.1.1, NONE buildpaths.mk, 1.11, NONE components.mk, 1.55, NONE internal_buildpaths.mk, 1.6, NONE nsarch, 1.5, NONE nsarch.bat, 1.1.1.1, NONE nsconfig.mk, 1.33, NONE nsdefs.mk, 1.11, NONE nsperl.mk, 1.6, NONE ntbomb.pl, 1.3, NONE ntversion.pl, 1.4, NONE pumpkin.pl, 1.3, NONE webint.mk, 1.1, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver Removed Files: bchecker.ini buildpaths.mk components.mk internal_buildpaths.mk nsarch nsarch.bat nsconfig.mk nsdefs.mk nsperl.mk ntbomb.pl ntversion.pl pumpkin.pl webint.mk Log Message: remove obsolete files and directories --- bchecker.ini DELETED --- --- buildpaths.mk DELETED --- --- components.mk DELETED --- --- internal_buildpaths.mk DELETED --- --- nsarch DELETED --- --- nsarch.bat DELETED --- --- nsconfig.mk DELETED --- --- nsdefs.mk DELETED --- --- nsperl.mk DELETED --- --- ntbomb.pl DELETED --- --- ntversion.pl DELETED --- --- pumpkin.pl DELETED --- --- webint.mk DELETED ---

1 0

[Fedora-directory-commits] adminserver/admserv/newinst/src migrate-ds-admin.pl.in, 1.4, 1.5 setup-ds-admin.pl.in, 1.8, 1.9
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/newinst/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5779/adminserver/admserv/newinst/src Modified Files: migrate-ds-admin.pl.in setup-ds-admin.pl.in Log Message: Resolves: bug 248145 Bug Description: Replace ds_newinst binary with perl script - remove dead code Reviewed by: nhosoi (Thanks!) Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts. Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: no Index: migrate-ds-admin.pl.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/migrate-ds-admin.pl.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- migrate-ds-admin.pl.in 13 Jul 2007 18:39:15 -0000 1.4 +++ migrate-ds-admin.pl.in 18 Jul 2007 20:43:14 -0000 1.5 @@ -60,7 +60,7 @@ if (!$mig->{inf}->{General}->{ConfigDirectoryAdminPwd}) { $mig->msg('error_configds_adminpwd_required'); - exit 1; + $mig->doExit(1); } # first, migrate directory server instances @@ -68,7 +68,7 @@ # should have already migrated the config DS $mig->msg('begin_ds_migration', $mig->{oldsroot}); if (!migrateDS($mig)) { - exit 1; + $mig->doExit(1); } # if the config ds is on the local machine, shut down the old one @@ -83,7 +83,7 @@ # next, migrate the admin server - this also registers the directory servers $mig->msg('begin_as_migration', $mig->{oldsroot}); if (!migrateAdminServer($mig)) { - exit 1; + $mig->doExit(1); } # next, register/update the new directory servers @@ -94,17 +94,17 @@ $mig->{configdir}, @{$mig->{instances}})) { $mig->msg($FATAL, @errs); - exit 1; + $mig->doExit(1); } $mig->msg('end_dsadmin_migration'); +$mig->doExit(0); + END { if ($mig) { if (!$mig->{keep}) { unlink $mig->{inffile}; } - - $mig->doExit(); } } Index: setup-ds-admin.pl.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.pl.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- setup-ds-admin.pl.in 13 Jul 2007 18:39:15 -0000 1.8 +++ setup-ds-admin.pl.in 18 Jul 2007 20:43:14 -0000 1.9 @@ -123,7 +123,7 @@ my $rc = $dialogmgr->run(); if ($rc) { - $setup->doExit(); + $setup->doExit($rc); } } @@ -150,7 +150,7 @@ if (@errs) { $setup->msg(@errs); $setup->msg($FATAL, 'error_creating_dsinstance', $setup->{inf}->{slapd}->{ServerIdentifier}); - exit 1; + $setup->doExit(1); } else { $setup->msg('created_dsinstance', $setup->{inf}->{slapd}->{ServerIdentifier}); } @@ -161,7 +161,7 @@ if (!createConfigDS($setup->{inf}, \@errs)) { $setup->msg($FATAL, @errs); $setup->msg($FATAL, 'error_create_configds'); - exit 1; + $setup->doExit(1); } } else @@ -170,7 +170,7 @@ if (!createSubDS($setup->{inf}, \@errs)) { $setup->msg($FATAL, @errs); $setup->msg($FATAL, 'error_create_configds'); - exit 1; + $setup->doExit(1); } } @@ -180,7 +180,7 @@ $setup->{inf})) { $setup->msg(@errs); $setup->msg($FATAL, 'error_register_dirserver'); - exit 1; + $setup->doExit(1); } @@ -188,23 +188,21 @@ if (!$setup->{reconfigas}) { if (!createAdminServer($setup)) { $setup->msg($FATAL, 'error_create_adminserver'); - exit 1; + $setup->doExit(1); } } else { if (!reconfigAdminServer($setup)) { $setup->msg($FATAL, 'error_reconfig_adminserver'); - exit 1; + $setup->doExit(1); } } -$setup->msg($SUCCESS, 'setup_complete'); +$setup->doExit(0); END { if ($setup) { if (!$setup->{keep}) { unlink $setup->{inffile}; } - - $setup->doExit(); } }

1 0

[Fedora-directory-commits] ldapserver/wrappers ds_newinst.in, 1.4, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/wrappers In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/wrappers Removed Files: ds_newinst.in Log Message: Resolves: bug 248145 Bug Description: Replace ds_newinst binary with perl script - remove dead code Reviewed by: nhosoi (Thanks!) Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts. Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: no --- ds_newinst.in DELETED ---

1 0

[Fedora-directory-commits] ldapserver/ldap/clients Makefile, 1.8, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/clients In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/ldap/clients Removed Files: Makefile Log Message: Resolves: bug 248145 Bug Description: Replace ds_newinst binary with perl script - remove dead code Reviewed by: nhosoi (Thanks!) Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts. Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: no --- Makefile DELETED ---

1 0

[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts Setup.pm.in, 1.8, 1.9 migrate-ds.pl.in, 1.2, 1.3 setup-ds.pl.in, 1.6, 1.7 template-migrate5to7, 1.5, NONE template-migrate6to7, 1.7, NONE template-migrateInstance7, 1.6, NONE template-migrateTo7, 1.6, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/ldap/admin/src/scripts Modified Files: Setup.pm.in migrate-ds.pl.in setup-ds.pl.in Removed Files: template-migrate5to7 template-migrate6to7 template-migrateInstance7 template-migrateTo7 Log Message: Resolves: bug 248145 Bug Description: Replace ds_newinst binary with perl script - remove dead code Reviewed by: nhosoi (Thanks!) Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts. Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: no Index: Setup.pm.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Setup.pm.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Setup.pm.in 29 Jun 2007 21:12:21 -0000 1.8 +++ Setup.pm.in 18 Jul 2007 20:37:11 -0000 1.9 @@ -215,8 +215,17 @@ sub doExit { my $self = shift; - $self->msg($FATAL, 'setup_exiting', $self->{log}->{filename}); - exit 1; + my $code = shift; + if (!defined($code)) { + $code = 1; + } + + if ($code) { + $self->msg($FATAL, 'setup_exiting', $self->{log}->{filename}); + } else { + $self->msg($SUCCESS, 'setup_exiting', $self->{log}->{filename}); + } + exit $code; } # get a list of the directory servers in configdir @@ -238,3 +247,10 @@ # Mandatory TRUE return value. # 1; + +# emacs settings +# Local Variables: +# mode:perl +# indent-tabs-mode: nil +# tab-width: 4 +# End: Index: migrate-ds.pl.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/migrate-ds.pl.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- migrate-ds.pl.in 13 Jul 2007 18:35:32 -0000 1.2 +++ migrate-ds.pl.in 18 Jul 2007 20:37:11 -0000 1.3 @@ -62,16 +62,15 @@ $mig->msg('begin_ds_migration', $mig->{oldsroot}); if (!migrateDS($mig)) { - exit 1; + $mig->doExit(1); } $mig->msg('end_ds_migration'); +$mig->doExit(0); END { if ($mig) { if (!$mig->{keep}) { unlink $mig->{inffile}; } - - $mig->doExit(); } } Index: setup-ds.pl.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/setup-ds.pl.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- setup-ds.pl.in 13 Jul 2007 18:35:32 -0000 1.6 +++ setup-ds.pl.in 18 Jul 2007 20:37:11 -0000 1.7 @@ -76,17 +76,18 @@ $setup->msg(@errs); $setup->msg($FATAL, 'error_creating_dsinstance', $setup->{inf}->{slapd}->{ServerIdentifier}); + $setup->doExit(1); } else { $setup->msg('created_dsinstance', $setup->{inf}->{slapd}->{ServerIdentifier}); } +$setup->doExit(0); + END { if ($setup) { if (!$setup->{keep}) { unlink $setup->{inffile}; } - - $setup->doExit(); } } --- template-migrate5to7 DELETED --- --- template-migrate6to7 DELETED --- --- template-migrateInstance7 DELETED --- --- template-migrateTo7 DELETED ---

1 0

[Fedora-directory-commits] ldapserver/ldap/admin/src CGI_ENV, 1.4, NONE Cgi.pm, 1.4, NONE cfg_sspt.c, 1.13, NONE cfg_sspt.h, 1.5, NONE configure_instance.cpp, 1.11, NONE configure_instance.h, 1.5, NONE create_instance.c, 1.63, NONE create_instance.h, 1.18, NONE ds_newinst.c, 1.6, NONE ds_newinst.pl.in, 1.10, NONE ds_remove_uninst.cpp, 1.8, NONE ds_remove_uninst.h, 1.5, NONE fix_secmod_db_64, 1.3, NONE getConfigInfo, 1.5, NONE import2info, 1.5, NONE init_ds_env.c, 1.7, NONE init_ds_env.h, 1.5, NONE install_k
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/ldap/admin/src Removed Files: CGI_ENV Cgi.pm cfg_sspt.c cfg_sspt.h configure_instance.cpp configure_instance.h create_instance.c create_instance.h ds_newinst.c ds_newinst.pl.in ds_remove_uninst.cpp ds_remove_uninst.h fix_secmod_db_64 getConfigInfo import2info init_ds_env.c init_ds_env.h install_keywords.h instindex.cpp key.rc latest_file.c migrateInstance migrateLocalDB migratePwdFile migrateTo11.in migrateTo4 migratedsgw namegen.c script-gen.c sec_tools_wrapper uname.lib updatedsgw Log Message: Resolves: bug 248145 Bug Description: Replace ds_newinst binary with perl script - remove dead code Reviewed by: nhosoi (Thanks!) Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts. Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: no --- CGI_ENV DELETED --- --- Cgi.pm DELETED --- --- cfg_sspt.c DELETED --- --- cfg_sspt.h DELETED --- --- configure_instance.cpp DELETED --- --- configure_instance.h DELETED --- --- create_instance.c DELETED --- --- create_instance.h DELETED --- --- ds_newinst.c DELETED --- --- ds_newinst.pl.in DELETED --- --- ds_remove_uninst.cpp DELETED --- --- ds_remove_uninst.h DELETED --- --- fix_secmod_db_64 DELETED --- --- getConfigInfo DELETED --- --- import2info DELETED --- --- init_ds_env.c DELETED --- --- init_ds_env.h DELETED --- --- install_keywords.h DELETED --- --- instindex.cpp DELETED --- --- key.rc DELETED --- --- latest_file.c DELETED --- --- migrateInstance DELETED --- --- migrateLocalDB DELETED --- --- migratePwdFile DELETED --- --- migrateTo11.in DELETED --- --- migrateTo4 DELETED --- --- migratedsgw DELETED --- --- namegen.c DELETED --- --- script-gen.c DELETED --- --- sec_tools_wrapper DELETED --- --- uname.lib DELETED --- --- updatedsgw DELETED ---

1 0

[Fedora-directory-commits] ldapserver/l10n/dirserv/ja ns-slapd.txt, 1.4, NONE ns-slapd.txt.eucjp, 1.4, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/l10n/dirserv/ja In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/l10n/dirserv/ja Removed Files: ns-slapd.txt ns-slapd.txt.eucjp Log Message: Resolves: bug 248145 Bug Description: Replace ds_newinst binary with perl script - remove dead code Reviewed by: nhosoi (Thanks!) Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts. Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: no --- ns-slapd.txt DELETED --- --- ns-slapd.txt.eucjp DELETED ---

1 0

[Fedora-directory-commits] ldapserver/ldap/admin/include dsalib.h, 1.8, NONE dsalib_pw.h, 1.5, NONE dsalib_schema.h, 1.5, NONE nterrors.h, 1.5, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/ldap/admin/include Removed Files: dsalib.h dsalib_pw.h dsalib_schema.h nterrors.h Log Message: Resolves: bug 248145 Bug Description: Replace ds_newinst binary with perl script - remove dead code Reviewed by: nhosoi (Thanks!) Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts. Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: no --- dsalib.h DELETED --- --- dsalib_pw.h DELETED --- --- dsalib_schema.h DELETED --- --- nterrors.h DELETED ---

1 0

[Fedora-directory-commits] ldapserver/ldap/admin/lib dsalib_conf.c, 1.8, NONE dsalib_confs.c, 1.8, NONE dsalib_db.c, 1.7, NONE dsalib_debug.c, 1.7, NONE dsalib_dn.c, 1.6, NONE dsalib_filename.c, 1.7, NONE dsalib_html.c, 1.6, NONE dsalib_ldif.c, 1.7, NONE dsalib_location.c, 1.9, NONE dsalib_pw.c, 1.7, NONE dsalib_tailf.c, 1.6, NONE dsalib_updown.c, 1.10, NONE dsalib_util.c, 1.9, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/ldap/admin/lib Removed Files: dsalib_conf.c dsalib_confs.c dsalib_db.c dsalib_debug.c dsalib_dn.c dsalib_filename.c dsalib_html.c dsalib_ldif.c dsalib_location.c dsalib_pw.c dsalib_tailf.c dsalib_updown.c dsalib_util.c Log Message: Resolves: bug 248145 Bug Description: Replace ds_newinst binary with perl script - remove dead code Reviewed by: nhosoi (Thanks!) Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts. Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: no --- dsalib_conf.c DELETED --- --- dsalib_confs.c DELETED --- --- dsalib_db.c DELETED --- --- dsalib_debug.c DELETED --- --- dsalib_dn.c DELETED --- --- dsalib_filename.c DELETED --- --- dsalib_html.c DELETED --- --- dsalib_ldif.c DELETED --- --- dsalib_location.c DELETED --- --- dsalib_pw.c DELETED --- --- dsalib_tailf.c DELETED --- --- dsalib_updown.c DELETED --- --- dsalib_util.c DELETED ---

1 0

[Fedora-directory-commits] ldapserver/l10n/dirserv/de ns-slapd.txt, 1.4, NONE ns-slapd.txt.iso8859, 1.4, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/l10n/dirserv/de In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/l10n/dirserv/de Removed Files: ns-slapd.txt ns-slapd.txt.iso8859 Log Message: Resolves: bug 248145 Bug Description: Replace ds_newinst binary with perl script - remove dead code Reviewed by: nhosoi (Thanks!) Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts. Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: no --- ns-slapd.txt DELETED --- --- ns-slapd.txt.iso8859 DELETED ---

1 0

[Fedora-directory-commits] ldapserver/l10n/dirserv/fr ns-slapd.txt, 1.4, NONE ns-slapd.txt.iso8859, 1.4, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/l10n/dirserv/fr In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/l10n/dirserv/fr Removed Files: ns-slapd.txt ns-slapd.txt.iso8859 Log Message: Resolves: bug 248145 Bug Description: Replace ds_newinst binary with perl script - remove dead code Reviewed by: nhosoi (Thanks!) Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts. Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: no --- ns-slapd.txt DELETED --- --- ns-slapd.txt.iso8859 DELETED ---

1 0

[Fedora-directory-commits] ldapserver/l10n/dirserv/es ns-slapd.txt, 1.4, NONE ns-slapd.txt.iso8859, 1.4, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/l10n/dirserv/es In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/l10n/dirserv/es Removed Files: ns-slapd.txt ns-slapd.txt.iso8859 Log Message: Resolves: bug 248145 Bug Description: Replace ds_newinst binary with perl script - remove dead code Reviewed by: nhosoi (Thanks!) Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts. Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: no --- ns-slapd.txt DELETED --- --- ns-slapd.txt.iso8859 DELETED ---

1 0

[Fedora-directory-commits] ldapserver/l10n/dirserv/en ns-slapd.txt, 1.4, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/l10n/dirserv/en In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/l10n/dirserv/en Removed Files: ns-slapd.txt Log Message: Resolves: bug 248145 Bug Description: Replace ds_newinst binary with perl script - remove dead code Reviewed by: nhosoi (Thanks!) Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts. Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: no --- ns-slapd.txt DELETED ---

1 0

[Fedora-directory-commits] ldapserver Makefile.am, 1.49, 1.50 aclocal.m4, 1.41, 1.42 configure, 1.52, 1.53 missing, 1.31, 1.32 install-sh, 1.31, 1.32 depcomp, 1.31, 1.32 compile, 1.31, 1.32 Makefile.in, 1.58, 1.59 config.sub, 1.30, 1.31 config.guess, 1.30, 1.31 bchecker.ini, 1.1.1.1, NONE nsarch, 1.7, NONE nsarch.bat, 1.4, NONE ntversion.pl, 1.5, NONE pumpkin.pl, 1.5, NONE
by Doctor Conrad 19 Jul '07

19 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver Modified Files: Makefile.am aclocal.m4 configure missing install-sh depcomp compile Makefile.in config.sub config.guess Removed Files: bchecker.ini nsarch nsarch.bat ntversion.pl pumpkin.pl Log Message: Resolves: bug 248145 Bug Description: Replace ds_newinst binary with perl script - remove dead code Reviewed by: nhosoi (Thanks!) Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts. Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: no Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- Makefile.am 13 Jul 2007 18:35:32 -0000 1.49 +++ Makefile.am 18 Jul 2007 20:37:07 -0000 1.50 @@ -90,10 +90,10 @@ #------------------------ sbin_PROGRAMS = ns-slapd -bin_PROGRAMS = dbscan-bin ds_newinst-bin dsktune-bin infadd-bin ldap-agent-bin \ +bin_PROGRAMS = dbscan-bin dsktune-bin infadd-bin ldap-agent-bin \ ldclt-bin ldif-bin migratecred-bin mmldif-bin pwdhash-bin rsearch-bin -server_LTLIBRARIES = libslapd.la libds_admin.la libns-dshttpd.la +server_LTLIBRARIES = libslapd.la libns-dshttpd.la # this is how to add optional plugins if enable_pam_passthru @@ -178,17 +178,14 @@ $(srcdir)/ldap/schema/60pam-plugin.ldif \ $(srcdir)/ldap/schema/99user.ldif -bin_SCRIPTS = $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \ +bin_SCRIPTS = ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \ wrappers/dbscan \ - wrappers/ds_newinst \ - ldap/admin/src/ds_newinst.pl \ wrappers/dsktune \ wrappers/infadd \ wrappers/ldap-agent \ wrappers/ldclt \ wrappers/ldif \ $(srcdir)/ldap/admin/src/logconv.pl \ - ldap/admin/src/migrateTo11 \ wrappers/migratecred \ wrappers/mmldif \ wrappers/pwdhash \ @@ -241,11 +238,7 @@ ldap/admin/src/scripts/template-ns-activate.pl \ ldap/admin/src/scripts/template-ns-inactivate.pl \ ldap/admin/src/scripts/template-ns-newpwpolicy.pl \ - ldap/admin/src/scripts/template-verify-db.pl \ - $(srcdir)/ldap/admin/src/scripts/template-migrate5to7 \ - $(srcdir)/ldap/admin/src/scripts/template-migrate6to7 \ - $(srcdir)/ldap/admin/src/scripts/template-migrateInstance7 \ - $(srcdir)/ldap/admin/src/scripts/template-migrateTo7 + ldap/admin/src/scripts/template-verify-db.pl init_SCRIPTS = wrappers/$(PACKAGE_NAME) @@ -305,26 +298,6 @@ #//////////////////////////////////////////////////////////////// #------------------------ -# libds_admin -#------------------------ -libds_admin_la_SOURCES = ldap/admin/lib/dsalib_conf.c \ - ldap/admin/lib/dsalib_confs.c \ - ldap/admin/lib/dsalib_db.c \ - ldap/admin/lib/dsalib_debug.c \ - ldap/admin/lib/dsalib_dn.c \ - ldap/admin/lib/dsalib_filename.c \ - ldap/admin/lib/dsalib_html.c \ - ldap/admin/lib/dsalib_ldif.c \ - ldap/admin/lib/dsalib_location.c \ - ldap/admin/lib/dsalib_pw.c \ - ldap/admin/lib/dsalib_tailf.c \ - ldap/admin/lib/dsalib_updown.c \ - ldap/admin/lib/dsalib_util.c - -libds_admin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -libds_admin_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK) - -#------------------------ # libns-dshttpd #------------------------ libns_dshttpd_la_SOURCES = lib/libaccess/access_plhash.cpp \ @@ -865,17 +838,6 @@ dbscan_bin_LDADD = $(NSPR_LINK) $(DB_LINK) #------------------------ -# ds_newinst -#------------------------ -ds_newinst_bin_SOURCES = ldap/admin/src/cfg_sspt.c \ - ldap/admin/src/create_instance.c \ - ldap/admin/src/ds_newinst.c \ - ldap/admin/src/script-gen.c - -ds_newinst_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -ds_newinst_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET) - -#------------------------ # dsktune #------------------------ dsktune_bin_SOURCES = ldap/systools/idsktune.c \ Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- Makefile.in 13 Jul 2007 18:35:32 -0000 1.58 +++ Makefile.in 18 Jul 2007 20:37:08 -0000 1.59 @@ -41,10 +41,9 @@ build_triplet = @build@ host_triplet = @host@ sbin_PROGRAMS = ns-slapd$(EXEEXT) -bin_PROGRAMS = dbscan-bin$(EXEEXT) ds_newinst-bin$(EXEEXT) \ - dsktune-bin$(EXEEXT) infadd-bin$(EXEEXT) \ - ldap-agent-bin$(EXEEXT) ldclt-bin$(EXEEXT) ldif-bin$(EXEEXT) \ - migratecred-bin$(EXEEXT) mmldif-bin$(EXEEXT) \ +bin_PROGRAMS = dbscan-bin$(EXEEXT) dsktune-bin$(EXEEXT) \ + infadd-bin$(EXEEXT) ldap-agent-bin$(EXEEXT) ldclt-bin$(EXEEXT) \ + ldif-bin$(EXEEXT) migratecred-bin$(EXEEXT) mmldif-bin$(EXEEXT) \ pwdhash-bin$(EXEEXT) rsearch-bin$(EXEEXT) noinst_PROGRAMS = makstrdb$(EXEEXT) @SOLARIS_TRUE@am__append_1 = ldap/servers/slapd/tools/ldclt/opCheck.c @@ -246,24 +245,6 @@ ldap/servers/plugins/dna/libdna_plugin_la-dna.lo libdna_plugin_la_OBJECTS = $(am_libdna_plugin_la_OBJECTS) @enable_dna_TRUE@am_libdna_plugin_la_rpath = -rpath $(serverplugindir) -libds_admin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -am_libds_admin_la_OBJECTS = \ - ldap/admin/lib/libds_admin_la-dsalib_conf.lo \ - ldap/admin/lib/libds_admin_la-dsalib_confs.lo \ - ldap/admin/lib/libds_admin_la-dsalib_db.lo \ - ldap/admin/lib/libds_admin_la-dsalib_debug.lo \ - ldap/admin/lib/libds_admin_la-dsalib_dn.lo \ - ldap/admin/lib/libds_admin_la-dsalib_filename.lo \ - ldap/admin/lib/libds_admin_la-dsalib_html.lo \ - ldap/admin/lib/libds_admin_la-dsalib_ldif.lo \ - ldap/admin/lib/libds_admin_la-dsalib_location.lo \ - ldap/admin/lib/libds_admin_la-dsalib_pw.lo \ - ldap/admin/lib/libds_admin_la-dsalib_tailf.lo \ - ldap/admin/lib/libds_admin_la-dsalib_updown.lo \ - ldap/admin/lib/libds_admin_la-dsalib_util.lo -libds_admin_la_OBJECTS = $(am_libds_admin_la_OBJECTS) libhttp_client_plugin_la_LIBADD = am_libhttp_client_plugin_la_OBJECTS = ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo \ ldap/servers/plugins/http/libhttp_client_plugin_la-http_impl.lo @@ -562,16 +543,6 @@ ldap/servers/slapd/tools/dbscan_bin-dbscan.$(OBJEXT) dbscan_bin_OBJECTS = $(am_dbscan_bin_OBJECTS) dbscan_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am_ds_newinst_bin_OBJECTS = \ - ldap/admin/src/ds_newinst_bin-cfg_sspt.$(OBJEXT) \ - ldap/admin/src/ds_newinst_bin-create_instance.$(OBJEXT) \ - ldap/admin/src/ds_newinst_bin-ds_newinst.$(OBJEXT) \ - ldap/admin/src/ds_newinst_bin-script-gen.$(OBJEXT) -ds_newinst_bin_OBJECTS = $(am_ds_newinst_bin_OBJECTS) -ds_newinst_bin_DEPENDENCIES = libds_admin.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) am_dsktune_bin_OBJECTS = ldap/systools/idsktune.$(OBJEXT) \ ldap/systools/pio.$(OBJEXT) dsktune_bin_OBJECTS = $(am_dsktune_bin_OBJECTS) @@ -746,7 +717,7 @@ $(libchainingdb_plugin_la_SOURCES) \ $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) \ $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) \ - $(libdna_plugin_la_SOURCES) $(libds_admin_la_SOURCES) \ + $(libdna_plugin_la_SOURCES) \ $(libhttp_client_plugin_la_SOURCES) \ $(libns_dshttpd_la_SOURCES) \ $(libpam_passthru_plugin_la_SOURCES) \ @@ -758,10 +729,9 @@ $(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) \ $(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) \ $(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) \ - $(dbscan_bin_SOURCES) $(ds_newinst_bin_SOURCES) \ - $(dsktune_bin_SOURCES) $(infadd_bin_SOURCES) \ - $(ldap_agent_bin_SOURCES) $(ldclt_bin_SOURCES) \ - $(ldif_bin_SOURCES) $(makstrdb_SOURCES) \ + $(dbscan_bin_SOURCES) $(dsktune_bin_SOURCES) \ + $(infadd_bin_SOURCES) $(ldap_agent_bin_SOURCES) \ + $(ldclt_bin_SOURCES) $(ldif_bin_SOURCES) $(makstrdb_SOURCES) \ $(migratecred_bin_SOURCES) $(mmldif_bin_SOURCES) \ $(ns_slapd_SOURCES) $(pwdhash_bin_SOURCES) \ $(rsearch_bin_SOURCES) @@ -772,7 +742,7 @@ $(libchainingdb_plugin_la_SOURCES) \ $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) \ $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) \ - $(libdna_plugin_la_SOURCES) $(libds_admin_la_SOURCES) \ + $(libdna_plugin_la_SOURCES) \ $(libhttp_client_plugin_la_SOURCES) \ $(libns_dshttpd_la_SOURCES) \ $(libpam_passthru_plugin_la_SOURCES) \ @@ -784,13 +754,12 @@ $(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) \ $(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) \ $(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) \ - $(dbscan_bin_SOURCES) $(ds_newinst_bin_SOURCES) \ - $(dsktune_bin_SOURCES) $(infadd_bin_SOURCES) \ - $(ldap_agent_bin_SOURCES) $(am__ldclt_bin_SOURCES_DIST) \ - $(ldif_bin_SOURCES) $(makstrdb_SOURCES) \ - $(migratecred_bin_SOURCES) $(mmldif_bin_SOURCES) \ - $(am__ns_slapd_SOURCES_DIST) $(pwdhash_bin_SOURCES) \ - $(rsearch_bin_SOURCES) + $(dbscan_bin_SOURCES) $(dsktune_bin_SOURCES) \ + $(infadd_bin_SOURCES) $(ldap_agent_bin_SOURCES) \ + $(am__ldclt_bin_SOURCES_DIST) $(ldif_bin_SOURCES) \ + $(makstrdb_SOURCES) $(migratecred_bin_SOURCES) \ + $(mmldif_bin_SOURCES) $(am__ns_slapd_SOURCES_DIST) \ + $(pwdhash_bin_SOURCES) $(rsearch_bin_SOURCES) configDATA_INSTALL = $(INSTALL_DATA) infDATA_INSTALL = $(INSTALL_DATA) nodist_propertyDATA_INSTALL = $(INSTALL_DATA) @@ -1042,7 +1011,7 @@ BUILT_SOURCES = dirver.h dberrstrs.h CLEANFILES = dirver.h dberrstrs.h ns-slapd.properties taskdir = $(datadir)@scripttemplatedir@ -server_LTLIBRARIES = libslapd.la libds_admin.la libns-dshttpd.la +server_LTLIBRARIES = libslapd.la libns-dshttpd.la # this is how to add optional plugins @enable_pam_passthru_TRUE@LIBPAM_PASSTHRU_PLUGIN = libpam-passthru-plugin.la @@ -1116,17 +1085,14 @@ $(srcdir)/ldap/schema/60pam-plugin.ldif \ $(srcdir)/ldap/schema/99user.ldif -bin_SCRIPTS = $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \ +bin_SCRIPTS = ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \ wrappers/dbscan \ - wrappers/ds_newinst \ - ldap/admin/src/ds_newinst.pl \ wrappers/dsktune \ wrappers/infadd \ wrappers/ldap-agent \ wrappers/ldclt \ wrappers/ldif \ $(srcdir)/ldap/admin/src/logconv.pl \ - ldap/admin/src/migrateTo11 \ wrappers/migratecred \ wrappers/mmldif \ wrappers/pwdhash \ @@ -1179,11 +1145,7 @@ ldap/admin/src/scripts/template-ns-activate.pl \ ldap/admin/src/scripts/template-ns-inactivate.pl \ ldap/admin/src/scripts/template-ns-newpwpolicy.pl \ - ldap/admin/src/scripts/template-verify-db.pl \ - $(srcdir)/ldap/admin/src/scripts/template-migrate5to7 \ - $(srcdir)/ldap/admin/src/scripts/template-migrate6to7 \ - $(srcdir)/ldap/admin/src/scripts/template-migrateInstance7 \ - $(srcdir)/ldap/admin/src/scripts/template-migrateTo7 + ldap/admin/src/scripts/template-verify-db.pl init_SCRIPTS = wrappers/$(PACKAGE_NAME) inf_DATA = ldap/admin/src/slapd.inf \ @@ -1234,26 +1196,6 @@ #//////////////////////////////////////////////////////////////// #------------------------ -# libds_admin -#------------------------ -libds_admin_la_SOURCES = ldap/admin/lib/dsalib_conf.c \ - ldap/admin/lib/dsalib_confs.c \ - ldap/admin/lib/dsalib_db.c \ - ldap/admin/lib/dsalib_debug.c \ - ldap/admin/lib/dsalib_dn.c \ - ldap/admin/lib/dsalib_filename.c \ - ldap/admin/lib/dsalib_html.c \ - ldap/admin/lib/dsalib_ldif.c \ - ldap/admin/lib/dsalib_location.c \ - ldap/admin/lib/dsalib_pw.c \ - ldap/admin/lib/dsalib_tailf.c \ - ldap/admin/lib/dsalib_updown.c \ - ldap/admin/lib/dsalib_util.c - -libds_admin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -libds_admin_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK) - -#------------------------ # libns-dshttpd #------------------------ libns_dshttpd_la_SOURCES = lib/libaccess/access_plhash.cpp \ @@ -1784,17 +1726,6 @@ dbscan_bin_LDADD = $(NSPR_LINK) $(DB_LINK) #------------------------ -# ds_newinst -#------------------------ -ds_newinst_bin_SOURCES = ldap/admin/src/cfg_sspt.c \ - ldap/admin/src/create_instance.c \ - ldap/admin/src/ds_newinst.c \ - ldap/admin/src/script-gen.c - -ds_newinst_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -ds_newinst_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET) - -#------------------------ # dsktune #------------------------ dsktune_bin_SOURCES = ldap/systools/idsktune.c \ @@ -2597,53 +2528,6 @@ ldap/servers/plugins/dna/$(DEPDIR)/$(am__dirstamp) libdna-plugin.la: $(libdna_plugin_la_OBJECTS) $(libdna_plugin_la_DEPENDENCIES) $(LINK) $(am_libdna_plugin_la_rpath) $(libdna_plugin_la_LDFLAGS) $(libdna_plugin_la_OBJECTS) $(libdna_plugin_la_LIBADD) $(LIBS) -ldap/admin/lib/$(am__dirstamp): - @$(mkdir_p) ldap/admin/lib - @: > ldap/admin/lib/$(am__dirstamp) -ldap/admin/lib/$(DEPDIR)/$(am__dirstamp): - @$(mkdir_p) ldap/admin/lib/$(DEPDIR) - @: > ldap/admin/lib/$(DEPDIR)/$(am__dirstamp) -ldap/admin/lib/libds_admin_la-dsalib_conf.lo: \ - ldap/admin/lib/$(am__dirstamp) \ - ldap/admin/lib/$(DEPDIR)/$(am__dirstamp) -ldap/admin/lib/libds_admin_la-dsalib_confs.lo: \ - ldap/admin/lib/$(am__dirstamp) \ - ldap/admin/lib/$(DEPDIR)/$(am__dirstamp) -ldap/admin/lib/libds_admin_la-dsalib_db.lo: \ - ldap/admin/lib/$(am__dirstamp) \ - ldap/admin/lib/$(DEPDIR)/$(am__dirstamp) -ldap/admin/lib/libds_admin_la-dsalib_debug.lo: \ - ldap/admin/lib/$(am__dirstamp) \ - ldap/admin/lib/$(DEPDIR)/$(am__dirstamp) -ldap/admin/lib/libds_admin_la-dsalib_dn.lo: \ - ldap/admin/lib/$(am__dirstamp) \ - ldap/admin/lib/$(DEPDIR)/$(am__dirstamp) -ldap/admin/lib/libds_admin_la-dsalib_filename.lo: \ - ldap/admin/lib/$(am__dirstamp) \ - ldap/admin/lib/$(DEPDIR)/$(am__dirstamp) -ldap/admin/lib/libds_admin_la-dsalib_html.lo: \ - ldap/admin/lib/$(am__dirstamp) \ - ldap/admin/lib/$(DEPDIR)/$(am__dirstamp) -ldap/admin/lib/libds_admin_la-dsalib_ldif.lo: \ - ldap/admin/lib/$(am__dirstamp) \ - ldap/admin/lib/$(DEPDIR)/$(am__dirstamp) -ldap/admin/lib/libds_admin_la-dsalib_location.lo: \ - ldap/admin/lib/$(am__dirstamp) \ - ldap/admin/lib/$(DEPDIR)/$(am__dirstamp) -ldap/admin/lib/libds_admin_la-dsalib_pw.lo: \ - ldap/admin/lib/$(am__dirstamp) \ - ldap/admin/lib/$(DEPDIR)/$(am__dirstamp) -ldap/admin/lib/libds_admin_la-dsalib_tailf.lo: \ - ldap/admin/lib/$(am__dirstamp) \ - ldap/admin/lib/$(DEPDIR)/$(am__dirstamp) -ldap/admin/lib/libds_admin_la-dsalib_updown.lo: \ - ldap/admin/lib/$(am__dirstamp) \ - ldap/admin/lib/$(DEPDIR)/$(am__dirstamp) -ldap/admin/lib/libds_admin_la-dsalib_util.lo: \ - ldap/admin/lib/$(am__dirstamp) \ - ldap/admin/lib/$(DEPDIR)/$(am__dirstamp) -libds_admin.la: $(libds_admin_la_OBJECTS) $(libds_admin_la_DEPENDENCIES) - $(LINK) -rpath $(serverdir) $(libds_admin_la_LDFLAGS) $(libds_admin_la_OBJECTS) $(libds_admin_la_LIBADD) $(LIBS) ldap/servers/plugins/http/$(am__dirstamp): @$(mkdir_p) ldap/servers/plugins/http @: > ldap/servers/plugins/http/$(am__dirstamp) @@ -3557,27 +3441,6 @@ dbscan-bin$(EXEEXT): $(dbscan_bin_OBJECTS) $(dbscan_bin_DEPENDENCIES) @rm -f dbscan-bin$(EXEEXT) $(LINK) $(dbscan_bin_LDFLAGS) $(dbscan_bin_OBJECTS) $(dbscan_bin_LDADD) $(LIBS) -ldap/admin/src/$(am__dirstamp): - @$(mkdir_p) ldap/admin/src - @: > ldap/admin/src/$(am__dirstamp) -ldap/admin/src/$(DEPDIR)/$(am__dirstamp): - @$(mkdir_p) ldap/admin/src/$(DEPDIR) - @: > ldap/admin/src/$(DEPDIR)/$(am__dirstamp) -ldap/admin/src/ds_newinst_bin-cfg_sspt.$(OBJEXT): \ - ldap/admin/src/$(am__dirstamp) \ - ldap/admin/src/$(DEPDIR)/$(am__dirstamp) -ldap/admin/src/ds_newinst_bin-create_instance.$(OBJEXT): \ - ldap/admin/src/$(am__dirstamp) \ - ldap/admin/src/$(DEPDIR)/$(am__dirstamp) -ldap/admin/src/ds_newinst_bin-ds_newinst.$(OBJEXT): \ - ldap/admin/src/$(am__dirstamp) \ - ldap/admin/src/$(DEPDIR)/$(am__dirstamp) -ldap/admin/src/ds_newinst_bin-script-gen.$(OBJEXT): \ - ldap/admin/src/$(am__dirstamp) \ - ldap/admin/src/$(DEPDIR)/$(am__dirstamp) -ds_newinst-bin$(EXEEXT): $(ds_newinst_bin_OBJECTS) $(ds_newinst_bin_DEPENDENCIES) - @rm -f ds_newinst-bin$(EXEEXT) - $(LINK) $(ds_newinst_bin_LDFLAGS) $(ds_newinst_bin_OBJECTS) $(ds_newinst_bin_LDADD) $(LIBS) ldap/systools/$(am__dirstamp): @$(mkdir_p) ldap/systools @: > ldap/systools/$(am__dirstamp) @@ -3904,36 +3767,6 @@ mostlyclean-compile: -rm -f *.$(OBJEXT) - -rm -f ldap/admin/lib/libds_admin_la-dsalib_conf.$(OBJEXT) - -rm -f ldap/admin/lib/libds_admin_la-dsalib_conf.lo - -rm -f ldap/admin/lib/libds_admin_la-dsalib_confs.$(OBJEXT) - -rm -f ldap/admin/lib/libds_admin_la-dsalib_confs.lo - -rm -f ldap/admin/lib/libds_admin_la-dsalib_db.$(OBJEXT) - -rm -f ldap/admin/lib/libds_admin_la-dsalib_db.lo - -rm -f ldap/admin/lib/libds_admin_la-dsalib_debug.$(OBJEXT) - -rm -f ldap/admin/lib/libds_admin_la-dsalib_debug.lo - -rm -f ldap/admin/lib/libds_admin_la-dsalib_dn.$(OBJEXT) - -rm -f ldap/admin/lib/libds_admin_la-dsalib_dn.lo - -rm -f ldap/admin/lib/libds_admin_la-dsalib_filename.$(OBJEXT) - -rm -f ldap/admin/lib/libds_admin_la-dsalib_filename.lo - -rm -f ldap/admin/lib/libds_admin_la-dsalib_html.$(OBJEXT) - -rm -f ldap/admin/lib/libds_admin_la-dsalib_html.lo - -rm -f ldap/admin/lib/libds_admin_la-dsalib_ldif.$(OBJEXT) - -rm -f ldap/admin/lib/libds_admin_la-dsalib_ldif.lo - -rm -f ldap/admin/lib/libds_admin_la-dsalib_location.$(OBJEXT) - -rm -f ldap/admin/lib/libds_admin_la-dsalib_location.lo - -rm -f ldap/admin/lib/libds_admin_la-dsalib_pw.$(OBJEXT) - -rm -f ldap/admin/lib/libds_admin_la-dsalib_pw.lo - -rm -f ldap/admin/lib/libds_admin_la-dsalib_tailf.$(OBJEXT) - -rm -f ldap/admin/lib/libds_admin_la-dsalib_tailf.lo - -rm -f ldap/admin/lib/libds_admin_la-dsalib_updown.$(OBJEXT) - -rm -f ldap/admin/lib/libds_admin_la-dsalib_updown.lo - -rm -f ldap/admin/lib/libds_admin_la-dsalib_util.$(OBJEXT) - -rm -f ldap/admin/lib/libds_admin_la-dsalib_util.lo - -rm -f ldap/admin/src/ds_newinst_bin-cfg_sspt.$(OBJEXT) - -rm -f ldap/admin/src/ds_newinst_bin-create_instance.$(OBJEXT) - -rm -f ldap/admin/src/ds_newinst_bin-ds_newinst.$(OBJEXT) - -rm -f ldap/admin/src/ds_newinst_bin-script-gen.$(OBJEXT) -rm -f ldap/libraries/libavl/avl.$(OBJEXT) -rm -f ldap/libraries/libavl/libslapd_la-avl.$(OBJEXT) -rm -f ldap/libraries/libavl/libslapd_la-avl.lo @@ -4719,23 +4552,6 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_conf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_confs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_db.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_debug.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_dn.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_filename.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_html.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_ldif.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_location.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_pw.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_tailf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_updown.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_util.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ldap/libraries/libavl/$(DEPDIR)/avl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ldap/libraries/libavl/$(DEPDIR)/libslapd_la-avl.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Plo@am__quote@ @@ -6071,97 +5887,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdna_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/dna/libdna_plugin_la-dna.lo `test -f 'ldap/servers/plugins/dna/dna.c' || echo '$(srcdir)/'`ldap/servers/plugins/dna/dna.c -ldap/admin/lib/libds_admin_la-dsalib_conf.lo: ldap/admin/lib/dsalib_conf.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_conf.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_conf.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_conf.lo `test -f 'ldap/admin/lib/dsalib_conf.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_conf.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_conf.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_conf.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_conf.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_conf.c' object='ldap/admin/lib/libds_admin_la-dsalib_conf.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_conf.lo `test -f 'ldap/admin/lib/dsalib_conf.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_conf.c - -ldap/admin/lib/libds_admin_la-dsalib_confs.lo: ldap/admin/lib/dsalib_confs.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_confs.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_confs.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_confs.lo `test -f 'ldap/admin/lib/dsalib_confs.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_confs.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_confs.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_confs.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_confs.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_confs.c' object='ldap/admin/lib/libds_admin_la-dsalib_confs.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_confs.lo `test -f 'ldap/admin/lib/dsalib_confs.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_confs.c - -ldap/admin/lib/libds_admin_la-dsalib_db.lo: ldap/admin/lib/dsalib_db.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_db.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_db.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_db.lo `test -f 'ldap/admin/lib/dsalib_db.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_db.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_db.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_db.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_db.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_db.c' object='ldap/admin/lib/libds_admin_la-dsalib_db.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_db.lo `test -f 'ldap/admin/lib/dsalib_db.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_db.c - -ldap/admin/lib/libds_admin_la-dsalib_debug.lo: ldap/admin/lib/dsalib_debug.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_debug.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_debug.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_debug.lo `test -f 'ldap/admin/lib/dsalib_debug.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_debug.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_debug.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_debug.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_debug.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_debug.c' object='ldap/admin/lib/libds_admin_la-dsalib_debug.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_debug.lo `test -f 'ldap/admin/lib/dsalib_debug.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_debug.c - -ldap/admin/lib/libds_admin_la-dsalib_dn.lo: ldap/admin/lib/dsalib_dn.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_dn.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_dn.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_dn.lo `test -f 'ldap/admin/lib/dsalib_dn.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_dn.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_dn.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_dn.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_dn.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_dn.c' object='ldap/admin/lib/libds_admin_la-dsalib_dn.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_dn.lo `test -f 'ldap/admin/lib/dsalib_dn.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_dn.c - -ldap/admin/lib/libds_admin_la-dsalib_filename.lo: ldap/admin/lib/dsalib_filename.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_filename.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_filename.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_filename.lo `test -f 'ldap/admin/lib/dsalib_filename.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_filename.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_filename.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_filename.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_filename.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_filename.c' object='ldap/admin/lib/libds_admin_la-dsalib_filename.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_filename.lo `test -f 'ldap/admin/lib/dsalib_filename.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_filename.c - -ldap/admin/lib/libds_admin_la-dsalib_html.lo: ldap/admin/lib/dsalib_html.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_html.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_html.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_html.lo `test -f 'ldap/admin/lib/dsalib_html.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_html.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_html.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_html.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_html.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_html.c' object='ldap/admin/lib/libds_admin_la-dsalib_html.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_html.lo `test -f 'ldap/admin/lib/dsalib_html.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_html.c - -ldap/admin/lib/libds_admin_la-dsalib_ldif.lo: ldap/admin/lib/dsalib_ldif.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_ldif.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_ldif.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_ldif.lo `test -f 'ldap/admin/lib/dsalib_ldif.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_ldif.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_ldif.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_ldif.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_ldif.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_ldif.c' object='ldap/admin/lib/libds_admin_la-dsalib_ldif.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_ldif.lo `test -f 'ldap/admin/lib/dsalib_ldif.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_ldif.c - -ldap/admin/lib/libds_admin_la-dsalib_location.lo: ldap/admin/lib/dsalib_location.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_location.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_location.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_location.lo `test -f 'ldap/admin/lib/dsalib_location.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_location.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_location.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_location.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_location.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_location.c' object='ldap/admin/lib/libds_admin_la-dsalib_location.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_location.lo `test -f 'ldap/admin/lib/dsalib_location.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_location.c - -ldap/admin/lib/libds_admin_la-dsalib_pw.lo: ldap/admin/lib/dsalib_pw.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_pw.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_pw.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_pw.lo `test -f 'ldap/admin/lib/dsalib_pw.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_pw.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_pw.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_pw.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_pw.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_pw.c' object='ldap/admin/lib/libds_admin_la-dsalib_pw.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_pw.lo `test -f 'ldap/admin/lib/dsalib_pw.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_pw.c - -ldap/admin/lib/libds_admin_la-dsalib_tailf.lo: ldap/admin/lib/dsalib_tailf.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_tailf.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_tailf.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_tailf.lo `test -f 'ldap/admin/lib/dsalib_tailf.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_tailf.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_tailf.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_tailf.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_tailf.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_tailf.c' object='ldap/admin/lib/libds_admin_la-dsalib_tailf.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_tailf.lo `test -f 'ldap/admin/lib/dsalib_tailf.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_tailf.c - -ldap/admin/lib/libds_admin_la-dsalib_updown.lo: ldap/admin/lib/dsalib_updown.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_updown.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_updown.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_updown.lo `test -f 'ldap/admin/lib/dsalib_updown.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_updown.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_updown.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_updown.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_updown.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_updown.c' object='ldap/admin/lib/libds_admin_la-dsalib_updown.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_updown.lo `test -f 'ldap/admin/lib/dsalib_updown.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_updown.c - -ldap/admin/lib/libds_admin_la-dsalib_util.lo: ldap/admin/lib/dsalib_util.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_util.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_util.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_util.lo `test -f 'ldap/admin/lib/dsalib_util.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_util.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_util.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_util.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_util.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_util.c' object='ldap/admin/lib/libds_admin_la-dsalib_util.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_util.lo `test -f 'ldap/admin/lib/dsalib_util.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_util.c - ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo: ldap/servers/plugins/http/http_client.c @am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhttp_client_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo -MD -MP -MF "ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_client.Tpo" -c -o ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo `test -f 'ldap/servers/plugins/http/http_client.c' || echo '$(srcdir)/'`ldap/servers/plugins/http/http_client.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_client.Tpo" "ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_client.Plo"; else rm -f "ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_client.Tpo"; exit 1; fi @@ -7611,62 +7336,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dbscan_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/tools/dbscan_bin-dbscan.obj `if test -f 'ldap/servers/slapd/tools/dbscan.c'; then $(CYGPATH_W) 'ldap/servers/slapd/tools/dbscan.c'; else $(CYGPATH_W) '$(srcdir)/ldap/servers/slapd/tools/dbscan.c'; fi` -ldap/admin/src/ds_newinst_bin-cfg_sspt.o: ldap/admin/src/cfg_sspt.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-cfg_sspt.o -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Tpo" -c -o ldap/admin/src/ds_newinst_bin-cfg_sspt.o `test -f 'ldap/admin/src/cfg_sspt.c' || echo '$(srcdir)/'`ldap/admin/src/cfg_sspt.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/cfg_sspt.c' object='ldap/admin/src/ds_newinst_bin-cfg_sspt.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-cfg_sspt.o `test -f 'ldap/admin/src/cfg_sspt.c' || echo '$(srcdir)/'`ldap/admin/src/cfg_sspt.c - -ldap/admin/src/ds_newinst_bin-cfg_sspt.obj: ldap/admin/src/cfg_sspt.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-cfg_sspt.obj -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Tpo" -c -o ldap/admin/src/ds_newinst_bin-cfg_sspt.obj `if test -f 'ldap/admin/src/cfg_sspt.c'; then $(CYGPATH_W) 'ldap/admin/src/cfg_sspt.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/cfg_sspt.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/cfg_sspt.c' object='ldap/admin/src/ds_newinst_bin-cfg_sspt.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-cfg_sspt.obj `if test -f 'ldap/admin/src/cfg_sspt.c'; then $(CYGPATH_W) 'ldap/admin/src/cfg_sspt.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/cfg_sspt.c'; fi` - -ldap/admin/src/ds_newinst_bin-create_instance.o: ldap/admin/src/create_instance.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-create_instance.o -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Tpo" -c -o ldap/admin/src/ds_newinst_bin-create_instance.o `test -f 'ldap/admin/src/create_instance.c' || echo '$(srcdir)/'`ldap/admin/src/create_instance.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/create_instance.c' object='ldap/admin/src/ds_newinst_bin-create_instance.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-create_instance.o `test -f 'ldap/admin/src/create_instance.c' || echo '$(srcdir)/'`ldap/admin/src/create_instance.c - -ldap/admin/src/ds_newinst_bin-create_instance.obj: ldap/admin/src/create_instance.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-create_instance.obj -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Tpo" -c -o ldap/admin/src/ds_newinst_bin-create_instance.obj `if test -f 'ldap/admin/src/create_instance.c'; then $(CYGPATH_W) 'ldap/admin/src/create_instance.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/create_instance.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/create_instance.c' object='ldap/admin/src/ds_newinst_bin-create_instance.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-create_instance.obj `if test -f 'ldap/admin/src/create_instance.c'; then $(CYGPATH_W) 'ldap/admin/src/create_instance.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/create_instance.c'; fi` - -ldap/admin/src/ds_newinst_bin-ds_newinst.o: ldap/admin/src/ds_newinst.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-ds_newinst.o -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Tpo" -c -o ldap/admin/src/ds_newinst_bin-ds_newinst.o `test -f 'ldap/admin/src/ds_newinst.c' || echo '$(srcdir)/'`ldap/admin/src/ds_newinst.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/ds_newinst.c' object='ldap/admin/src/ds_newinst_bin-ds_newinst.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-ds_newinst.o `test -f 'ldap/admin/src/ds_newinst.c' || echo '$(srcdir)/'`ldap/admin/src/ds_newinst.c - -ldap/admin/src/ds_newinst_bin-ds_newinst.obj: ldap/admin/src/ds_newinst.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-ds_newinst.obj -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Tpo" -c -o ldap/admin/src/ds_newinst_bin-ds_newinst.obj `if test -f 'ldap/admin/src/ds_newinst.c'; then $(CYGPATH_W) 'ldap/admin/src/ds_newinst.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/ds_newinst.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/ds_newinst.c' object='ldap/admin/src/ds_newinst_bin-ds_newinst.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-ds_newinst.obj `if test -f 'ldap/admin/src/ds_newinst.c'; then $(CYGPATH_W) 'ldap/admin/src/ds_newinst.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/ds_newinst.c'; fi` - -ldap/admin/src/ds_newinst_bin-script-gen.o: ldap/admin/src/script-gen.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-script-gen.o -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Tpo" -c -o ldap/admin/src/ds_newinst_bin-script-gen.o `test -f 'ldap/admin/src/script-gen.c' || echo '$(srcdir)/'`ldap/admin/src/script-gen.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/script-gen.c' object='ldap/admin/src/ds_newinst_bin-script-gen.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-script-gen.o `test -f 'ldap/admin/src/script-gen.c' || echo '$(srcdir)/'`ldap/admin/src/script-gen.c - -ldap/admin/src/ds_newinst_bin-script-gen.obj: ldap/admin/src/script-gen.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-script-gen.obj -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Tpo" -c -o ldap/admin/src/ds_newinst_bin-script-gen.obj `if test -f 'ldap/admin/src/script-gen.c'; then $(CYGPATH_W) 'ldap/admin/src/script-gen.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/script-gen.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/script-gen.c' object='ldap/admin/src/ds_newinst_bin-script-gen.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-script-gen.obj `if test -f 'ldap/admin/src/script-gen.c'; then $(CYGPATH_W) 'ldap/admin/src/script-gen.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/script-gen.c'; fi` - ldap/servers/slapd/tools/rsearch/infadd_bin-addthread.o: ldap/servers/slapd/tools/rsearch/addthread.c @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(infadd_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/tools/rsearch/infadd_bin-addthread.o -MD -MP -MF "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/infadd_bin-addthread.Tpo" -c -o ldap/servers/slapd/tools/rsearch/infadd_bin-addthread.o `test -f 'ldap/servers/slapd/tools/rsearch/addthread.c' || echo '$(srcdir)/'`ldap/servers/slapd/tools/rsearch/addthread.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/infadd_bin-addthread.Tpo" "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/infadd_bin-addthread.Po"; else rm -f "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/infadd_bin-addthread.Tpo"; exit 1; fi @@ -8844,7 +8513,6 @@ clean-libtool: -rm -rf .libs _libs - -rm -rf ldap/admin/lib/.libs ldap/admin/lib/_libs -rm -rf ldap/libraries/libavl/.libs ldap/libraries/libavl/_libs -rm -rf ldap/servers/plugins/acl/.libs ldap/servers/plugins/acl/_libs -rm -rf ldap/servers/plugins/bitwise/.libs ldap/servers/plugins/bitwise/_libs @@ -9188,10 +8856,6 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -rm -f ldap/admin/lib/$(DEPDIR)/$(am__dirstamp) - -rm -f ldap/admin/lib/$(am__dirstamp) - -rm -f ldap/admin/src/$(DEPDIR)/$(am__dirstamp) - -rm -f ldap/admin/src/$(am__dirstamp) -rm -f ldap/libraries/libavl/$(DEPDIR)/$(am__dirstamp) -rm -f ldap/libraries/libavl/$(am__dirstamp) -rm -f ldap/servers/plugins/acl/$(DEPDIR)/$(am__dirstamp) @@ -9276,7 +8940,7 @@ distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf ldap/admin/lib/$(DEPDIR) ldap/admin/src/$(DEPDIR) ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/se! rvers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) + -rm -rf ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd! /tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags @@ -9310,7 +8974,7 @@ maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf ldap/admin/lib/$(DEPDIR) ldap/admin/src/$(DEPDIR) ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/se! rvers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) + -rm -rf ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd! /tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic --- bchecker.ini DELETED --- --- nsarch DELETED --- --- nsarch.bat DELETED --- --- ntversion.pl DELETED --- --- pumpkin.pl DELETED ---

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/slapd/tools/rsearch/scripts dbgen.pl.in, NONE, 1.1 dbgen.pl, 1.2, NONE
by Doctor Conrad 17 Jul '07

17 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17673 Added Files: dbgen.pl.in Removed Files: dbgen.pl Log Message: Resolves: bug 248272 Description: CLU: dbgen.pl fails to load data files Reviewed by: nhosoi (Thanks!) Fix Description: dbgen.pl is hardcoded to look for data files in ../data. Instead, we should allow the user to provide the location to the data files e.g. -l /path/to/data, and we should also use share/brand-ds/data as the default directory. --- NEW FILE dbgen.pl.in --- #!/usr/bin/perl # BEGIN COPYRIGHT BLOCK # 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; version 2 of the License. # # 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., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # In addition, as a special exception, Red Hat, Inc. gives You the additional # right to link the code of this Program with code not covered under the GNU # General Public License ("Non-GPL Code") and to distribute linked combinations # including the two, subject to the limitations in this paragraph. Non-GPL Code # permitted under this exception must only link to the code of this Program # through those well defined interfaces identified in the file named EXCEPTION # found in the source code files (the "Approved Interfaces"). The files of # Non-GPL Code may instantiate templates or use macros or inline functions from # the Approved Interfaces without causing the resulting work to be covered by # the GNU General Public License. Only Red Hat, Inc. may make changes or # additions to the list of Approved Interfaces. You must obey the GNU General # Public License in all respects for all of the Program code and other code used # in conjunction with the Program except the Non-GPL Code covered by this # exception. If you modify this file, you may extend this exception to your # version of the file, but you are not obligated to do so. If you do not wish to # provide this exception without modification, you must delete this exception # statement from your version and license this file solely under the GPL without # exception. # # # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK #------------------------------------------------------------------------ ## NAME ## dbgen ## ## DESCRIPTION ## Random LDIF database creator, specially modified from DirectoryMark ## Original weibe done by David Boreham in C++. ## ## Fixed random seed generator for uniqueness ## Updated function MakeRandomName: ## Changed default RDN type to UID and ## added -c option to enable CN type naming ## Added personal_title and generationQualifier data ## Added function to create randon SSN's if needed ## Updated generation output to show total entries created regardless of -v option ## Changed userPassword to be the same as UID. ## Now, dc style namingcontext can be used. #------------------------------------------------------------------------ sub PrintUsage { print STDERR "Usage: $0 [options] -o output_file -n number\n", "\t Where options are:\n", "\t -s suffix, default is 'dc=example,dc=com'\n", "\t -c for CN naming style RDN's : default is UID\n", "\t -O for organizationalPersons, default is inetOrgPerson\n", "\t -p for piranha style aci's, default is barracuda\n", "\t -r seed---seed number for random number generator\n", "\t -g print extra entries for orgchart\n", "\t -x suppress printing pre amble\n", "\t -y suppress printing organizational units\n", "\t -l location of directory containing data files, default is @templatedir@\n", "\t -v verbose\n", "\t -q quiet\n", "\n"; exit; } &PrintUsage if ($#ARGV == -1); @EmployeeTypes = ("Manager", "Normal", "Peon"); @personal_title = ("Mr", "Mrs", "Miss", "Senior", "Junior", "III", "Cool"); @generationQ = ("I", "II", "III", "IV", "V", "VI", "VII"); @title_ranks = ("Senior", "Master", "Associate", "Junior", "Chief", "Supreme", "Elite"); @positions =("Accountant", "Admin", "Architect", "Assistant", "Artist", "Consultant", "Czar", "Dictator", "Director", "Diva", "Dreamer", "Evangelist", "Engineer", "Figurehead", "Fellow", "Grunt", "Guru", "Janitor", "Madonna", "Manager", "Pinhead", "President", "Punk", "Sales Rep", "Stooge", "Visionary", "Vice President", "Writer", "Warrior", "Yahoo"); @localities = ("Mountain View", "Redmond", "Redwood Shores", "Armonk", "Cambridge", "Santa Clara", "Sunnyvale", "Alameda", "Cupertino", "Menlo Park", "Palo Alto", "Orem", "San Jose", "San Francisco", "Milpitas", "Hartford", "Windsor", "Boston", "New York", "Detroit", "Dallas", "Denver"); @area_codes = ("303", "415", "408", "510", "804", "818", "213", "206", "714"); my $mycert = "usercertificate;binary:: MIIBvjCCASegAwIBAgIBAjANBgkqhkiG9w0BAQQFADAnMQ8wDQYD\n VQQDEwZjb25maWcxFDASBgNVBAMTC01NUiBDQSBDZXJ0MB4XDTAxMDQwNTE1NTEwNloXDTExMDcw\n NTE1NTEwNlowIzELMAkGA1UEChMCZnIxFDASBgNVBAMTC01NUiBTMSBDZXJ0MIGfMA0GCSqGSIb3\n DQEBAQUAA4GNADCBiQKBgQDNlmsKEaPD+o3mAUwmW4E40MPs7aiui1YhorST3KzVngMqe5PbObUH\n MeJN7CLbq9SjXvdB3y2AoVl/s5UkgGz8krmJ8ELfUCU95AQls321RwBdLRjioiQ3MGJiFjxwYRIV\n j1CUTuX1y8dC7BWvZ1/EB0yv0QDtp2oVMUeoK9/9sQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBADev\n hxY6QyDMK3Mnr7vLGe/HWEZCObF+qEo2zWScGH0Q+dAmhkCCkNeHJoqGN4NWjTdnBcGaAr5Y85k1\n o/vOAMBsZePbYx4SrywL0b/OkOmQX+mQwieC2IQzvaBRyaNMh309vrF4w5kExReKfjR/gXpHiWQz\n GSxC5LeQG4k3IP34\n"; %ceo = ( "uid" => "ceo", "givenname" => "John", "sn" => "Budd", "title" => "CEO", "cn" => "", "dn" => "" ); %ep0 = ( "uid" => "exec_president0", "givenname" => "Paul", "sn" => "Grant", "title" => "Exective President", "cn" => "", "dn" => "" ); %ep1 = ( "uid" => "exec_president1", "givenname" => "Jill", "sn" => "Peterson", "title" => "Exective President", "cn" => "", "dn" => "" ); @exective_presidents = (\%ep0, \%ep1); %p0 = ( "uid" => "president0", "givenname" => "Pete", "sn" => "Dunne", "title" => "President", "cn" => "", "dn" => "" ); %p1 = ( "uid" => "president1", "givenname" => "Jannet", "sn" => "Keys", "title" => "President", "cn" => "", "dn" => "" ); %p2 = ( "uid" => "president2", "givenname" => "Kathy", "sn" => "Yang", "title" => "President", "cn" => "", "dn" => "" ); %p3 = ( "uid" => "president3", "givenname" => "Anne", "sn" => "Meissner", "title" => "President", "cn" => "", "dn" => "" ); @presidents = (\%p0, \%p1, \%p2, \%p3); %vp0 = ( "uid" => "vice_president0", "givenname" => "Jack", "sn" => "Cho", "title" => "Vice President", "cn" => "", "dn" => "" ); %vp1 = ( "uid" => "vice_president1", "givenname" => "Diane", "sn" => "Smith", "title" => "Vice President", "cn" => "", "dn" => "" ); %vp2 = ( "uid" => "vice_president2", "givenname" => "Alex", "sn" => "Merrells", "title" => "Vice President", "cn" => "", "dn" => "" ); %vp3 = ( "uid" => "vice_president3", "givenname" => "Yumi", "sn" => "Mehta", "title" => "Vice President", "cn" => "", "dn" => "" ); %vp4 = ( "uid" => "vice_president4", "givenname" => "Michael", "sn" => "Natkovich", "title" => "Vice President", "cn" => "", "dn" => "" ); %vp5 = ( "uid" => "vice_president5", "givenname" => "Keith", "sn" => "Lucus", "title" => "Vice President", "cn" => "", "dn" => "" ); @vice_presidents = (\%vp0, \%vp1, \%vp2, \%vp3, \%vp4, \%vp5); %d0 = ( "uid" => "director0", "givenname" => "Chris", "sn" => "Harrison", "title" => "Director", "cn" => "", "dn" => "" ), %d1 = ( "uid" => "director1", "givenname" => "Jane", "sn" => "Baker", "title" => "Director", "cn" => "", "dn" => "" ); %d2 = ( "uid" => "director2", "givenname" => "Ed", "sn" => "Becket", "title" => "Director", "cn" => "", "dn" => "" ); %d3 = ( "uid" => "director3", "givenname" => "Will", "sn" => "Stevenson", "title" => "Director", "cn" => "", "dn" => "" ); %d4 = ( "uid" => "director4", "givenname" => "Kieran", "sn" => "Beckham", "title" => "Director", "cn" => "", "dn" => "" ); %d5 = ( "uid" => "director5", "givenname" => "Greg", "sn" => "Emerson", "title" => "Director", "cn" => "", "dn" => "" ); %d6 = ( "uid" => "director6", "givenname" => "Ian", "sn" => "Parker", "title" => "Director", "cn" => "", "dn" => "" ); %d7 = ( "uid" => "director7", "givenname" => "Liem", "sn" => "Olson", "title" => "Director", "cn" => "", "dn" => "" ); %d8 = ( "uid" => "director8", "givenname" => "George", "sn" => "Cruise", "title" => "Director", "cn" => "", "dn" => "" ); %d9 = ( "uid" => "director9", "givenname" => "Yoshiko", "sn" => "Tucker", "title" => "Director", "cn" => "", "dn" => "" ); @directors = (\%d0, \%d1, \%d2, \%d3, \%d4, \%d5, \%d6, \%d7, \%d8, \%d9); %m0 = ( "uid" => "manager0", "givenname" => "Teresa", "sn" => "Chan", "title" => "Manager", "cn" => "", "dn" => "" ); %m1 = ( "uid" => "manager1", "givenname" => "Tom", "sn" => "Anderson", "title" => "Manager", "cn" => "", "dn" => "" ); %m2 = ( "uid" => "manager2", "givenname" => "Olga", "sn" => "Young", "title" => "Manager", "cn" => "", "dn" => "" ); %m3 = ( "uid" => "manager3", "givenname" => "Bill", "sn" => "Graham", "title" => "Manager", "cn" => "", "dn" => "" ); %m4 = ( "uid" => "manager4", "givenname" => "Todd", "sn" => "Hoover", "title" => "Manager", "cn" => "", "dn" => "" ); %m5 = ( "uid" => "manager5", "givenname" => "Ken", "sn" => "Hamilton", "title" => "Manager", "cn" => "", "dn" => "" ); %m6 = ( "uid" => "manager6", "givenname" => "Christine", "sn" => "Jobs", "title" => "Manager", "cn" => "", "dn" => "" ); %m7 = ( "uid" => "manager7", "givenname" => "Joanna", "sn" => "Lake", "title" => "Manager", "cn" => "", "dn" => "" ); %m8 = ( "uid" => "manager8", "givenname" => "Kim", "sn" => "Remley", "title" => "Manager", "cn" => "", "dn" => "" ); %m9 = ( "uid" => "manager9", "givenname" => "Nick", "sn" => "Pennebaker", "title" => "Manager", "cn" => "", "dn" => "" ); %m10 = ( "uid" => "manager10", "givenname" => "Ted", "sn" => "Hardy", "title" => "Manager", "cn" => "", "dn" => "" ); %m11 = ( "uid" => "manager11", "givenname" => "Tanya", "sn" => "Nielsen", "title" => "Manager", "cn" => "", "dn" => "" ); %m12 = ( "uid" => "manager12", "givenname" => "Sam", "sn" => "Madams", "title" => "Manager", "cn" => "", "dn" => "" ); %m13 = ( "uid" => "manager13", "givenname" => "Judy", "sn" => "Stewart", "title" => "Manager", "cn" => "", "dn" => "" ); %m14 = ( "uid" => "manager14", "givenname" => "Martha", "sn" => "Kidman", "title" => "Manager", "cn" => "", "dn" => "" ); %m15 = ( "uid" => "manager15", "givenname" => "Leo", "sn" => "Knuth", "title" => "Manager", "cn" => "", "dn" => "" ); %m16 = ( "uid" => "manager16", "givenname" => "Cecil", "sn" => "Guibas", "title" => "Manager", "cn" => "", "dn" => "" ); %m17 = ( "uid" => "manager17", "givenname" => "Jay", "sn" => "Hows", "title" => "Manager", "cn" => "", "dn" => "" ); @managers = (\%m0, \%m1, \%m2, \%m3, \%m4, \%m5, \%m6, \%m7, \%m8, \%m9, \%m10, \%m11, \%m12, \%m13, \%m14, \%m15, \%m16, \%m17); require "flush.pl"; require "getopts.pl"; &Getopts('n:o:s:r:cOvpqgxyl:'); $Number_To_Generate = $opt_n; $Verbose = $opt_v; $Quiet = $opt_q; $Output_File_Name = $opt_o; $Random_Seed = $opt_r || 0xdbdbdbdb; $TargetServer = $opt_t; $debug = $opt_d; $Suffix = $opt_s || 'dc=example,dc=com'; $NamingType = "cn" if ($opt_c); $NamingType = "uid" if (!$opt_c); $inetOrgPerson = "objectClass: inetOrgPerson\n" if (!$opt_O); $PrintOrgChartDat = $opt_g; $DataDir = $opt_l || "@templatedir@"; $printpreamble = 1; if ("" != $opt_x) { $printpreamble = 0; } $printorgunit = 1; if ("" != $opt_y) { $printorgunit = 0; } if ($Suffix =~ /o=/) { ($Organization) = $Suffix =~ /o=([^,]+)/; $objectvalue = "organization"; $line = "o: $Organization"; if ($Organization =~ /\s+/) { ($Organization) = $Organization =~ /([^\s]+)/; $Organization .= ".com"; } elsif ($Organization !~ /\.com|\.net|\.org/) { $Organization .= ".com"; } } elsif ($Suffix =~ /dc=/) { $Organization = $Suffix; $Organization =~ s/,\s*dc=/./g; ($domain) = $Organization =~ /dc=([^\.]+)/; $Organization =~ s/dc=//; $objectvalue = "domain"; $line = "dc: $domain"; } # Print help message if user doesn't know how many entries to make # or no output file specified if ( (!$Number_To_Generate) || (!$Output_File_Name)) { &PrintUsage; } srand($Random_Seed); print "Loading Name Data...\n" if $Verbose; $GivenNamesFile = "$DataDir/dbgen-GivenNames"; $FamilyNamesFile = "$DataDir/dbgen-FamilyNames"; $OrgUnitsFile = "$DataDir/dbgen-OrgUnits"; &ReadGivenNames; &ReadFamilyNames; &ReadOrgUnits; print "Done\n" if $Verbose; if ($printpreamble) { if ($piranha) { &PrintPreAmblePiranha($Output_File_Name); } else { &PrintPreAmbleBarracuda($Output_File_Name); } } open (OUTPUT_FILE, ">>$Output_File_Name") || die "Error---Can't open output file $Output_File_Name\n"; if ($printorgunit) { &PrintOrganizationalUnits; } if ($PrintOrgChartDat) { # CEO &PrintManagers(\%ceo, "", $ceo{"dn"}); for (my $j = 0; $j < @exective_presidents; $j++) { &PrintManagers($exective_presidents[$j], &MakeRandomOrgUnit, $ceo{"dn"}); } # Presidents for (my $j = 0; $j < @presidents; $j++) { my $who = int rand @exective_presidents; &PrintManagers($presidents[$j], &MakeRandomOrgUnit, $exective_presidents[$who]{"dn"}); } # Vice Presidents for (my $j = 0; $j < @vice_presidents; $j++) { my $who = int rand @presidents; &PrintManagers($vice_presidents[$j], &MakeRandomOrgUnit, $presidents[$who]{"dn"}); } # Directors for (my $j = 0; $j < @directors; $j++) { my $who = int rand @vice_presidents; &PrintManagers($directors[$j], &MakeRandomOrgUnit, $vice_presidents[$who]{"dn"}); } # Managers for (my $j = 0; $j < @managers; $j++) { my $who = int rand @directors; &PrintManagers($managers[$j], &MakeRandomOrgUnit, $directors[$who]{"dn"}); } } print "Generating $Number_To_Generate entries, please wait\n"; print "Progress: "; # We don't want people with duplicate names, so for each name generated, # add it to "TheMap", which is an associative array with the # name as the key. If there's a duplicate, throw the name out and # try again. $dups = 0; # Generate Number_To_Generate distinct entries. If a duplicate # is created, toss it out and try again. # CHANGED: updated to allow for uid naming style or cn style. Check the RDN for uniqueness for ($x= 0; $x < $Number_To_Generate; $x++) { ($givenName, $sn, $cn, $uid, $rdn,) = &MakeRandomName; if (&AddAndCheck($rdn)) { print "Duplicate: $rdn...\n" if $debug; &flush(STDOUT); $dups++; $x--; next; } $OrgUnit = &MakeRandomOrgUnit; $facsimileTelephoneNumber = &MakeRandomTelephone; $postalAddress = &MakeRandomPostalAddress ( int rand 1000, int rand 1000, $OrgUnit); $postOfficeBox = int rand 10000; $telephoneNumber = &MakeRandomTelephone; $title = &MakeRandomTitle($OrgUnit); # $userPassword = reverse ($cn); # $userPassword =~ s/\s//g; # $userPassword = substr($userPassword, 0, 10); $locality = &MakeRandomLocality; # $desc = "[0] This is $cn" . "'s description."; $fourdigit = int rand 10000; $desc = "2;$fourdigit;CN=Red Hat CS 71GA Demo,O=Red Hat CS 71GA Demo,C=US;CN=RHCS Agent - admin01,UID=admin01,O=redhat,C=US"; my $z = 1; # for (; $z < 1024; $z++) for (; $z < 2; $z++) { $desc = $desc . " [$z] This is $cn" . "'s description."; } $description = $desc; $mail = &MakeMailAddress($givenName, $sn, $Organization); if ($inetOrgPerson) { $carLicense = "carLicense: " . &MakeRandomCarLicense . "\n"; $departmentNumber = "departmentNumber: " . (int rand 10000) . "\n"; $employeeType = "employeeType: " . &MakeRandomEmployeeType . "\n"; $homePhone = "homePhone: " . &MakeRandomTelephone . "\n"; $initials = "initials: " . &MakeInitials ($givenName, $sn) . "\n"; $mobile = "mobile: " . &MakeRandomTelephone . "\n"; $pager = "pager: " . &MakeRandomTelephone . "\n"; if ($PrintOrgChartDat) { $managerCn = $managers[int rand @managers]{"dn"}; } else { $managerCn = $managers[int rand @managers]{"givenname"} . " " . $managers[int rand @managers]{"sn"}; } ($junk, $junk, $secretary_cn) = &MakeRandomName; $manager = "manager: $managerCn " . "\n"; $secretary = "secretary: $secretary_cn" . "\n"; $roomNumber = "roomNumber: " . (int rand 10000) . "\n"; $userPassword = "$uid\n"; } if ($PrintOrgChartDat) { $dnstr = "dn: $NamingType=$rdn, ou=People, $Suffix\n", } else { $dnstr = "dn: $NamingType=$rdn, ou=$OrgUnit, $Suffix\n"; } print OUTPUT_FILE $dnstr, "objectClass: top\n", "objectClass: person\n", "objectClass: organizationalPerson\n", $inetOrgPerson, "cn: $cn\n", "sn: $sn\n", "uid: $uid\n", "givenName: $givenName\n", "description: $description\n", "userPassword: $userPassword", $departmentNumber, $employeeType, $homePhone, $initials, "telephoneNumber: $telephoneNumber\n", "facsimileTelephoneNumber: $facsimileTelephoneNumber\n", $mobile, $pager, $manager, $secretary, $roomNumber, $carLicense, "l: $locality\n", "ou: $OrgUnit\n", "mail: $mail\n", "postalAddress: $postalAddress\n", "title: $title\n", $mycert, "\n"; if (!$Quiet) { if ($x % 1000 == 0) { print "."; &flush(STDOUT); } } } print "\n"; print "Generated $x entries\n"; if ($Verbose) { print "$dups duplicates skipped\n"; } exit 0; sub ReadOrgUnits { open (ORG_UNITS, $OrgUnitsFile) || die "Bad news, failed to open Org Units, $OrgUnitsFile: $!\n"; while(<ORG_UNITS>) { chop; push (@OrganizationalUnits, $_); } close ORG_UNITS; } sub ReadGivenNames { open (GIVEN_NAMES, $GivenNamesFile) || die "Bad News, failed to load given names. $GivenNamesFile\n"; $i = 0; while (<GIVEN_NAMES>) { chop; $given_names[$i++] = $_; } close GIVEN_NAMES; } sub ReadFamilyNames { open (FAMILY_NAMES, $FamilyNamesFile) || die "Bad News, failed to load Family Names. $FamilyNamesFile\n"; $i = 0; while (<FAMILY_NAMES>) { chop; $family_names[$i++] = $_; } close FAMILY_NAMES; } sub PrintPreAmblePiranha { local($output_file) = @_; open (OUTPUT_FILE, ">$output_file") || die "Can't open $output_file for writing $!\n"; print OUTPUT_FILE<<End_Of_File dn: $Suffix objectClass: top objectClass: $objectvalue $line subtreeaci: +(&(privilege=write)(target=ldap:///self)) subtreeaci: +(privilege=compare) subtreeaci: +(|(privilege=search)(privilege=read)) End_Of_File ; close (OUTPUT_FILE); } sub PrintPreAmbleBarracuda { local($output_file) = @_; open (OUTPUT_FILE, ">$output_file") || die "Can't open $output_file for writing $!\n"; print OUTPUT_FILE<<End_Of_File dn: $Suffix objectClass: top objectClass: $objectvalue $line aci: (target=ldap:///$Suffix)(targetattr=*)(version 3.0; acl "acl1"; allow(write) userdn = "ldap:///self";) aci: (target=ldap:///$Suffix)(targetattr=*)(version 3.0; acl "acl2"; allow(write) groupdn = "ldap:///cn=Directory Administrators, $Suffix";) aci: (target=ldap:///$Suffix)(targetattr=*)(version 3.0; acl "acl3"; allow(read, search, compare) userdn = "ldap:///anyone";) End_Of_File ; close (OUTPUT_FILE); } sub PrintPreAmbleNoACI { local($output_file) = @_; open (OUTPUT_FILE, ">$output_file") || die "Can't open $output_file for writing $!\n"; print OUTPUT_FILE<<End_Of_File dn: $Suffix objectClass: top objectClass: organization o: $Organization End_Of_File ; close (OUTPUT_FILE); } sub PrintOrganizationalUnits { foreach $ou (@OrganizationalUnits) { print OUTPUT_FILE "dn: ou=$ou, $Suffix\n", "objectClass: top\n", "objectClass: organizationalUnit\n", "ou: $ou\n\n"; } if ($PrintOrgChartDat) { print OUTPUT_FILE "dn: ou=People, $Suffix\n", "objectClass: top\n", "objectClass: organizationalUnit\n", "ou: People\n\n"; } } sub PrintManagers { my ($obj, $orgUnit, $managerCn) = @_; my $rdn = $$obj{"$NamingType"}; my $uid = $$obj{"uid"}; my $givenName = $$obj{"givenname"}; my $sn = $$obj{"sn"}; my $title = $$obj{"title"}; $$obj{"cn"} = "$givenName $sn"; my $cn = $$obj{"cn"}; $facsimileTelephoneNumber = &MakeRandomTelephone; $postalAddress = &MakeRandomPostalAddress ( int rand 1000, int rand 1000, $OrgUnit); $postOfficeBox = int rand 10000; $telephoneNumber = &MakeRandomTelephone; $locality = &MakeRandomLocality; $description = "This is $cn" . "'s description"; $mail = &MakeMailAddress($givenName, $sn, $Organization); $$obj{"dn"} = "$NamingType=$rdn, ou=People, $Suffix"; if ($inetOrgPerson) { $carLicense = "carLicense: " . &MakeRandomCarLicense . "\n"; $departmentNumber = "departmentNumber: " . (int rand 10000) . "\n"; $employeeType = "employeeType: " . $title . "\n"; $homePhone = "homePhone: " . &MakeRandomTelephone . "\n"; $initials = "initials: " . &MakeInitials ($givenName, $sn) . "\n"; $mobile = "mobile: " . &MakeRandomTelephone . "\n"; $pager = "pager: " . &MakeRandomTelephone . "\n"; ($junk, $junk, $secretary_cn) = &MakeRandomName; if ("" ne $managerCn) { $manager = "manager: $managerCn\n"; } $secretary = "secretary: $secretary_cn" . "\n"; $roomNumber = "roomNumber: " . (int rand 10000) . "\n"; $userPassword = "$uid\n"; } $dnstr = "dn: $NamingType=$rdn, ou=People, $Suffix\n"; if ("" ne $orgUnit) { $oustr = "ou: $orgUnit\n"; } print OUTPUT_FILE $dnstr, "objectClass: top\n", "objectClass: person\n", "objectClass: organizationalPerson\n", $inetOrgPerson, "cn: $cn\n", "sn: $sn\n", "uid: $uid\n", "givenName: $givenName\n", "description: $description\n", "userPassword: $userPassword", $departmentNumber, $employeeType, $homePhone, $initials, "telephoneNumber: $telephoneNumber\n", "facsimileTelephoneNumber: $facsimileTelephoneNumber\n", $mobile, $pager, $manager, $secretary, $roomNumber, $carLicense, "l: $locality\n", $oustr, "mail: $mail\n", "postalAddress: $postalAddress\n", "title: $title\n", $mycert, "\n"; } sub MakeRandomTitle { local($org_unit) = @_; return "$title_ranks[rand @title_ranks] $org_unit $positions[rand @positions]"; } sub MakeRandomLocality { return $localities[rand @localities]; } sub MakeRandomName { local($Given_Name, $Surname, $Full_Name, $UID, $uniq, $first, $last, $RDN); # Get the unique number depending if a seed was set or not. $uniq = int rand($Random_Seed) if ($opt_r); $uniq = $x if (!$opt_r); $Given_Name = $given_names[rand @given_names]; $Surname = $family_names[rand @family_names]; $Full_Name = "$Given_Name $Surname"; # Create the uid based on the DN naming type defined if ($NamingType eq "uid") { $first = substr($Given_Name, 0,1); $last = substr($Surname, 0,8); $UID = $first . $last . "$uniq"; $RDN = $UID; } else { $first = substr($Given_Name, 0,1); $last = substr($Surname, 0,8); $UID = $first . $last . "$uniq"; $RDN = $Full_Name; } return ($Given_Name, $Surname, $Full_Name, $UID, $RDN); } sub MakeRandomOrgUnit { return $OrganizationalUnits[rand @OrganizationalUnits]; } sub MakeRandomTelephone { local($prefix, $suffix, $Phone_Number); $prefix = int rand(900) + 100; $suffix = int rand(9000) + 1000; return $Phone_Number = "+1 " . $area_codes[rand @area_codes] . " " . "$prefix-$suffix"; } sub MakeRandomSSN { local($one, $two, $three, $SSN); $one = int rand(900) +99; $two = int rand(90) +9; $three = int rand(9000) + 999; return $SSN = "$one-$two-$three"; } sub MakeRandomEmployeeType { return $EmployeeTypes[rand @EmployeeTypes]; } sub MakeRandomPersonalTitle { return $personal_title[rand @personal_title]; } sub MakeRandomCarLicense { local ($rand_char_index, $ascii_value, $license); for (1..7) { $rand_char_index = int rand 36; $ascii_value = ($rand_char_index > 9) ? $rand_char_index + 55 : $rand_char_index + 48; $license .= pack ("c", $ascii_value); } return $license; } # All entries are added to TheMap which checks to see # if the name is already there sub AddAndCheck { local($RDN) = @_; # now isn't this better than STL? if ($TheMap{$RDN}) { return 1; } else { $TheMap{$RDN} = 1; return 0; } } sub MakeMailAddress { local($given_name, $sur_name, $Organization) = @_; return "$given_name". "_$sur_name\@$Organization"; } sub MakeRandomPostalAddress { local ($org, $departmentNumber,$roomNumber, $OrgUnit) = @_; return "$org, $OrgUnit Dept \#$departmentNumber, Room\#$roomNumber"; } sub MakeInitials { local ($givenName, $sn) = @_; local ($first, $last); ($first) = $givenName =~ /^(\w).*/; ($last) = $sn =~ /^(\w).*/; return "$first" . ". " . "$last" . "."; } --- dbgen.pl DELETED ---

1 0

[Fedora-directory-commits] adminserver/admserv/newinst/src ASDialogs.pm.in, 1.4, 1.5
by Doctor Conrad 14 Jul '07

14 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/newinst/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15803/adminserver/admserv/newinst/src Modified Files: ASDialogs.pm.in Log Message: Resolves: bug 248145 Bug Description: Replace ds_newinst binary with perl script Reviewed by: nhosoi (Thanks!) Fix Description: 1) Inf needs to be able to read the .inf file from stdin. This is what ds_newinst.pl does currently. 2) getlogin seems not to work in all cases, so add a more robust replacement. Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: no Index: ASDialogs.pm.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ASDialogs.pm.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ASDialogs.pm.in 20 Jun 2007 16:35:02 -0000 1.4 +++ ASDialogs.pm.in 13 Jul 2007 19:53:17 -0000 1.5 @@ -138,7 +138,7 @@ } } if ($> != 0) { # if not root, the user must be our uid - my $username = getlogin; + my $username = getLogin; if ($strans ne $username) { $self->{manager}->alert("dialog_assysuser_must_be_same", $username); return $DialogManager::SAME; @@ -170,7 +170,7 @@ if ($> == 0) { # if root, use the default user $user = "@httpduser@"; } else { # if not root, use the user's uid - $user = getlogin; + $user = getLogin; } } return $user;

1 0

[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSCreate.pm.in, 1.1, 1.2 Inf.pm, 1.3, 1.4 SetupDialogs.pm.in, 1.1, 1.2 Util.pm.in, 1.8, 1.9
by Doctor Conrad 14 Jul '07

14 Jul '07

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15733/ldapserver/ldap/admin/src/scripts Modified Files: DSCreate.pm.in Inf.pm SetupDialogs.pm.in Util.pm.in Log Message: Resolves: bug 248145 Bug Description: Replace ds_newinst binary with perl script Reviewed by: nhosoi (Thanks!) Fix Description: 1) Inf needs to be able to read the .inf file from stdin. This is what ds_newinst.pl does currently. 2) getlogin seems not to work in all cases, so add a more robust replacement. Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: no Index: DSCreate.pm.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSCreate.pm.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DSCreate.pm.in 13 Jul 2007 18:35:32 -0000 1.1 +++ DSCreate.pm.in 13 Jul 2007 19:51:48 -0000 1.2 @@ -596,7 +596,7 @@ if (!$inf->{General}->{SuiteSpotUserID}) { if ($> != 0) { # if not root, use the user's uid - $inf->{General}->{SuiteSpotUserID} = getlogin; + $inf->{General}->{SuiteSpotUserID} = getLogin; } # otherwise, the uid must be specified } Index: Inf.pm =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Inf.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Inf.pm 20 Jun 2007 14:40:24 -0000 1.3 +++ Inf.pm 13 Jul 2007 19:51:48 -0000 1.4 @@ -77,8 +77,14 @@ my $incontinuation = 0; my $curkey; - open INF, $filename or die "Error: could not open inf file $filename: $!"; - while (<INF>) { + my $inffh; + if ($filename eq "-") { + $inffh = \*STDIN; + } else { + open INF, $filename or die "Error: could not open inf file $filename: $!"; + $inffh = \*INF; + } + while (<$inffh>) { my $iscontinuation; chop; # trim trailing newline if (/^\s*$/) { # skip blank/empty lines @@ -107,7 +113,9 @@ $incontinuation = 0; } } - close INF; + if ($inffh ne \*STDIN) { + close $inffh; + } } sub section { @@ -149,6 +157,8 @@ $filename = $self->{filename}; } + return if ($filename eq "-"); + open INF, ">$filename" or die "Error: could not write inf file $filename: $!"; # write General section first $self->writeSection('General', \*INF); Index: SetupDialogs.pm.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/SetupDialogs.pm.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SetupDialogs.pm.in 19 Jun 2007 18:24:57 -0000 1.1 +++ SetupDialogs.pm.in 13 Jul 2007 19:51:48 -0000 1.2 @@ -44,6 +44,7 @@ use Setup; use Dialog; use Net::Domain qw(hostfqdn); +use Util; my $welcome = new DialogYesNo ( $EXPRESS, @@ -136,7 +137,7 @@ } } if ($> != 0) { # if not root, the user must be our uid - my $username = getlogin; + my $username = getLogin; if ($strans ne $username) { $self->{manager}->alert("dialog_ssuser_must_be_same", $username); return $DialogManager::SAME; @@ -218,7 +219,7 @@ if ($> == 0) { # if root, use the default user $username = "@defaultuser@"; } else { # if not root, use the user's uid - $username = getlogin; + $username = getLogin; } } return $username; Index: Util.pm.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Util.pm.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Util.pm.in 13 Jul 2007 18:35:32 -0000 1.8 +++ Util.pm.in 13 Jul 2007 19:51:48 -0000 1.9 @@ -48,11 +48,11 @@ @EXPORT = qw(portAvailable getAvailablePort isValidDN addSuffix getMappedEntries process_maptbl check_and_add_entry getMappedEntries getHashedPassword debug createInfFromConfig - isValidServerID isValidUser makePaths); + isValidServerID isValidUser makePaths getLogin); @EXPORT_OK = qw(portAvailable getAvailablePort isValidDN addSuffix getMappedEntries process_maptbl check_and_add_entry getMappedEntries getHashedPassword debug createInfFromConfig - isValidServerID isValidUser makePaths); + isValidServerID isValidUser makePaths getLogin); use strict; @@ -111,6 +111,10 @@ return $servid =~ /^[$validchars]+$/o; } +sub getLogin { + return getlogin || (getpwuid($>))[0] || $ENV{USER} || die "Error: could not determine the current user ID: $!"; +} + sub isValidUser { my $user = shift; # convert numeric uid to string @@ -122,7 +126,7 @@ } } if ($> != 0) { # if not root, the user must be our uid - my $username = getlogin; + my $username = getLogin; if ($strans ne $username) { return ("dialog_ssuser_must_be_same", $username); } @@ -799,8 +803,8 @@ print $outfh "start_server= 0\n"; my $suffix; - my $ent = $conn->search("cn=ldbm database,cn=plugins,cn=config", - "one", "(objectclass=*)"); + $ent = $conn->search("cn=ldbm database,cn=plugins,cn=config", + "one", "(objectclass=*)"); if (!$ent) { push @{$errs}, "error_opening_dseldif", $fname, $!; close $outfh;

1 0

[Fedora-directory-commits] adminserver/admserv/cgi-src40 config.c, 1.12, 1.13
by Doctor Conrad 14 Jul '07

14 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cgi-src40 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15349/adminserver/admserv/cgi-src40 Modified Files: config.c Log Message: Resolves: bug 248184 Bug Description: adminserver: The config CGI program does not preserve Listen IP addr Reviewed by: ??? Fix Description: Move the existing code into a new function. This function will set the Listen directive IP and port, preserving any existing values. Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: no Index: config.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/config.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- config.c 6 Jul 2007 18:06:19 -0000 1.12 +++ config.c 13 Jul 2007 19:47:15 -0000 1.13 @@ -99,6 +99,43 @@ static int change_server_uid(PsetHndl pset, char* newuname); #endif +static int +update_port_addr(char *port, char *addr) +{ + char line[BIG_LINE]; + char *val = read_conf("console.conf", "Listen"); + char *ptr = NULL; + int err; + + if (val) { + ptr = strchr(val, ':'); + } + + if (ptr) { + *ptr = '\0'; + ++ptr; /* ptr points to the start of the port number in host:port */ + } else if (val) { + ptr = val; /* Listen only specifies the port number */ + val = "0.0.0.0"; /* default listen on all interfaces */ + } else { + /* console.conf should always have Listen with the server port */ + ptr = "80"; /* default httpd port? */ + val = "0.0.0.0"; + } + /* + If ip address is not defined, it means that server should + listen on all interfaces. This is dependant upon console + to always include the port string first. + */ + PR_snprintf(line, sizeof(line), "%s:%s", + (addr && *addr) ? addr : val, + (port && *port) ? port : ptr); + err = update_conf("console.conf", "Listen", line); + PL_strfree(val); + + return err; +} + int main(int argc, char *argv[]) { int _ai = ADMUTIL_Init(); @@ -451,7 +488,7 @@ } if(err == 0) { - err = update_conf("console.conf", "Listen", valptr); + err = update_port_addr(valptr, NULL); /* update port only */ } if (err < 0) @@ -495,34 +532,7 @@ rpt_err(APP_ERROR, error_info, NULL, NULL); } else { - char line[BIG_LINE]; - char *val = read_conf("console.conf", "Listen"); - char *ptr = NULL; - - if (val) { - ptr = strchr(val, ':'); - } - - if (ptr) { - ++ptr; /* ptr points to the start of the port number in host:port */ - } else if (val) { - ptr = val; /* Listen only specifies the port number */ - } else { - /* console.conf should always have Listen with the server port */ - ptr = "80"; /* default httpd port? */ - } - /* - If ip address is not defined, it means that server should - listen on all interfaces. This is dependant upon console - to always include the port string first. - */ - if (valptr && valptr[0] ) { - PR_snprintf(line, sizeof(line), "%s:%s", valptr, ptr); - } else { - PR_snprintf(line, sizeof(line), "0.0.0.0:%s", ptr); - } - err = update_conf("console.conf", "Listen", line); - PL_strfree(val); + err = update_port_addr(NULL, valptr); /* update address only */ } }

1 0

[Fedora-directory-commits] adminserver/admserv/cgi-src40 ds_create.in, 1.2, 1.3
by Doctor Conrad 14 Jul '07

14 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cgi-src40 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32691/adminserver/admserv/cgi-src40 Modified Files: ds_create.in Log Message: Resolves: bug 248145 Bug Description: Replace ds_newinst binary with perl script Reviewed by: nhosoi (Thanks!) Fix Description: The time has come. We can finally get rid of the instance creation C code once and for all. I've created a DSCreate module that has all of the functionality of the old create_instance.c code, along with a few items from ldap/admin/lib. The way it works is this: it first creates the dse.ldif file using template-dse.ldif and the suffix-db template to create the initial db and suffix. It then adds additional optional configuration depending on what optional features have been enabled. It creates other config files and copies in the schema. It then initializes the database. It uses a template file based on the type of entry implied by the suffix, then adds the default ACIs. If the user chose to do so, it will also create the ou=people, ou=groups, etc. entries. The user can also supply an LDIF file which will be used to populate the initial database, in which case none of the default entries or ACIs will be used. It then starts the server (if desired). I had to create a function makePaths that works like mkdir -p except that it will chown, chgrp, and chmod all paths created. I had to change the other places where instance creation was called to use the new calling semantics. ds_create changed quite a bit, since it can just use an Inf to pass in the information instead of calling ds_newinst as a CGI program. I had to change FileConn to add support for namingContexts (i.e. entries with no parent), and to have it write each change each time, and to return copies of entries when searching, to avoid modifying the tree in place. This makes it act much more like LDAP. I found and fixed a few bugs in Migration along the way that were revealed while integrating the new DSCreate code. Platforms tested: RHEL4, FC6 Flag Day: Yes. New instance creation code and autotool changes. Doc impact: no Index: ds_create.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_create.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ds_create.in 11 Jul 2007 21:36:47 -0000 1.2 +++ ds_create.in 13 Jul 2007 18:39:15 -0000 1.3 @@ -46,6 +46,7 @@ use AdminUtil; use Util; use Resource; +use DSCreate; my $res = new Resource("@propertydir@/ds_create.res", "@propertydir@/setup-ds-admin.res", @@ -57,41 +58,11 @@ # save old start_server param # set start_server=0 my $start_server = $query->param('start_server'); -$query->param('start_server', '0'); # create server but do not start -# call ds_newinst as a GET (GET or POST works, GET is simpler) -$ENV{REQUEST_METHOD} = "GET"; -$ENV{QUERY_STRING} = $query->query_string(); - -# make sure the child exit code is reset before starting the fake -# cgi program -my $prog = "@bindir@/ds_newinst"; -if (! -x $prog) { - $prog = "@dslibdir@/ds_newinst"; -} -$? = 0; -# run the CGI -my $output = `$prog 2>&1`; -my $status = $?; -# check for and report errors -if ($status) { - print "Content-type: text/plain\n\n"; - print $output; - exit $status; -} - -# set up new DS to be managed by config DS - acis, pta config - -# new ds info, needed for registration (or get from new dse.ldif) -# temp = ds_a_get_cgi_var("servport", NULL, NULL); -# if (!(cf->servid = ds_a_get_cgi_var("servid", "Server Identifier", -# "Please give your server a short identifier."))) -# cf->rootdn = dn_normalize_convert(ds_a_get_cgi_var("rootdn", NULL, NULL)); -# if (!(cf->rootpw = ds_a_get_cgi_var("rootpw", NULL, NULL))) -# cf->start_server = ds_a_get_cgi_var("start_server", NULL, NULL); -my $inst = $query->param('servid'); -my @errs; -my $inf = createInfFromConfig("@instconfigdir@/slapd-$inst", $inst, \@errs); +# create inf from CGI parameters +my $inf = createInfFromCGIParams($query); +# create the instance +my @errs = createDSInstance($inf); if (@errs) { print "Content-type: text/plain\n\n"; print "NMC_ErrInfo: ", $res->getText(@errs), "\n"; @@ -99,6 +70,7 @@ exit 1; } +# set up new DS to be managed by config DS - acis, pta config # add the parmeters necessary to configure this DS to be managed # by the console and to be registered with the config DS - these # are usually passed in via the CGI params, or use reasonable @@ -119,11 +91,11 @@ } my $servid = $query->param('servid'); -if ($start_server) { - # ok to use here because not only will ds_newinst have validated that +if (!defined($start_server) or $start_server) { + # ok to use here because not only will createDSInstance have validated that # servid contains only good characters, but we test for the existence # of this file first - $prog = "@dslibdir@/slapd-$servid/start-slapd"; + my $prog = "@dslibdir@/slapd-$servid/start-slapd"; if (-x $prog) { $? = 0; # run the CGI @@ -144,12 +116,6 @@ } # register the new server with the configuration ds -# get config ds url from input or admconf -# get admin id from input or admconf -# must get admin password from input (PASSWORD_PIPE?) -# get admin domain -# config ds info - if (!registerDSWithConfigDS($servid, \@errs, $inf)) { print "Content-type: text/plain\n\n"; print "NMC_ErrInfo: ", $res->getText(@errs), "\n"; @@ -161,3 +127,20 @@ print "Content-type: text/plain\n\n"; print "NMC_Status: 0\n"; exit 0; + + +sub createInfFromCGIParams { + my $query = shift; + my $inf = new Inf; + $inf->{General}->{FullMachineName} = $query->param('servname'); + $inf->{General}->{SuiteSpotUserID} = $query->param('servuser'); + + $inf->{slapd}->{ServerPort} = $query->param('servport'); + $inf->{slapd}->{RootDN} = $query->param('rootdn'); + $inf->{slapd}->{RootDNPwd} = $query->param('rootpw'); + $inf->{slapd}->{ServerIdentifier} = $query->param('servid'); + $inf->{slapd}->{Suffix} = $query->param('suffix'); + $inf->{slapd}->{start_server} = 0; # we will start it explicitly later + + return $inf; +}

1 0

[Fedora-directory-commits] adminserver/admserv/newinst/src AdminServer.pm.in, 1.5, 1.6 AdminUtil.pm.in, 1.9, 1.10 migrate-ds-admin.pl.in, 1.3, 1.4 setup-ds-admin.pl.in, 1.7, 1.8 setup-ds-admin.res.in, 1.4, 1.5
by Doctor Conrad 14 Jul '07

14 Jul '07

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/newinst/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32691/adminserver/admserv/newinst/src Modified Files: AdminServer.pm.in AdminUtil.pm.in migrate-ds-admin.pl.in setup-ds-admin.pl.in setup-ds-admin.res.in Log Message: Resolves: bug 248145 Bug Description: Replace ds_newinst binary with perl script Reviewed by: nhosoi (Thanks!) Fix Description: The time has come. We can finally get rid of the instance creation C code once and for all. I've created a DSCreate module that has all of the functionality of the old create_instance.c code, along with a few items from ldap/admin/lib. The way it works is this: it first creates the dse.ldif file using template-dse.ldif and the suffix-db template to create the initial db and suffix. It then adds additional optional configuration depending on what optional features have been enabled. It creates other config files and copies in the schema. It then initializes the database. It uses a template file based on the type of entry implied by the suffix, then adds the default ACIs. If th

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits July 2007