[Fedora-directory-commits] coolkey configure.in, 1.12, 1.13 ltmain.sh, 1.2, 1.3
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4442
Modified Files:
configure.in ltmain.sh
Log Message:
make install fixes for windows
Index: configure.in
===================================================================
RCS file: /cvs/dirsec/coolkey/configure.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- configure.in 14 Feb 2007 01:42:32 -0000 1.12
+++ configure.in 16 Feb 2007 19:46:02 -0000 1.13
@@ -65,6 +65,11 @@
CC=cl
CXX=cl
CXXFLAGS="$CXXFLAGS /EHsc"
+ #
+ # Sigh, prevents us from overriding it with --libdir= in the config
+ * line, but we can still override it in the make line.
+ #
+ libdir=`cygpath ${WINDIR}/system32`
;;
*-*-darwin*)
AC_MSG_RESULT([MAC])
Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/coolkey/ltmain.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ltmain.sh 25 Aug 2006 00:31:39 -0000 1.2
+++ ltmain.sh 16 Feb 2007 19:46:02 -0000 1.3
@@ -5367,7 +5367,7 @@
test "X$dir" = "X$file/" && dir=
dir="$dir$objdir"
- if test -n "$relink_command"; then
+ if test -n "$relink_command" -a "$version_type" != "windows" ; then
# Determine the prefix the user has applied to our future dir.
inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
@@ -5406,7 +5406,7 @@
shift
srcname="$realname"
- test -n "$relink_command" && srcname="$realname"T
+ test -n "$relink_command" -a "$version_type" != "windows" && srcname="$realname"T
# Install the shared library and build the symlinks.
$show "$install_prog $dir/$srcname $destdir/$realname"
17 years, 2 months
[Fedora-directory-commits] coolkey/src/coolkey coolkey.cpp, 1.1, 1.2 log.cpp, 1.1, 1.2 log.h, 1.3, 1.4 slot.cpp, 1.5, 1.6
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15243
Modified Files:
coolkey.cpp log.cpp log.h slot.cpp
Log Message:
Add optional SYSLOG logging for Linux and Mac.
Allow CAC cards which have only one cert to operate.
Index: coolkey.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/coolkey.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- coolkey.cpp 9 Jun 2006 18:39:11 -0000 1.1
+++ coolkey.cpp 14 Feb 2007 19:54:01 -0000 1.2
@@ -225,10 +225,15 @@
}
}
char * logFileName = getenv("COOL_KEY_LOG_FILE");
- if (logFileName)
- log = new FileLog(logFileName);
- else
+ if (logFileName) {
+ if (strcmp(logFileName,"SYSLOG") == 0) {
+ log = new SysLog();
+ } else {
+ log = new FileLog(logFileName);
+ }
+ } else {
log = new DummyLog();
+ }
log->log("Initialize called, hello %d\n", 5);
CKY_SetName("coolkey");
slotList = new SlotList(log);
Index: log.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/log.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- log.cpp 9 Jun 2006 18:39:11 -0000 1.1
+++ log.cpp 14 Feb 2007 19:54:01 -0000 1.2
@@ -24,6 +24,9 @@
#include "log.h"
#include <cstdarg>
#include "PKCS11Exception.h"
+#ifndef _WIN32
+#include "syslog.h"
+#endif
FileLog::FileLog(const char *filename )
@@ -81,3 +84,30 @@
{
fclose(file);
}
+
+
+void
+SysLog::log(const char *msg, ...)
+{
+#ifndef _WIN32
+
+#define COOLKEY_PREFIX "libcoolkey:"
+ va_list ap;
+ char *msg2;
+
+ va_start(ap, msg);
+
+ msg2 = (char *)malloc(strlen(msg)+sizeof(COOLKEY_PREFIX));
+ if (msg2) {
+ strcpy(msg2, COOLKEY_PREFIX);
+ strcat(msg2, msg);
+
+ vsyslog(LOG_WARNING, msg2, ap);
+ free(msg2);
+ } else {
+ vsyslog(LOG_WARNING, msg, ap);
+ }
+
+ va_end(ap);
+#endif
+}
Index: log.h
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/log.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- log.h 30 Nov 2006 22:35:22 -0000 1.3
+++ log.h 14 Feb 2007 19:54:01 -0000 1.4
@@ -58,9 +58,9 @@
SysLog(SysLog &) {}
SysLog & operator=(SysLog &) { return *this; }
public:
- SysLog() { }
+ SysLog() {}
void log(const char *msg, ...);
- virtual ~SysLog() { }
+ virtual ~SysLog() {}
};
#endif
Index: slot.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/slot.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- slot.cpp 14 Feb 2007 00:46:28 -0000 1.5
+++ slot.cpp 14 Feb 2007 19:54:01 -0000 1.6
@@ -2082,7 +2082,7 @@
* is now valid */
shmem.setValid();
}
-
+ return;
}
}
17 years, 2 months
[Fedora-directory-commits] coolkey configure.in,1.11,1.12
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23586
Modified Files:
configure.in
Log Message:
Make sure windows still build when following the instructions from the wikki
Index: configure.in
===================================================================
RCS file: /cvs/dirsec/coolkey/configure.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- configure.in 14 Feb 2007 00:46:28 -0000 1.11
+++ configure.in 14 Feb 2007 01:42:32 -0000 1.12
@@ -54,8 +54,8 @@
*-*-win*|*-*-cygwin*)
AC_MSG_RESULT([Windows])
WINDOWS=1
- #ZLIB_CFLAGS=-Ic:/zlib
- #ZLIB_LIBS=c:/zlib/zlib.dll
+ ZLIB_CFLAGS=-I${ZLIB_INCLUDE}
+ ZLIB_LIBS=${ZLIB_LIB}/zdll.dll
#OS_FLAGS=`echo $INCLUDE | tr '[[:upper:]]' '[[:lower:]]' | sed -e 's;\\\\;/;g' -e 's;.:;/cygdrive/&/;g' -e 's;:;;g' -e 's;//;/;g' -e 's/;/\" -I\"/g' -e 's;^;-I\";' -e 's;$;\";'`
CPPFLAGS="$CPPFLAGS $OS_FLAGS -DWIN32"
LDFLAGS="$LDFLAGS"
17 years, 2 months
[Fedora-directory-commits] coolkey/src/coolkey Makefile.am, 1.5, 1.6 Makefile.in, 1.8, 1.9 machdep.cpp, 1.3, 1.4 slot.cpp, 1.4, 1.5
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19672/src/coolkey
Modified Files:
Makefile.am Makefile.in machdep.cpp slot.cpp
Log Message:
Make file clean up:
don't distribute .a and .la files.
fix build problem when --enable-pk11install is not set.
Add dist values so make dist includes the correct files.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.am 18 Jan 2007 01:00:25 -0000 1.5
+++ Makefile.am 14 Feb 2007 00:46:28 -0000 1.6
@@ -21,6 +21,7 @@
SUBDIRS =
AM_CPP_FLAGS =
+EXTRA_DIST = coolkeypk11.def
pkcs11dir = $(libdir)/pkcs11
pkcs11_LTLIBRARIES = libcoolkeypk11.la
@@ -33,7 +34,6 @@
object.cpp \
PKCS11Exception.cpp \
slot.cpp \
- config.h \
locking.h \
log.h \
machdep.h \
@@ -65,6 +65,10 @@
clean-generic:
rm -f coolkeypk11.sym
+# remove the static and libtool libraries if necessary
+install-data-hook:
+ rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.a
+ rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.la
#MODULE = coolkeypk11
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 18 Jan 2007 01:00:55 -0000 1.8
+++ Makefile.in 14 Feb 2007 00:46:28 -0000 1.9
@@ -234,6 +234,7 @@
target_vendor = @target_vendor@
SUBDIRS =
AM_CPP_FLAGS =
+EXTRA_DIST = coolkeypk11.def
pkcs11dir = $(libdir)/pkcs11
pkcs11_LTLIBRARIES = libcoolkeypk11.la
libcoolkeypk11_la_SOURCES = \
@@ -245,7 +246,6 @@
object.cpp \
PKCS11Exception.cpp \
slot.cpp \
- config.h \
locking.h \
log.h \
machdep.h \
@@ -655,6 +655,8 @@
info-am:
install-data-am: install-pkcs11LTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
install-exec-am:
@@ -692,14 +694,15 @@
distclean-compile distclean-generic distclean-libtool \
distclean-recursive distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-pkcs11LTLIBRARIES \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- 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-info-am uninstall-pkcs11LTLIBRARIES
+ install-data-am install-data-hook install-exec install-exec-am \
+ install-info install-info-am install-man \
+ install-pkcs11LTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic 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-info-am \
+ uninstall-pkcs11LTLIBRARIES
#
@@ -713,6 +716,11 @@
clean-generic:
rm -f coolkeypk11.sym
+# remove the static and libtool libraries if necessary
+install-data-hook:
+ rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.a
+ rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.la
+
#MODULE = coolkeypk11
#REQUIRES = ckyapplet zlib
#USE_STATIC_RTL=1
Index: machdep.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/machdep.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- machdep.cpp 7 Sep 2006 20:57:20 -0000 1.3
+++ machdep.cpp 14 Feb 2007 00:46:28 -0000 1.4
@@ -247,7 +247,9 @@
// from getSHMemAddr.
return NULL;
}
+ int mask = umask(0);
int ret = mkdir (MEMSEGPATH, 0777);
+ umask(mask);
if ((ret == -1) && (errno != EEXIST)) {
delete shmemData;
return NULL;
Index: slot.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/slot.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- slot.cpp 30 Nov 2006 23:24:46 -0000 1.4
+++ slot.cpp 14 Feb 2007 00:46:28 -0000 1.5
@@ -625,14 +625,10 @@
return;
}
state |= CAC_CARD | APPLET_SELECTABLE | APPLET_PERSONALIZED;
- /* ARG CAC is evil. once you've selected an applet, you cannot
- * select the card manager unless you reset the card...
- * ... even removing and reinserting the card does not change the
- * applet selection,
- * do so reset the card now so we can get the CUID
- * NOTE: this will cause other apps to loose login state!
- CKYCardConnection_Reset(conn);
- readCUID(); /* get the CUID before we loose the ability to */
+ /* skip the read of the cuid. We really don't need it and,
+ * the only way to get it from the cac is to reset it.
+ * other apps may be running now, so resetting the cac is a bit
+ * unfriendly */
isVersion1Key = 0;
needLogin = 1;
@@ -692,6 +688,8 @@
{
if (isVersion1Key) {
if (hard) {
+ reverify = false; /* no need to revalidate in the future,
+ * we're clearing the nonce now */
nonceValid = false;
CKYBuffer_Zero(&nonce);
CKYBuffer_Resize(&nonce,8);
17 years, 2 months
[Fedora-directory-commits] coolkey/src/libckyapplet Makefile.am, 1.4, 1.5 Makefile.in, 1.9, 1.10
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey/src/libckyapplet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19672/src/libckyapplet
Modified Files:
Makefile.am Makefile.in
Log Message:
Make file clean up:
don't distribute .a and .la files.
fix build problem when --enable-pk11install is not set.
Add dist values so make dist includes the correct files.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am 30 Nov 2006 22:35:28 -0000 1.4
+++ Makefile.am 14 Feb 2007 00:46:29 -0000 1.5
@@ -23,6 +23,12 @@
AM_CFLAGS =
+EXTRA_DIST = \
+ cky_list.i \
+ dynlink_win.c \
+ dynlink_unix.c \
+ dynlink_mac.c
+
# bleh what do I add just to get static but pic libraries?
bogusdir = $(libdir)/bogus
lib_LTLIBRARIES = libckyapplet.la
@@ -50,5 +56,10 @@
cky_basei.h \
dynlink.h
+# remove the static and libtool libraries
+install-data-hook:
+ rm -f $(DESTDIR)$(libdir)/libckyapplet.a
+ rm -f $(DESTDIR)$(libdir)/libckyapplet.la
+
pcdir = $(libdir)/pkgconfig
pc_DATA = libckyapplet.pc
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 30 Nov 2006 22:35:28 -0000 1.9
+++ Makefile.in 14 Feb 2007 00:46:29 -0000 1.10
@@ -233,6 +233,12 @@
target_vendor = @target_vendor@
SUBDIRS =
AM_CFLAGS =
+EXTRA_DIST = \
+ cky_list.i \
+ dynlink_win.c \
+ dynlink_unix.c \
+ dynlink_mac.c
+
# bleh what do I add just to get static but pic libraries?
bogusdir = $(libdir)/bogus
@@ -667,6 +673,8 @@
info-am:
install-data-am: install-nobase_includeHEADERS install-pcDATA
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
install-exec-am: install-libLTLIBRARIES
@@ -705,17 +713,22 @@
distclean-compile distclean-generic distclean-libtool \
distclean-recursive distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-libLTLIBRARIES install-man \
- install-nobase_includeHEADERS install-pcDATA install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic \
+ install-data-am install-data-hook install-exec install-exec-am \
+ install-info install-info-am install-libLTLIBRARIES \
+ install-man install-nobase_includeHEADERS install-pcDATA \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
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-info-am uninstall-libLTLIBRARIES \
uninstall-nobase_includeHEADERS uninstall-pcDATA
+
+# remove the static and libtool libraries
+install-data-hook:
+ rm -f $(DESTDIR)$(libdir)/libckyapplet.a
+ rm -f $(DESTDIR)$(libdir)/libckyapplet.la
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
17 years, 2 months
[Fedora-directory-commits] coolkey configure.in, 1.10, 1.11 configure, 1.8, 1.9 coolkey.spec, 1.6, 1.7
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19672
Modified Files:
configure.in configure coolkey.spec
Log Message:
Make file clean up:
don't distribute .a and .la files.
fix build problem when --enable-pk11install is not set.
Add dist values so make dist includes the correct files.
Index: configure.in
===================================================================
RCS file: /cvs/dirsec/coolkey/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- configure.in 9 Feb 2007 18:47:42 -0000 1.10
+++ configure.in 14 Feb 2007 00:46:28 -0000 1.11
@@ -103,21 +103,13 @@
AC_SUBST(LIBCKYAPPLET)
LIBCKYAPPLET="\${top_builddir}/src/libckyapplet/libckyapplet.la"
-AC_ARG_WITH(pcsclite,
- [ --with-pcsclite Use pcsc-lite (default=yes)])
-if test "$with_pcsclite" = "no" -o "$with_pcsclite" = "false"
-then
- with_pcsclite=no
-else
- PKG_CHECK_MODULES(PCSC, libpcsclite, [ with_pcsclite=yes ],
- [ if test -f /usr/local/lib/pkgconfig/libpcsclite.pc ; then
- AC_MSG_ERROR([use PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure])
+PKG_CHECK_MODULES(PCSC, libpcsclite, true,
+ [ if $UNIX -eq 1 ; then
+ AC_MSG_ERROR([could not find pcsc-lite libraries])
else
AC_MSG_WARN([pcsc-lite not found])
- with_pcsclite=no
fi
])
-fi
# Add argument for pk11install
AC_ARG_ENABLE(pk11install,
Index: configure
===================================================================
RCS file: /cvs/dirsec/coolkey/configure,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- configure 9 Feb 2007 18:47:42 -0000 1.8
+++ configure 14 Feb 2007 00:46:28 -0000 1.9
@@ -1068,7 +1068,6 @@
both]
--with-tags[=TAGS]
include additional configurations [automatic]
- --with-pcsclite Use pcsc-lite (default=yes)
Some influential environment variables:
CC C compiler command
@@ -4288,7 +4287,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4291 "configure"' > conftest.$ac_ext
+ echo '#line 4290 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5423,7 +5422,7 @@
# Provide some information about the compiler.
-echo "$as_me:5426:" \
+echo "$as_me:5425:" \
"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
@@ -6486,11 +6485,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:6489: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6488: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6493: \$? = $ac_status" >&5
+ echo "$as_me:6492: \$? = $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.
@@ -6754,11 +6753,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:6757: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6756: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6761: \$? = $ac_status" >&5
+ echo "$as_me:6760: \$? = $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.
@@ -6858,11 +6857,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:6861: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6860: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6865: \$? = $ac_status" >&5
+ echo "$as_me:6864: \$? = $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
@@ -8327,7 +8326,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8330 "configure"' > conftest.$ac_ext
+ echo '#line 8329 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9224,7 +9223,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9227 "configure"
+#line 9226 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9324,7 +9323,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9327 "configure"
+#line 9326 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11665,11 +11664,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:11668: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11667: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11672: \$? = $ac_status" >&5
+ echo "$as_me:11671: \$? = $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.
@@ -11769,11 +11768,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:11772: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11771: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11776: \$? = $ac_status" >&5
+ echo "$as_me:11775: \$? = $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
@@ -12305,7 +12304,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12308 "configure"' > conftest.$ac_ext
+ echo '#line 12307 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -13360,11 +13359,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:13363: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13362: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13367: \$? = $ac_status" >&5
+ echo "$as_me:13366: \$? = $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.
@@ -13464,11 +13463,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:13467: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13466: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13471: \$? = $ac_status" >&5
+ echo "$as_me:13470: \$? = $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
@@ -14913,7 +14912,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 14916 "configure"' > conftest.$ac_ext
+ echo '#line 14915 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -15688,11 +15687,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:15691: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15690: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15695: \$? = $ac_status" >&5
+ echo "$as_me:15694: \$? = $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.
@@ -15956,11 +15955,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:15959: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15958: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15963: \$? = $ac_status" >&5
+ echo "$as_me:15962: \$? = $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.
@@ -16060,11 +16059,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:16063: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16062: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16067: \$? = $ac_status" >&5
+ echo "$as_me:16066: \$? = $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
@@ -17529,7 +17528,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 17532 "configure"' > conftest.$ac_ext
+ echo '#line 17531 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -19004,16 +19003,6 @@
LIBCKYAPPLET="\${top_builddir}/src/libckyapplet/libckyapplet.la"
-# Check whether --with-pcsclite or --without-pcsclite was given.
-if test "${with_pcsclite+set}" = set; then
- withval="$with_pcsclite"
-
-fi;
-if test "$with_pcsclite" = "no" -o "$with_pcsclite" = "false"
-then
- with_pcsclite=no
-else
-
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
@@ -19177,25 +19166,23 @@
# Put the nasty error message in config.log where it belongs
echo "$PCSC_PKG_ERRORS" >&5
- if test -f /usr/local/lib/pkgconfig/libpcsclite.pc ; then
- { { echo "$as_me:$LINENO: error: use PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure" >&5
-echo "$as_me: error: use PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure" >&2;}
+ if $UNIX -eq 1 ; then
+ { { echo "$as_me:$LINENO: error: could not find pcsc-lite libraries" >&5
+echo "$as_me: error: could not find pcsc-lite libraries" >&2;}
{ (exit 1); exit 1; }; }
else
{ echo "$as_me:$LINENO: WARNING: pcsc-lite not found" >&5
echo "$as_me: WARNING: pcsc-lite not found" >&2;}
- with_pcsclite=no
fi
elif test $pkg_failed = untried; then
- if test -f /usr/local/lib/pkgconfig/libpcsclite.pc ; then
- { { echo "$as_me:$LINENO: error: use PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure" >&5
-echo "$as_me: error: use PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure" >&2;}
+ if $UNIX -eq 1 ; then
+ { { echo "$as_me:$LINENO: error: could not find pcsc-lite libraries" >&5
+echo "$as_me: error: could not find pcsc-lite libraries" >&2;}
{ (exit 1); exit 1; }; }
else
{ echo "$as_me:$LINENO: WARNING: pcsc-lite not found" >&5
echo "$as_me: WARNING: pcsc-lite not found" >&2;}
- with_pcsclite=no
fi
else
@@ -19203,8 +19190,7 @@
PCSC_LIBS=$pkg_cv_PCSC_LIBS
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
- with_pcsclite=yes
-fi
+ true
fi
# Add argument for pk11install
Index: coolkey.spec
===================================================================
RCS file: /cvs/dirsec/coolkey/coolkey.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- coolkey.spec 18 Aug 2006 16:04:42 -0000 1.6
+++ coolkey.spec 14 Feb 2007 00:46:28 -0000 1.7
@@ -18,8 +18,8 @@
# END COPYRIGHT BLOCK
Name: coolkey
-Version: 1.0.1
-Release: 2
+Version: 1.1.0
+Release: 1
Summary: CoolKey PKCS #11 module
License: LGPL
URL: http://directory.fedora.redhat.com/wiki/CoolKey
@@ -57,10 +57,6 @@
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
ln -s pkcs11/libcoolkeypk11.so $RPM_BUILD_ROOT/%{_libdir}
-rm -f $RPM_BUILD_ROOT/%{_libdir}/pkcs11/libcoolkeypk11.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/pkcs11/libcoolkeypk11.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libckyapplet.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libckyapplet.la
%clean
rm -rf $RPM_BUILD_ROOT
@@ -84,6 +80,17 @@
%changelog
+* Wed Feb 14 2007 Bob Relyea <rrelyea(a)redhat.com> - 1.1.0
+- Clear any logout rests after a successful login.
+- Don't grab the CUID on cac's. Reseting the card causes it to
+- logout of other applications.
+- Shared memory directory needs to be writeable by all so
+- coolkey can create caches for any user. (lack of caches
+- show up in screen savers reactly slowly).
+- fix login hw race failures
+- make the coolkey token caches persist over application calls.
+- make a separate cache for each user.
+
* Sun Jul 16 2006 Florian La Roche <laroche(a)redhat.com> - 1.0.1-2
- fix excludearch line
17 years, 2 months
[Fedora-directory-commits] ldapserver configure.ac, 1.18, 1.19 aclocal.m4, 1.18, 1.19 configure, 1.27, 1.28 missing, 1.13, 1.14 install-sh, 1.13, 1.14 depcomp, 1.13, 1.14 compile, 1.13, 1.14 config.sub, 1.12, 1.13 config.guess, 1.12, 1.13 Makefile.in, 1.28, 1.29
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23957
Modified Files:
configure.ac aclocal.m4 configure missing install-sh depcomp
compile config.sub config.guess Makefile.in
Log Message:
change version to 1.1.0a1
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure.ac 12 Feb 2007 19:39:03 -0000 1.18
+++ configure.ac 13 Feb 2007 19:00:11 -0000 1.19
@@ -1,7 +1,8 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([fedora-ds], [1.1.0], [http://bugzilla.redhat.com/])
+# This version is the version returned by ns-slapd -v
+AC_INIT([fedora-ds], [1.1.0a1], [http://bugzilla.redhat.com/])
# AC_CONFIG_HEADER must be called right after AC_INIT.
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- configure 12 Feb 2007 19:39:03 -0000 1.27
+++ configure 13 Feb 2007 19:00:11 -0000 1.28
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for fedora-ds 1.1.0.
+# Generated by GNU Autoconf 2.59 for fedora-ds 1.1.0a1.
#
# Report bugs to <http://bugzilla.redhat.com/>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='fedora-ds'
PACKAGE_TARNAME='fedora-ds'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='fedora-ds 1.1.0'
+PACKAGE_VERSION='1.1.0a1'
+PACKAGE_STRING='fedora-ds 1.1.0a1'
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 fedora-ds 1.1.0 to adapt to many kinds of systems.
+\`configure' configures fedora-ds 1.1.0a1 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 fedora-ds 1.1.0:";;
+ short | recursive ) echo "Configuration of fedora-ds 1.1.0a1:";;
esac
cat <<\_ACEOF
@@ -1188,7 +1188,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-fedora-ds configure 1.1.0
+fedora-ds configure 1.1.0a1
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1202,7 +1202,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by fedora-ds $as_me 1.1.0, which was
+It was created by fedora-ds $as_me 1.1.0a1, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1848,7 +1848,7 @@
# Define the identity of the package.
PACKAGE='fedora-ds'
- VERSION='1.1.0'
+ VERSION='1.1.0a1'
cat >>confdefs.h <<_ACEOF
@@ -25331,7 +25331,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by fedora-ds $as_me 1.1.0, which was
+This file was extended by fedora-ds $as_me 1.1.0a1, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25394,7 +25394,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-fedora-ds config.status 1.1.0
+fedora-ds config.status 1.1.0a1
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
17 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm dblayer.c, 1.16, 1.17 perfctrs.c, 1.5, 1.6
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29096/ldapserver/ldap/servers/slapd/back-ldbm
Modified Files:
dblayer.c perfctrs.c
Log Message:
Resolves: bug 228334
Bug Description: Allow building with bdb 4.4 or later
Reviewed by: nkinder (Thanks!)
Fix Description: db.m4 already had code to detect and use the correct version of db headers and libraries. There have been some minor api changes since 4.3, so not much code changes were required. Note that this merely allows the server to build and run with db4.4 or later, not to take advantage of the newer features of the API.
Platforms tested: FC7
Flag Day: no
Doc impact: no
Index: dblayer.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dblayer.c 2 Dec 2006 00:14:25 -0000 1.16
+++ dblayer.c 12 Feb 2007 21:13:07 -0000 1.17
@@ -122,8 +122,6 @@
#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4000
#define DB_ENV_SET_REGION_INIT(env) (env)->set_flags((env), DB_REGION_INIT, 1)
-#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
- (env)->set_tas_spins((env), (tas_spins))
#define TXN_BEGIN(env, parent_txn, tid, flags) \
(env)->txn_begin((env), (parent_txn), (tid), (flags))
#define TXN_COMMIT(txn, flags) (txn)->commit((txn), (flags))
@@ -139,7 +137,13 @@
#define LOG_FLUSH(env, lsn) (env)->log_flush((env), (lsn))
#define LOCK_DETECT(env, flags, atype, aborted) \
(env)->lock_detect((env), (flags), (atype), (aborted))
-
+#if DB_VERSION_MINOR >= 4 /* i.e. 4.4 or later */
+#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
+ (env)->mutex_set_tas_spins((env), (tas_spins))
+#else /* < 4.4 */
+#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
+ (env)->set_tas_spins((env), (tas_spins))
+#endif /* 4.4 or later */
#else /* older than db 4.0 */
#define DB_ENV_SET_REGION_INIT(env) db_env_set_region_init(1)
#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
Index: perfctrs.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/perfctrs.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perfctrs.c 10 Nov 2006 23:45:39 -0000 1.5
+++ perfctrs.c 12 Feb 2007 21:13:07 -0000 1.6
@@ -53,6 +53,11 @@
#define LOG_STAT(env, spp, flags, malloc) (env)->log_stat((env), (spp), (flags))
#define LOCK_STAT(env, statp, flags, malloc) \
(env)->lock_stat((env), (statp), (flags))
+#if DB_VERSION_MINOR >= 4 /* i.e. 4.4 or later */
+#define GET_N_LOCK_WAITS(lockstat) lockstat->st_lock_wait
+#else
+#define GET_N_LOCK_WAITS(lockstat) lockstat->st_nconflicts
+#endif
#else /* older than db 4.0 */
#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 3300
@@ -60,13 +65,14 @@
#define MEMP_STAT(env, gsp, fsp, flags, malloc) memp_stat((env), (gsp), (fsp))
#define LOG_STAT(env, spp, flags, malloc) log_stat((env), (spp))
#define LOCK_STAT(env, statp, flags, malloc) lock_stat((env), (statp))
-
+#define GET_N_LOCK_WAITS(lockstat) lockstat->st_nconflicts
#else /* older than db 3.3 */
#define TXN_STAT(env, statp, flags, malloc) txn_stat((env), (statp), (malloc))
#define MEMP_STAT(env, gsp, fsp, flags, malloc)
memp_stat((env), (gsp), (fsp), (malloc))
#define LOG_STAT(env, spp, flags, malloc) log_stat((env), (spp), (malloc))
#define LOCK_STAT(env, statp, flags, malloc) lock_stat((env), (statp), (malloc))
+#define GET_N_LOCK_WAITS(lockstat) lockstat->st_nconflicts
#endif
#endif
@@ -312,7 +318,7 @@
perf->current_locks = lockstat->st_nlocks;
perf->max_locks = lockstat->st_maxnlocks;
perf->lockers = lockstat->st_nlockers;
- perf->lock_conflicts = lockstat->st_nconflicts;
+ perf->lock_conflicts = GET_N_LOCK_WAITS(lockstat);
perf->lock_request_rate = lockstat->st_nrequests;
perf->current_lock_objects = lockstat->st_nobjects;
perf->max_lock_objects = lockstat->st_maxnobjects;
17 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication cl5_api.c, 1.12, 1.13
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29096/ldapserver/ldap/servers/plugins/replication
Modified Files:
cl5_api.c
Log Message:
Resolves: bug 228334
Bug Description: Allow building with bdb 4.4 or later
Reviewed by: nkinder (Thanks!)
Fix Description: db.m4 already had code to detect and use the correct version of db headers and libraries. There have been some minor api changes since 4.3, so not much code changes were required. Note that this merely allows the server to build and run with db4.4 or later, not to take advantage of the newer features of the API.
Platforms tested: FC7
Flag Day: no
Doc impact: no
Index: cl5_api.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_api.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cl5_api.c 15 Nov 2006 17:47:58 -0000 1.12
+++ cl5_api.c 12 Feb 2007 21:13:07 -0000 1.13
@@ -112,8 +112,6 @@
#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4000
#define DB_ENV_SET_REGION_INIT(env) (env)->set_flags((env), DB_REGION_INIT, 1)
-#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
- (env)->set_tas_spins((env), (tas_spins))
#define TXN_BEGIN(env, parent_txn, tid, flags) \
(env)->txn_begin((env), (parent_txn), (tid), (flags))
#define TXN_COMMIT(txn, flags) (txn)->commit((txn), (flags))
@@ -129,6 +127,13 @@
#define LOG_FLUSH(env, lsn) (env)->log_flush((env), (lsn))
#define LOCK_DETECT(env, flags, atype, aborted) \
(env)->lock_detect((env), (flags), (atype), (aborted))
+#if DB_VERSION_MINOR >= 4 /* i.e. 4.4 or later */
+#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
+ (env)->mutex_set_tas_spins((env), (tas_spins))
+#else /* < 4.4 */
+#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
+ (env)->set_tas_spins((env), (tas_spins))
+#endif /* 4.4 or later */
#else /* older than db 4.0 */
#define DB_ENV_SET_REGION_INIT(env) db_env_set_region_init(1)
17 years, 2 months
[Fedora-directory-commits] ldapserver/wrappers initscript.in, 1.2, 1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/wrappers
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25199
Modified Files:
initscript.in
Log Message:
Remove some bash-isms that were causing problems on RHEL-4
Index: initscript.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/initscript.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- initscript.in 12 Feb 2007 19:39:09 -0000 1.2
+++ initscript.in 12 Feb 2007 20:10:21 -0000 1.3
@@ -44,14 +44,14 @@
for FILE in `/bin/ls -d $instbase/slapd-* 2>/dev/null`; do
if [ -d "$FILE" ] ; then
- INSTANCES+=$(echo "$FILE" | sed -e "s|$instbase/slapd-||")
- INSTANCES+=" "
+ inst=$(echo "$FILE" | sed -e "s|$instbase/slapd-||")
+ INSTANCES="$INSTANCES $inst"
fi
done
if [ -n "$2" ]; then
for I in $INSTANCES; do
- if [ "$2" == "$I" ]; then
+ if [ "$2" = "$I" ]; then
INSTANCES="$2"
fi
done
17 years, 2 months