[Fedora-directory-commits] mod_revocator Makefile.am, 1.1.1.1, 1.2 configure.in, 1.1.1.1, 1.2 aclocal.m4, 1.1.1.1, 1.2 Makefile.in, 1.1.1.1, 1.2 configure, 1.1.1.1, 1.2
by Doctor Conrad
Author: rcritten
Update of /cvs/dirsec/mod_revocator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21305
Modified Files:
Makefile.am configure.in aclocal.m4 Makefile.in configure
Log Message:
- Remove unused variables nss_dir and nspr_dir
- Fix error message if LDAPSDK is not found.
- If using pkg-config for NSS configuration and nss_lib is empty, populate
nss_dir with /usr/lib/and set nss_lib_dir as well.
- Fix test for libnssb.a
Index: configure.in
===================================================================
RCS file: /cvs/dirsec/mod_revocator/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- configure.in 3 Aug 2006 19:39:29 -0000 1.1.1.1
+++ configure.in 7 Aug 2006 20:27:55 -0000 1.2
@@ -231,6 +231,11 @@
if $PKG_CONFIG --exists nss; then
nss_inc=`$PKG_CONFIG --cflags-only-I nss`
nss_lib=`$PKG_CONFIG --libs-only-L nss`
+ nss_lib_dir=$nss_lib
+ if test "$nss_lib" = " "; then
+ nss_lib=-L"/usr/lib"
+ nss_lib_dir="/usr/lib"
+ fi
else
AC_MSG_ERROR([NSS not found, specify with --with-nss.])
fi
@@ -258,7 +263,7 @@
# check for --with-ldapsdk-inc
AC_MSG_CHECKING(for --with-ldapsdk-inc)
-AC_ARG_WITH(ldapsdk-inc, [ --with-ldapsdk-inc=PATH LDAP SDK include directory],
+AC_ARG_WITH(ldapsdk-inc, [ --with-ldapsdk-inc=PATH Mozilla LDAP SDK include directory],
[
if test -e "$withval"/ldap.h
then
@@ -273,7 +278,7 @@
# check for --with-ldapsdk-lib
AC_MSG_CHECKING(for --with-ldapsdk-lib)
-AC_ARG_WITH(ldapsdk-lib, [ --with-ldapsdk-lib=PATH LDAP SDK library directory],
+AC_ARG_WITH(ldapsdk-lib, [ --with-ldapsdk-lib=PATH Mozilla LDAP SDK library directory],
[
if test -d "$withval"
then
@@ -300,10 +305,7 @@
fi
fi
-nspr_dir=`echo "$nspr_lib" | sed 's/\/lib[[/]]*$//' | sed 's/-L//'`
-nss_dir=`echo "$nss_lib" | sed 's/\/lib[[/]]*$//' | sed 's/-L//'`
-
-if ! test -e "$nss_dir"/libnssb.a
+if ! test -e "$nss_lib_dir"/libnssb.a
then
AC_MSG_ERROR([NSS is installed but the PKCS11 development package is missing. Need libnssb.a])
fi
@@ -322,8 +324,6 @@
AC_SUBST(nss_inc)
AC_SUBST(nss_lib)
AC_SUBST(nss_lib_dir)
-AC_SUBST(nspr_dir)
-AC_SUBST(nss_dir)
AC_SUBST(ldapsdk_inc)
AC_SUBST(ldapsdk_lib)
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/mod_revocator/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile.in 3 Aug 2006 19:39:12 -0000 1.1.1.1
+++ Makefile.in 7 Aug 2006 20:27:55 -0000 1.2
@@ -107,10 +107,8 @@
install_sh = @install_sh@
ldapsdk_inc = @ldapsdk_inc@
ldapsdk_lib = @ldapsdk_lib@
-nspr_dir = @nspr_dir@
nspr_inc = @nspr_inc@
nspr_lib = @nspr_lib@
-nss_dir = @nss_dir@
nss_inc = @nss_inc@
nss_lib = @nss_lib@
nss_lib_dir = @nss_lib_dir@
Index: configure
===================================================================
RCS file: /cvs/dirsec/mod_revocator/configure,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- configure 3 Aug 2006 19:39:29 -0000 1.1.1.1
+++ configure 7 Aug 2006 20:27:55 -0000 1.2
@@ -462,7 +462,7 @@
# include <unistd.h>
#endif"
-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 PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE CC CFLAGS ac_ct_CC CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL YACC LEX LEXLIB LEX_OUTPUT_ROOT APR_CONFIG APXS PKG_CONFIG SHARED_LINK apr_inc apache_inc apache_conf apache_prefix apache_bin extra_cppflags nspr_!
inc nspr_lib nss_inc nss_lib nss_lib_dir nspr_dir nss_dir ldapsdk_inc ldapsdk_lib LIBOBJS 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 PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE CC CFLAGS ac_ct_CC CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL YACC LEX LEXLIB LEX_OUTPUT_ROOT APR_CONFIG APXS PKG_CONFIG SHARED_LINK apr_inc apache_inc apache_conf apache_prefix apache_bin extra_cppflags nspr_!
inc nspr_lib nss_inc nss_lib nss_lib_dir ldapsdk_inc ldapsdk_lib LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1049,8 +1049,8 @@
--with-nss-inc=PATH Network Security Services (NSS) include directory
--with-nss-lib=PATH Network Security Services (NSS) library directory
--with-ldapsdk=PATH LDAP SDK directory
- --with-ldapsdk-inc=PATH LDAP SDK include directory
- --with-ldapsdk-lib=PATH LDAP SDK library directory
+ --with-ldapsdk-inc=PATH Mozilla LDAP SDK include directory
+ --with-ldapsdk-lib=PATH Mozilla LDAP SDK library directory
Some influential environment variables:
CXX C++ compiler command
@@ -20704,6 +20704,11 @@
if $PKG_CONFIG --exists nss; then
nss_inc=`$PKG_CONFIG --cflags-only-I nss`
nss_lib=`$PKG_CONFIG --libs-only-L nss`
+ nss_lib_dir=$nss_lib
+ if test "$nss_lib" = " "; then
+ nss_lib=-L"/usr/lib"
+ nss_lib_dir="/usr/lib"
+ fi
else
{ { echo "$as_me:$LINENO: error: NSS not found, specify with --with-nss." >&5
echo "$as_me: error: NSS not found, specify with --with-nss." >&2;}
@@ -20847,10 +20852,7 @@
fi
fi
-nspr_dir=`echo "$nspr_lib" | sed 's/\/lib[/]*$//' | sed 's/-L//'`
-nss_dir=`echo "$nss_lib" | sed 's/\/lib[/]*$//' | sed 's/-L//'`
-
-if ! test -e "$nss_dir"/libnssb.a
+if ! test -e "$nss_lib_dir"/libnssb.a
then
{ { echo "$as_me:$LINENO: error: NSS is installed but the PKCS11 development package is missing. Need libnssb.a" >&5
echo "$as_me: error: NSS is installed but the PKCS11 development package is missing. Need libnssb.a" >&2;}
@@ -20874,8 +20876,6 @@
-
-
# Write config.status and the Makefile
ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
@@ -21607,8 +21607,6 @@
s,@nss_inc@,$nss_inc,;t t
s,@nss_lib@,$nss_lib,;t t
s,@nss_lib_dir@,$nss_lib_dir,;t t
-s,@nspr_dir@,$nspr_dir,;t t
-s,@nss_dir@,$nss_dir,;t t
s,@ldapsdk_inc@,$ldapsdk_inc,;t t
s,@ldapsdk_lib@,$ldapsdk_lib,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
17 years, 1 month
[Fedora-directory-commits] mod_revocator README, 1.1.1.1, 1.2 anchor.cpp, 1.1.1.1, 1.2 client.cpp, 1.1.1.1, 1.2 client.h, 1.1.1.1, 1.2 client_err.h, 1.1.1.1, 1.2 constants.c, 1.1.1.1, 1.2 crlmanager.cpp, 1.1.1.1, 1.2 crlmanager.h, 1.1.1.1, 1.2 download.h, 1.1.1.1, 1.2 encode.cpp, 1.1.1.1, 1.2 encode.h, 1.1.1.1, 1.2 exec-client.cpp, 1.1.1.1, 1.2 http-client.cpp, 1.1.1.1, 1.2 ldap-client.cpp, 1.1.1.1, 1.2 ldapget.cpp, 1.1.1.1, 1.2 ldaptest.cpp, 1.1.1.1, 1.2 mod_rev.c, 1.1.1.1, 1.2 mod_rev.h, 1.1.1.1, 1.2 nspr
by Doctor Conrad
Author: rcritten
Update of /cvs/dirsec/mod_revocator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22284
Modified Files:
README anchor.cpp client.cpp client.h client_err.h constants.c
crlmanager.cpp crlmanager.h download.h encode.cpp encode.h
exec-client.cpp http-client.cpp ldap-client.cpp ldapget.cpp
ldaptest.cpp mod_rev.c mod_rev.h nsprstub.cpp pkcs11layer.h
rev_core.cpp rev_core.h reverror.h revhelper.cpp
revocation.cpp revocation.h revprivate.h rfind.cpp rinst.cpp
robject.cpp rsession.cpp rslot.cpp rtoken.cpp status.h
unescape.cpp unescape.h
Log Message:
Replace funky copyright character with "(c)"
Index: README
===================================================================
RCS file: /cvs/dirsec/mod_revocator/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- README 3 Aug 2006 19:39:12 -0000 1.1.1.1
+++ README 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,6 +1,6 @@
LICENSE
-Copyright �� 2006 Red Hat, Inc. All rights reserved.
+Copyright (c) 2006 Red Hat, Inc. All rights reserved.
This copyrighted material is made available to anyone wishing to use,
modify, copy, or redistribute it subject to the terms and conditions of
Index: anchor.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/anchor.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- anchor.cpp 3 Aug 2006 19:39:16 -0000 1.1.1.1
+++ anchor.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: client.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/client.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- client.cpp 3 Aug 2006 19:39:16 -0000 1.1.1.1
+++ client.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: client.h
===================================================================
RCS file: /cvs/dirsec/mod_revocator/client.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- client.h 3 Aug 2006 19:39:16 -0000 1.1.1.1
+++ client.h 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: client_err.h
===================================================================
RCS file: /cvs/dirsec/mod_revocator/client_err.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- client_err.h 3 Aug 2006 19:39:16 -0000 1.1.1.1
+++ client_err.h 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: constants.c
===================================================================
RCS file: /cvs/dirsec/mod_revocator/constants.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- constants.c 3 Aug 2006 19:39:29 -0000 1.1.1.1
+++ constants.c 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: crlmanager.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/crlmanager.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- crlmanager.cpp 3 Aug 2006 19:39:29 -0000 1.1.1.1
+++ crlmanager.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: crlmanager.h
===================================================================
RCS file: /cvs/dirsec/mod_revocator/crlmanager.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- crlmanager.h 3 Aug 2006 19:39:29 -0000 1.1.1.1
+++ crlmanager.h 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: download.h
===================================================================
RCS file: /cvs/dirsec/mod_revocator/download.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- download.h 3 Aug 2006 19:39:30 -0000 1.1.1.1
+++ download.h 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: encode.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/encode.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- encode.cpp 3 Aug 2006 19:39:30 -0000 1.1.1.1
+++ encode.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: encode.h
===================================================================
RCS file: /cvs/dirsec/mod_revocator/encode.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- encode.h 3 Aug 2006 19:39:30 -0000 1.1.1.1
+++ encode.h 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: exec-client.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/exec-client.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- exec-client.cpp 3 Aug 2006 19:39:30 -0000 1.1.1.1
+++ exec-client.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: http-client.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/http-client.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- http-client.cpp 3 Aug 2006 19:39:30 -0000 1.1.1.1
+++ http-client.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: ldap-client.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/ldap-client.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ldap-client.cpp 3 Aug 2006 19:39:30 -0000 1.1.1.1
+++ ldap-client.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: ldapget.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/ldapget.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ldapget.cpp 3 Aug 2006 19:39:30 -0000 1.1.1.1
+++ ldapget.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: ldaptest.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/ldaptest.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ldaptest.cpp 3 Aug 2006 19:39:30 -0000 1.1.1.1
+++ ldaptest.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: mod_rev.c
===================================================================
RCS file: /cvs/dirsec/mod_revocator/mod_rev.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- mod_rev.c 3 Aug 2006 19:39:33 -0000 1.1.1.1
+++ mod_rev.c 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: mod_rev.h
===================================================================
RCS file: /cvs/dirsec/mod_revocator/mod_rev.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- mod_rev.h 3 Aug 2006 19:39:33 -0000 1.1.1.1
+++ mod_rev.h 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: nsprstub.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/nsprstub.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nsprstub.cpp 3 Aug 2006 19:39:33 -0000 1.1.1.1
+++ nsprstub.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: pkcs11layer.h
===================================================================
RCS file: /cvs/dirsec/mod_revocator/pkcs11layer.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- pkcs11layer.h 3 Aug 2006 19:39:33 -0000 1.1.1.1
+++ pkcs11layer.h 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: rev_core.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/rev_core.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- rev_core.cpp 3 Aug 2006 19:39:33 -0000 1.1.1.1
+++ rev_core.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: rev_core.h
===================================================================
RCS file: /cvs/dirsec/mod_revocator/rev_core.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- rev_core.h 3 Aug 2006 19:39:33 -0000 1.1.1.1
+++ rev_core.h 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: reverror.h
===================================================================
RCS file: /cvs/dirsec/mod_revocator/reverror.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- reverror.h 3 Aug 2006 19:39:33 -0000 1.1.1.1
+++ reverror.h 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: revhelper.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/revhelper.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- revhelper.cpp 3 Aug 2006 19:39:33 -0000 1.1.1.1
+++ revhelper.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: revocation.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/revocation.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- revocation.cpp 3 Aug 2006 19:39:33 -0000 1.1.1.1
+++ revocation.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: revocation.h
===================================================================
RCS file: /cvs/dirsec/mod_revocator/revocation.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- revocation.h 3 Aug 2006 19:39:33 -0000 1.1.1.1
+++ revocation.h 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: revprivate.h
===================================================================
RCS file: /cvs/dirsec/mod_revocator/revprivate.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- revprivate.h 3 Aug 2006 19:39:33 -0000 1.1.1.1
+++ revprivate.h 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: rfind.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/rfind.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- rfind.cpp 3 Aug 2006 19:39:34 -0000 1.1.1.1
+++ rfind.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: rinst.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/rinst.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- rinst.cpp 3 Aug 2006 19:39:34 -0000 1.1.1.1
+++ rinst.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: robject.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/robject.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- robject.cpp 3 Aug 2006 19:39:34 -0000 1.1.1.1
+++ robject.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: rsession.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/rsession.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- rsession.cpp 3 Aug 2006 19:39:34 -0000 1.1.1.1
+++ rsession.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: rslot.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/rslot.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- rslot.cpp 3 Aug 2006 19:39:34 -0000 1.1.1.1
+++ rslot.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: rtoken.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/rtoken.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- rtoken.cpp 3 Aug 2006 19:39:34 -0000 1.1.1.1
+++ rtoken.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: status.h
===================================================================
RCS file: /cvs/dirsec/mod_revocator/status.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- status.h 3 Aug 2006 19:39:34 -0000 1.1.1.1
+++ status.h 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: unescape.cpp
===================================================================
RCS file: /cvs/dirsec/mod_revocator/unescape.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- unescape.cpp 3 Aug 2006 19:39:34 -0000 1.1.1.1
+++ unescape.cpp 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
Index: unescape.h
===================================================================
RCS file: /cvs/dirsec/mod_revocator/unescape.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- unescape.h 3 Aug 2006 19:39:34 -0000 1.1.1.1
+++ unescape.h 4 Aug 2006 18:53:09 -0000 1.2
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright �� 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions of
17 years, 1 month
[Fedora-directory-commits] mod_revocator - Imported sources
by Doctor Conrad
Author: rcritten
Update of /cvs/dirsec/mod_revocator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15477
Log Message:
Initial import of mod_revocator
Status:
Vendor Tag: mod_revocator
Release Tags: start
N mod_revocator/config.guess
N mod_revocator/install-sh
N mod_revocator/Makefile.in
N mod_revocator/pkcs11layer.h
N mod_revocator/constants.c
N mod_revocator/aclocal.m4
N mod_revocator/rev_core.h
N mod_revocator/rsession.cpp
N mod_revocator/ltmain.sh
N mod_revocator/client.h
N mod_revocator/rslot.cpp
N mod_revocator/mod_rev.c
N mod_revocator/README
N mod_revocator/nsprstub.cpp
N mod_revocator/AUTHORS
N mod_revocator/client.cpp
N mod_revocator/encode.h
N mod_revocator/anchor.cpp
N mod_revocator/revocator.conf
N mod_revocator/exec-client.cpp
N mod_revocator/depcomp
N mod_revocator/revhelper.cpp
N mod_revocator/ldaptest.cpp
N mod_revocator/INSTALL
N mod_revocator/crlmanager.cpp
N mod_revocator/crlmanager.h
N mod_revocator/ChangeLog
N mod_revocator/LICENSE
N mod_revocator/mod_rev.h
N mod_revocator/http-client.cpp
N mod_revocator/robject.cpp
N mod_revocator/revocation.cpp
N mod_revocator/reverror.h
N mod_revocator/missing
N mod_revocator/revocation.h
N mod_revocator/rinst.cpp
N mod_revocator/rtoken.cpp
N mod_revocator/rev_core.cpp
N mod_revocator/configure.in
N mod_revocator/ldap-client.cpp
N mod_revocator/rfind.cpp
N mod_revocator/encode.cpp
N mod_revocator/NEWS
N mod_revocator/status.h
N mod_revocator/unescape.h
N mod_revocator/ldapget.cpp
N mod_revocator/Makefile.am
N mod_revocator/mkinstalldirs
N mod_revocator/revprivate.h
N mod_revocator/unescape.cpp
N mod_revocator/configure
N mod_revocator/COPYING
N mod_revocator/download.h
N mod_revocator/config.sub
N mod_revocator/client_err.h
N mod_revocator/autom4te.cache/traces.0
N mod_revocator/autom4te.cache/output.0
N mod_revocator/autom4te.cache/requests
N mod_revocator/mozilla/README
N mod_revocator/mozilla/security/nss/lib/base/baset.h
N mod_revocator/mozilla/security/nss/lib/base/nssbase.h
N mod_revocator/mozilla/security/nss/lib/base/nssbaset.h
N mod_revocator/mozilla/security/nss/lib/base/base.h
N mod_revocator/mozilla/security/nss/lib/ckfw/ckfwm.h
N mod_revocator/mozilla/security/nss/lib/ckfw/ckmd.h
N mod_revocator/mozilla/security/nss/lib/ckfw/ckapi.perl
N mod_revocator/mozilla/security/nss/lib/ckfw/ckfwtm.h
N mod_revocator/mozilla/security/nss/lib/ckfw/nssckfwc.h
N mod_revocator/mozilla/security/nss/lib/ckfw/nssckfwt.h
N mod_revocator/mozilla/security/nss/lib/ckfw/nssck.api
N mod_revocator/mozilla/security/nss/lib/ckfw/nssckt.h
N mod_revocator/mozilla/security/nss/lib/ckfw/nssckmdt.h
N mod_revocator/mozilla/security/nss/lib/ckfw/ckt.h
N mod_revocator/mozilla/security/nss/lib/ckfw/nssckepv.h
N mod_revocator/mozilla/security/nss/lib/ckfw/nssckfw.h
N mod_revocator/mozilla/security/nss/lib/ckfw/ck.api
N mod_revocator/mozilla/security/nss/lib/ckfw/ckfw.h
N mod_revocator/mozilla/security/nss/lib/ckfw/nssckft.h
N mod_revocator/mozilla/security/nss/lib/ckfw/ck.h
N mod_revocator/mozilla/security/nss/lib/ckfw/nssckg.h
No conflicts created by this import
17 years, 1 month
[Fedora-directory-commits] mod_nss mod_nss.c, 1.12, 1.13 mod_nss.h, 1.12, 1.13 nss_engine_vars.c, 1.6, 1.7
by Doctor Conrad
Author: rcritten
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29645
Modified Files:
mod_nss.c mod_nss.h nss_engine_vars.c
Log Message:
200610
Change the kludge for determining the current version of Apache we're
building against. Claim to be building against 2.0.55 if not told
otherwise. The exact version matters less than knowing which API to
use.
Index: mod_nss.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/mod_nss.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_nss.c 20 Jun 2006 20:25:20 -0000 1.12
+++ mod_nss.c 3 Aug 2006 13:29:05 -0000 1.13
@@ -399,7 +399,7 @@
ap_hook_pre_connection(nss_hook_pre_connection,NULL,NULL, APR_HOOK_MIDDLE);
ap_hook_post_config (nss_init_Module, NULL,NULL, APR_HOOK_MIDDLE);
-#ifndef AP_SERVER_MAJORVERSION_NUMBER
+#if AP_SERVER_MINORVERSION_NUMBER < 2 /* See comment in mod_nss.h */
ap_hook_http_method (nss_hook_http_scheme, NULL,NULL, APR_HOOK_MIDDLE);
#else
ap_hook_http_scheme (nss_hook_http_scheme, NULL,NULL, APR_HOOK_MIDDLE);
Index: mod_nss.h
===================================================================
RCS file: /cvs/dirsec/mod_nss/mod_nss.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_nss.h 20 Jun 2006 20:25:20 -0000 1.12
+++ mod_nss.h 3 Aug 2006 13:29:05 -0000 1.13
@@ -327,8 +327,17 @@
} cipher_properties;
/* Compatibility between Apache 2.0.x and 2.2.x. The numeric version of
- * the version first appeared in Apache 2.2.0 */
+ * the version first appeared in Apache 2.0.56-dev. I picked 2.0.55 as it
+ * is the last version without this define. This is used for more than just
+ * the below defines. It also determines which API is used.
+ */
#ifndef AP_SERVER_MAJORVERSION_NUMBER
+#define AP_SERVER_MAJORVERSION_NUMBER 2
+#define AP_SERVER_MINORVERSION_NUMBER 0
+#define AP_SERVER_PATCHLEVEL_NUMBER 55
+#endif
+
+#if AP_SERVER_MINORVERSION_NUMBER < 2
typedef struct regex_t ap_regex_t;
#define AP_REG_EXTENDED REG_EXTENDED
#define AP_REG_NOSUB REG_NOSUB
Index: nss_engine_vars.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_vars.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nss_engine_vars.c 7 Apr 2006 20:17:12 -0000 1.6
+++ nss_engine_vars.c 3 Aug 2006 13:29:05 -0000 1.7
@@ -101,7 +101,7 @@
else if (strcEQ(var, "REQUEST_METHOD"))
result = (char *)(r->method);
else if (strcEQ(var, "REQUEST_SCHEME"))
-#ifndef AP_SERVER_MAJORVERSION_NUMBER
+#if AP_SERVER_MINORVERSION_NUMBER < 2 /* See comment in mod_nss.h */
result = (char *)ap_http_method(r);
#else
result = (char *)ap_http_scheme(r);
17 years, 1 month
[Fedora-directory-commits] mod_nss nss_engine_init.c,1.21,1.22
by Doctor Conrad
Author: rcritten
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31536
Modified Files:
nss_engine_init.c
Log Message:
200855
Turns out I didn't need to defer startup at all, the LogLevel in nss.conf
was enough. I actually had the compare reversed anyway, but that was
the least of the problem. 30% of the time the server would core during
shutdown due to a race condition.
Index: nss_engine_init.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nss_engine_init.c 2 Aug 2006 15:14:47 -0000 1.21
+++ nss_engine_init.c 2 Aug 2006 18:59:12 -0000 1.22
@@ -969,9 +969,7 @@
nss_init_ctx(s, p, ptemp, sc->proxy);
- /* Only try to load the certificates once the server is up */
- if (mc->nInitCount < 2)
- nss_init_server_certs(s, p, ptemp, sc->proxy);
+ nss_init_server_certs(s, p, ptemp, sc->proxy);
}
static void nss_init_server_ctx(server_rec *s,
@@ -985,9 +983,7 @@
nss_init_ctx(s, p, ptemp, sc->server);
- /* Only try to load the certificates once the server is up */
- if (mc->nInitCount < 2)
- nss_init_server_certs(s, p, ptemp, sc->server);
+ nss_init_server_certs(s, p, ptemp, sc->server);
}
/*
17 years, 1 month
[Fedora-directory-commits] mod_nss nss.conf.in, 1.8, 1.9 nss_engine_init.c, 1.20, 1.21
by Doctor Conrad
Author: rcritten
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21001
Modified Files:
nss.conf.in nss_engine_init.c
Log Message:
200855
Defer loading the server certificates until the 2nd module load. Otherwise
any problems with said certificate(s) will not be displayed because
the VirtualHost logging hasn't been turned on yet.
Switch a slew of APLOG_INFO to APLOG_ERR.
And add a default LogLevel to nss.conf.in. This is not inherited from
httpd.conf.
Index: nss.conf.in
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss.conf.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nss.conf.in 2 Mar 2006 19:21:54 -0000 1.8
+++ nss.conf.in 2 Aug 2006 15:14:47 -0000 1.9
@@ -76,8 +76,10 @@
#ServerAdmin you(a)example.com
# mod_nss can log to separate log files, you can choose to do that if you'd like
+# LogLevel is not inherited from httpd.conf.
#ErrorLog @apache_prefix@/logs/error_log
#TransferLog @apache_prefix@/logs/access_log
+LogLevel warn
# SSL Engine Switch:
# Enable/Disable SSL for this virtual host.
Index: nss_engine_init.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nss_engine_init.c 21 Jun 2006 14:25:51 -0000 1.20
+++ nss_engine_init.c 2 Aug 2006 15:14:47 -0000 1.21
@@ -831,7 +831,7 @@
}
}
} else {
- ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
"Certificate not found: '%s'", nickname);
nss_die();
}
@@ -848,7 +848,7 @@
* Slot not found. This should never happen because we
* already found the cert.
*/
- ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
"Slot not found");
nss_log_nss_error(APLOG_MARK, APLOG_ERR, s);
free(token);
@@ -866,7 +866,7 @@
PK11_FreeSlot(slot);
if (*serverkey == NULL) {
- ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
"Key not found for: '%s'", nickname);
nss_log_nss_error(APLOG_MARK, APLOG_ERR, s);
nss_die();
@@ -889,21 +889,21 @@
/* ok */
break;
case secCertTimeExpired:
- ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
"Server certificate is expired: '%s'", nickname);
break;
case secCertTimeNotValidYet:
- ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
"Certificate is not valid yet '%s'", nickname);
default:
- ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
"Unhandled Certificate time type %d for: '%s'", certtimestatus, nickname);
break;
}
secstatus = SSL_ConfigSecureServer(model, *servercert, *serverkey, *KEAtype);
if (secstatus != SECSuccess) {
- ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
"SSL error configuring server: '%s'", nickname);
nss_log_nss_error(APLOG_MARK, APLOG_ERR, s);
nss_die();
@@ -945,7 +945,7 @@
secstatus = (SECStatus)SSL_SetPKCS11PinArg(mctx->model, NULL);
if (secstatus != SECSuccess) {
- ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
"Error setting PKCS11 pin argument: '%s'", mctx->nickname);
nss_die();
}
@@ -953,7 +953,7 @@
secstatus = (SECStatus)SSL_HandshakeCallback(mctx->model, (SSLHandshakeCallback)NSSHandshakeCallback, NULL);
if (secstatus != SECSuccess)
{
- ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
"SSL error configuring handshake callback: '%s'", mctx->nickname);
nss_log_nss_error(APLOG_MARK, APLOG_ERR, s);
nss_die();
@@ -965,9 +965,13 @@
apr_pool_t *ptemp,
SSLSrvConfigRec *sc)
{
+ SSLModConfigRec *mc = myModConfig(s);
+
nss_init_ctx(s, p, ptemp, sc->proxy);
- nss_init_server_certs(s, p, ptemp, sc->proxy);
+ /* Only try to load the certificates once the server is up */
+ if (mc->nInitCount < 2)
+ nss_init_server_certs(s, p, ptemp, sc->proxy);
}
static void nss_init_server_ctx(server_rec *s,
@@ -975,11 +979,15 @@
apr_pool_t *ptemp,
SSLSrvConfigRec *sc)
{
+ SSLModConfigRec *mc = myModConfig(s);
+
nss_init_server_check(s, p, ptemp, sc->server);
nss_init_ctx(s, p, ptemp, sc->server);
- nss_init_server_certs(s, p, ptemp, sc->server);
+ /* Only try to load the certificates once the server is up */
+ if (mc->nInitCount < 2)
+ nss_init_server_certs(s, p, ptemp, sc->server);
}
/*
17 years, 1 month