389-commits December 2005

389-commits@lists.fedoraproject.org

1 participants
58 discussions

[Fedora-directory-commits] adminserver/admserv/cfgstuff adminserver10to101.patch, NONE, 1.1
by Doctor Conrad 07 Dec '05

07 Dec '05

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5999 Added Files: adminserver10to101.patch Log Message: patch file to convert admin server version 1.0 files to version 1.0.1 adminserver10to101.patch: --- NEW FILE adminserver10to101.patch --- --- admin-serv/config/httpd.conf 3 Nov 2005 23:20:49 -0000 1.6 +++ admin-serv/config/httpd.conf 7 Dec 2005 04:11:38 -0000 @@ -243,19 +243,20 @@ # AllowOverride controls what directives may be placed in .htaccess files. # It can be "All", "None", or any combination of the keywords: # Options FileInfo AuthConfig Limit # AllowOverride None # # Controls who can get stuff from this server. -# - Order allow,deny - Allow from all +# By default, no one may access anything +# Access must be explicitly granted in admserv.conf + Order deny,allow + Deny from all </Directory> # # DirectoryIndex: sets the file that Apache will serve if a directory # is requested. # # The index.html.var file (a type-map) is used to deliver content- --- admin-serv/config/admserv.conf 19 Nov 2005 00:43:02 -0000 1.11 +++ admin-serv/config/admserv.conf 6 Dec 2005 18:38:57 -0000 @@ -20,24 +20,63 @@ # # To get the Admin Express working properly, add the following to # apache, either directly or thru an Include /path/to/this.conf SetEnv NETSITE_ROOT /opt/fedora-ds SetEnv ADMSERV_ROOT /opt/fedora-ds/admin-serv/config/ ADMCacheLifeTime 600 -ADMServerVersionString "Fedora-Administrator/1.0" +ADMServerVersionString "Fedora-Administrator/1.0.1" ScriptAlias /clients/orgchart/bin/ "/opt/fedora-ds/clients/orgchart/bin/" ScriptAlias /clients/dsgw/bin/ "/opt/fedora-ds/clients/dsgw/bin/" ScriptAlias /bin/admin/admin/bin/ "/opt/fedora-ds/bin/admin/admin/bin/" ScriptAlias /dist/ "/opt/fedora-ds/dist/" ScriptAlias /manual/help/ /opt/fedora-ds/manual/help/ +# all access is explicitly denied by default in httpd.conf +# the following Directory directives turn on access for specific +# directories +<Directory "/opt/fedora-ds/java/"> + AllowOverride None + Options None + Order allow,deny + Allow from all +</Directory> + +<Directory "/opt/fedora-ds/manual/"> + AllowOverride None + Options None + Order allow,deny + Allow from all +</Directory> + +<Directory "/opt/fedora-ds/clients/*/*html/"> + AllowOverride None + Options None + Order allow,deny + Allow from all +</Directory> + +<Directory "/opt/fedora-ds/clients/dsgw/*config/"> + AllowOverride None + Options None + Order allow,deny + Allow from all +</Directory> + +<Directory "/opt/fedora-ds/bin/admin/admin/icons/"> + AllowOverride None + Options None + Order allow,deny + Allow from all +</Directory> + +# enable access for CGI progs/scripts <Directory "/opt/fedora-ds/clients/orgchart/bin/"> AllowOverride None Options None Order allow,deny Allow from all </Directory> <Directory "/opt/fedora-ds/clients/dsgw/bin/"> @@ -64,52 +103,62 @@ # Handle the initial login <Location /admin-serv/authenticate> SetHandler user-auth AuthUserFile /opt/fedora-ds/admin-serv/config/admpw AuthType basic AuthName "Admin Server" Require valid-user + Order allow,deny + Allow from all </Location> # Handle Other Console tasks <LocationMatch /*/[tT]asks/[Oo]peration/*> AuthUserFile /opt/fedora-ds/admin-serv/config/admpw AuthType basic AuthName "Admin Server" Require valid-user AdminSDK on Options +ExecCGI + Order allow,deny + Allow from all </LocationMatch> # Handle Admin Express <LocationMatch /*/[tT]asks/[Cc]onfiguration/*> AuthUserFile /opt/fedora-ds/admin-serv/config/admpw AuthType basic AuthName "Admin Server" Require valid-user AdminSDK on NESCompatEnv on Options +ExecCGI + Order allow,deny + Allow from all </LocationMatch> # Handle internal commands <LocationMatch /admin-serv/commands/*> AuthUserFile /opt/fedora-ds/admin-serv/config/admpw AuthType basic AuthName "Admin Server" Require valid-user + Order allow,deny + Allow from all </LocationMatch> # Handle Stop, Start, Restart, Instance Creation - invoke mod_restartd # need to add instance creation because you may want to create an instance # of DS on a low port, and instance creation starts the instance as well <LocationMatch /*/[tT]asks/[Oo]peration/(?i:stop|start|restart|startconfigds|create)$> AuthUserFile /home/rich/72srv/admin-serv/config/admpw AuthType basic AuthName "Admin Server" Require valid-user ## turn off the password pipe when using mod_restartd AdminSDK off Options +ExecCGI RetainPerms on + Order allow,deny + Allow from all </LocationMatch>

1 0

[Fedora-directory-commits] mod_admserv Makefile.am, 1.8, 1.9 Makefile.in, 1.11, 1.12 configure, 1.12, 1.13 configure.in, 1.10, 1.11
by Doctor Conrad 07 Dec '05

07 Dec '05

Author: nhosoi Update of /cvs/dirsec/mod_admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2481 Modified Files: Makefile.am Makefile.in configure configure.in Log Message: [172166] Admin Util RPM Pick up new Admin Util; libadminutil.so[.1.0] format Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/mod_admserv/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile.am 28 Oct 2005 01:57:54 -0000 1.8 +++ Makefile.am 7 Dec 2005 02:04:52 -0000 1.9 @@ -6,7 +6,7 @@ ## Set the includes and libraries needed INCLUDES = -I@apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@ -LIBS = @adminutil_lib@ -ladminutil@adminutil_ver@ -ladmsslutil@adminutil_ver@ @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 +LIBS = @adminutil_lib@ -ladminutil -ladmsslutil @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 install-libLTLIBRARIES: libmodadmserv.la @APXS@ -i -a -n admserv libmodadmserv.la Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/mod_admserv/Makefile.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Makefile.in 28 Oct 2005 01:57:54 -0000 1.11 +++ Makefile.in 7 Dec 2005 02:04:52 -0000 1.12 @@ -104,7 +104,7 @@ libmodadmserv_la_SOURCES = mod_admserv.c INCLUDES = -I@apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@ -LIBS = @adminutil_lib@ -ladminutil@adminutil_ver@ -ladmsslutil@adminutil_ver@ @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 +LIBS = @adminutil_lib@ -ladminutil -ladmsslutil @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ Index: configure =================================================================== RCS file: /cvs/dirsec/mod_admserv/configure,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- configure 28 Oct 2005 01:57:54 -0000 1.12 +++ configure 7 Dec 2005 02:04:54 -0000 1.13 @@ -8581,20 +8581,20 @@ if test "${with_adminutil+set}" = set; then withval="$with_adminutil" - if test -e "$withval"/include/libadminutil/admutil.h -a -d "$withval"/lib + if test -e "$withval"/include/*/libadminutil/admutil.h -a -d "$withval"/lib then echo "$as_me:$LINENO: result: using $withval" >&5 echo "${ECHO_T}using $withval" >&6 ADMINUTILDIR=$withval - adminutil_inc="-I$ADMINUTILDIR/include" adminutil_lib="-L$ADMINUTILDIR/lib" for file in $ADMINUTILDIR/lib/* ; do - echo $file | grep 'libadminutil0-90-9' && adminutil_ver=`echo $file | sed -e 's/.*libadminutil$0-90-9$.*/\1/'` ; break + echo $file | grep 'libadminutil0-90-9' && adminutil_ver=`echo $file | sed -e 's/.*libadminutil\..*\.$0-9*\.0-9*$.*/\1/'` ; break done if test -z "$adminutil_ver" then - adminutil_ver=10 + adminutil_ver=1.0 fi + adminutil_inc="-I$ADMINUTILDIR/include/adminutil-$adminutil_ver" else echo { { echo "$as_me:$LINENO: error: $withval not found" >&5 Index: configure.in =================================================================== RCS file: /cvs/dirsec/mod_admserv/configure.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- configure.in 28 Oct 2005 01:57:54 -0000 1.10 +++ configure.in 7 Dec 2005 02:04:54 -0000 1.11 @@ -219,19 +219,19 @@ AC_MSG_CHECKING(for --with-adminutil) AC_ARG_WITH(adminutil, [ --with-adminutil=PATH Adminutil directory], [ - if test -e "$withval"/include/libadminutil/admutil.h -a -d "$withval"/lib + if test -e "$withval"/include/*/libadminutil/admutil.h -a -d "$withval"/lib then AC_MSG_RESULT([using $withval]) ADMINUTILDIR=$withval - adminutil_inc="-I$ADMINUTILDIR/include" adminutil_lib="-L$ADMINUTILDIR/lib" for file in $ADMINUTILDIR/lib/* ; do - echo $file | grep 'libadminutil[0-9][0-9]' && adminutil_ver=`echo $file | sed -e 's/.*libadminutil$[0-9][0-9]$.*/\1/'` ; break + echo $file | grep 'libadminutil[0-9][0-9]' && adminutil_ver=`echo $file | sed -e 's/.*libadminutil\..*\.$[0-9]*\.[0-9]*$.*/\1/'` ; break done if test -z "$adminutil_ver" then - adminutil_ver=10 + adminutil_ver=1.0 fi + adminutil_inc="-I$ADMINUTILDIR/include/adminutil-$adminutil_ver" else echo AC_MSG_ERROR([$withval not found])

1 0

[Fedora-directory-commits] adminutil/tests Makefile,1.1,1.2
by Doctor Conrad 06 Dec '05

06 Dec '05

Author: nhosoi Update of /cvs/dirsec/adminutil/tests In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818/tests Modified Files: Makefile Log Message: [172166] Admin Util RPM 1) admin util library name has been updated from libadminutil10.so to libadminutil.so.1.0 with symbolic links libadminutil.so and libadminutil.so.1 2) dropped static library Index: Makefile =================================================================== RCS file: /cvs/dirsec/adminutil/tests/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 16 Nov 2005 18:50:21 -0000 1.1 +++ Makefile 6 Dec 2005 18:38:48 -0000 1.2 @@ -30,7 +30,7 @@ all: $(OBJDEST) $(OBJS) $(OBJDEST)/retrieveSIE: retrieveSIE.c - $(CC) $(CFLAGS) $(MCC_INCLUDE) $< -o $@ $(NSPRLINK) $(LDAP_NOSSL_LINK) $(ICULINK) -L$(OBJDIR)/lib -ladminutil10 + $(CC) $(CFLAGS) $(MCC_INCLUDE) $< -o $@ $(NSPRLINK) $(LDAP_NOSSL_LINK) $(ICULINK) -L$(OBJDIR)/lib -ladminutil $(OBJDEST): -mkdir $(OBJDEST)

1 0

[Fedora-directory-commits] adminutil/lib/libadmsslutil Makefile, 1.1.1.1, 1.2 admsslutil.c, 1.1.1.1, 1.2
by Doctor Conrad 06 Dec '05

06 Dec '05

Author: nhosoi Update of /cvs/dirsec/adminutil/lib/libadmsslutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818/lib/libadmsslutil Modified Files: Makefile admsslutil.c Log Message: [172166] Admin Util RPM 1) admin util library name has been updated from libadminutil10.so to libadminutil.so.1.0 with symbolic links libadminutil.so and libadminutil.so.1 2) dropped static library Index: Makefile =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 20 Jul 2005 22:51:32 -0000 1.1.1.1 +++ Makefile 6 Dec 2005 18:38:42 -0000 1.2 @@ -28,35 +28,34 @@ include ../../nsdefs.mk -OBJDEST=$(OBJDIR)/lib/libadmsslutil +OBJLIBDIR=$(OBJDIR)/lib +OBJDEST=$(OBJLIBDIR)/libadmsslutil ifeq ($(ARCH), WINNT) ifeq ($(DEBUG), fulld) - LIBS=$(OBJDIR)/lib/libadmsslutild_s$(ADMSDK_SO_VERSION).lib - SO_NAME=$(OBJDIR)/lib/libadmsslutild$(ADMSDK_SO_VERSION) + LIBS=$(OBJLIBDIR)/libadmsslutild_s$(ADMSDK_SO_VERSION).lib + SO_NAME=libadmsslutild else - LIBS=$(OBJDIR)/lib/libadmsslutil_s$(ADMSDK_SO_VERSION).lib - SO_NAME=$(OBJDIR)/lib/libadmsslutil$(ADMSDK_SO_VERSION) + LIBS=$(OBJLIBDIR)/libadmsslutil_s$(ADMSDK_SO_VERSION).lib + SO_NAME=libadmsslutil endif else - LIBS=$(OBJDIR)/lib/libadmsslutil$(ADMSDK_SO_VERSION).a - SO_NAME=$(OBJDIR)/lib/libadmsslutil$(ADMSDK_SO_VERSION) -endif - -ifeq ($(ARCH), HPUX) - SO_LIB=$(SO_NAME)$(DLL_PRESUF).sl -else - SO_LIB=$(SO_NAME)$(DLL_PRESUF).$(DLL_SUFFIX) + LIBS=$(OBJLIBDIR)/libadmsslutil-$(ADMSDK_SO_DOTVERSION).a + SO_NAME=libadmsslutil endif include ../../nsconfig.mk +SO_COREEXT:=$(DLL_PRESUF).$(DLL_SUFFIX) +SO_EXT:=$(SO_COREEXT).$(ADMSDK_SO_DOTVERSION) +SO_LIB:=$(OBJLIBDIR)/$(SO_NAME)$(SO_EXT) + ifeq ($(ARCH), AIX) override EXTRA_LIBS := -L.:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib \ -bI:/usr/lib/lowsys.exp -L. -lC_r -lC -lpthreads -lc_r -lm \ /usr/lib/libc.a -ldl -lbsd -brtl -berok -ADM_EXPORT_FILE=$(SO_NAME)$(DLL_PRESUF).exp +ADM_EXPORT_FILE=$(OBJLIBDIR)/$(SO_NAME)$(DLL_PRESUF).exp endif DEPLIBS += $(ADMSDKLINK) $(ICULINK) $(LDAPLINK) $(SVRCORELINK) $(SECURITYLINK) $(NSPRLINK) @@ -70,18 +69,18 @@ OBJS=$(addprefix $(OBJDEST)/, certmgt.o secpwd.o sslerror.o admsslutil.o psetcssl.o \ srvutilssl.o uginfossl.o $(OSOBJS)) -all: $(OBJDEST) $(LIBS) $(SO_LIB) +all: $(OBJDEST) $(SO_LIB) $(OBJDEST): - echo $(LIBS) echo $(SO_LIB) mkdir -p $(OBJDEST) -$(LIBS): $(OBJS) - rm -f $@ - $(AR) $(OBJS) - $(RANLIB) $@ +# stop building static libraries +#$(LIBS): $(OBJS) +# rm -f $@ +# $(AR) $(OBJS) +# $(RANLIB) $@ ifeq ($(ARCH), AIX) $(SO_LIB): $(OBJS) @@ -102,6 +101,8 @@ $(SO_LIB): $(OBJS) rm -f $@ $(LINK_DLL) $(OBJS) $(DEPLIBS) + cd $(OBJLIBDIR); ln -s $(SO_NAME)$(SO_EXT) $(SO_NAME)$(SO_COREEXT) + cd $(OBJLIBDIR); ln -s $(SO_NAME)$(SO_EXT) $(SO_NAME)$(SO_COREEXT).$(ADMSDK_SO_MAJORVERSION) endif endif Index: admsslutil.c =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/admsslutil.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- admsslutil.c 20 Jul 2005 22:51:33 -0000 1.1.1.1 +++ admsslutil.c 6 Dec 2005 18:38:42 -0000 1.2 @@ -37,6 +37,7 @@ #include "errno.h" #include "secport.h" #include "libadmsslutil/certmgt.h" +#include "version.h" #define ADMSSL_BUF_LEN 1024 @@ -50,6 +51,19 @@ #define SECURITY_ATTR "configuration.nsServerSecurity" +#ifdef XP_UNIX +/* + * Version information for the 'ident' and 'what commands + * + * NOTE: the first component of the concatenated rcsid string + * must not end in a '$' to prevent rcs keyword substitution. + */ +static char rcsid[] = "$Header: AdminUtil " ADMSDK_PRODUCT + " " ADMSDK_BUILDNUM " $"; +static char sccsid[] = "@(#)AdminUtil " ADMSDK_PRODUCT + " " ADMSDK_BUILDNUM; +#endif /* XP_UNIX */ + void servssl_error(char *fmt, ...); char custom_file[BIG_LINE] = "";

1 0

[Fedora-directory-commits] adminutil/lib/libadminutil Makefile, 1.3, 1.4 admutil.c, 1.1.1.1, 1.2
by Doctor Conrad 06 Dec '05

06 Dec '05

Author: nhosoi Update of /cvs/dirsec/adminutil/lib/libadminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818/lib/libadminutil Modified Files: Makefile admutil.c Log Message: [172166] Admin Util RPM 1) admin util library name has been updated from libadminutil10.so to libadminutil.so.1.0 with symbolic links libadminutil.so and libadminutil.so.1 2) dropped static library Index: Makefile =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadminutil/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 9 Nov 2005 07:16:40 -0000 1.3 +++ Makefile 6 Dec 2005 18:38:37 -0000 1.4 @@ -28,35 +28,33 @@ include ../../nsdefs.mk -OBJDEST=$(OBJDIR)/lib/libadminutil +OBJLIBDIR=$(OBJDIR)/lib +OBJDEST=$(OBJLIBDIR)/libadminutil ifeq ($(ARCH), WINNT) ifeq ($(DEBUG), fulld) - LIBS=$(OBJDIR)/lib/libadminutild_s$(ADMSDK_SO_VERSION).lib - SO_NAME=$(OBJDIR)/lib/libadminutild$(ADMSDK_SO_VERSION) + LIBS=$(OBJLIBDIR)/libadminutild_s$(ADMSDK_SO_VERSION).lib + SO_NAME=libadminutild else - LIBS=$(OBJDIR)/lib/libadminutil_s$(ADMSDK_SO_VERSION).lib - SO_NAME=$(OBJDIR)/lib/libadminutil$(ADMSDK_SO_VERSION) + LIBS=$(OBJLIBDIR)/libadminutil_s$(ADMSDK_SO_VERSION).lib + SO_NAME=libadminutil endif else - LIBS=$(OBJDIR)/lib/libadminutil$(ADMSDK_SO_VERSION).a - SO_NAME=$(OBJDIR)/lib/libadminutil$(ADMSDK_SO_VERSION) -endif - -ifeq ($(ARCH), HPUX) - SO_LIB=$(SO_NAME)$(DLL_PRESUF).sl -else - SO_LIB=$(SO_NAME)$(DLL_PRESUF).$(DLL_SUFFIX) + LIBS=$(OBJLIBDIR)/libadminutil-$(ADMSDK_SO_DOTVERSION).a + SO_NAME=libadminutil endif include ../../nsconfig.mk +SO_COREEXT:=$(DLL_PRESUF).$(DLL_SUFFIX) +SO_EXT:=$(SO_COREEXT).$(ADMSDK_SO_DOTVERSION) +SO_LIB:=$(OBJLIBDIR)/$(SO_NAME)$(SO_EXT) + ifeq ($(ARCH), AIX) override EXTRA_LIBS := -L.:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib \ -bI:/usr/lib/lowsys.exp -L. -lC_r -lC -lpthreads -lc_r -lm \ /usr/lib/libc.a -ldl -lbsd -brtl -berok -ADM_EXPORT_FILE=$(SO_NAME)$(DLL_PRESUF).exp LDAPLINK=-L$(LDAP_LIBPATH) $(addprefix -l, $(LDAP_SOLIB_NAMES)) $(addprefix -l, $(LDAP_SSLLIB_NAMES)) endif @@ -76,26 +74,27 @@ errRpt.o form_post.o strlist.o \ resource.o uginfo.o $(OSOBJS)) -all: $(OBJDEST) $(LIBS) $(SO_LIB) resource_bundle +all: $(OBJDEST) $(SO_LIB) resource_bundle $(OBJDEST): - echo $(LIBS) echo $(SO_LIB) mkdir -p $(OBJDEST) -ifeq ($(ARCH), WINNT) -$(LIBS): $(OBJS) - rm -f $@ - $(AR) $(OBJS) - $(RANLIB) $@ -else -$(LIBS): $(OBJS) - rm -f $@ - $(AR) $(OBJS) - $(RANLIB) $@ +# stop building static libraries +#ifeq ($(ARCH), WINNT) +#$(LIBS): $(OBJS) +# rm -f $@ +# $(AR) $(OBJS) +# $(RANLIB) $@ +#else +#$(LIBS): $(OBJS) +# rm -f $@ +# $(AR) $(OBJS) +# $(RANLIB) $@ +#endif -endif ifeq ($(ARCH), AIX) +ADM_EXPORT_FILE=$(OBJLIBDIR)/$(SO_NAME)$(DLL_PRESUF).exp $(SO_LIB): $(OBJS) nm -B -C -g $(OBJS) \ | awk '/ [T,D,B] / {print $$3}' \ @@ -114,6 +113,8 @@ $(SO_LIB): $(OBJS) rm -f $@ $(LINK_DLL) $(OBJS) $(DEPLIBS) + cd $(OBJLIBDIR); ln -s $(SO_NAME)$(SO_EXT) $(SO_NAME)$(SO_COREEXT) + cd $(OBJLIBDIR); ln -s $(SO_NAME)$(SO_EXT) $(SO_NAME)$(SO_COREEXT).$(ADMSDK_SO_MAJORVERSION) endif endif Index: admutil.c =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadminutil/admutil.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- admutil.c 20 Jul 2005 22:51:32 -0000 1.1.1.1 +++ admutil.c 6 Dec 2005 18:38:37 -0000 1.2 @@ -22,12 +22,27 @@ #include <string.h> #include <stdlib.h> #include <ctype.h> +#include "version.h" #include "admutil_pvt.h" #ifdef XP_WIN32 #define strcasecmp stricmp #define strncasecmp _strnicmp #endif + +#ifdef XP_UNIX +/* + * Version information for the 'ident' and 'what commands + * + * NOTE: the first component of the concatenated rcsid string + * must not end in a '$' to prevent rcs keyword substitution. + */ +static char rcsid[] = "$Header: AdminUtil " ADMSDK_PRODUCT + " " ADMSDK_BUILDNUM " $"; +static char sccsid[] = "@(#)AdminUtil " ADMSDK_PRODUCT + " " ADMSDK_BUILDNUM; +#endif /* XP_UNIX */ + /* Max size for a pathname */ #ifndef PATH_MAX

1 0

[Fedora-directory-commits] adminutil/include/libadmsslutil SECerrs.h, 1.1.1.1, 1.2 SSLerrs.h, 1.1.1.1, 1.2 admsslutil.h, 1.1.1.1, 1.2 certmgt.h, 1.1.1.1, 1.2 psetcssl.h, 1.1.1.1, 1.2 srvutilssl.h, 1.1.1.1, 1.2 sslpset.h, 1.1.1.1, 1.2
by Doctor Conrad 06 Dec '05

06 Dec '05

Author: nhosoi Update of /cvs/dirsec/adminutil/include/libadmsslutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818/include/libadmsslutil Modified Files: SECerrs.h SSLerrs.h admsslutil.h certmgt.h psetcssl.h srvutilssl.h sslpset.h Log Message: [172166] Admin Util RPM 1) admin util library name has been updated from libadminutil10.so to libadminutil.so.1.0 with symbolic links libadminutil.so and libadminutil.so.1 2) dropped static library Index: SECerrs.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadmsslutil/SECerrs.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- SECerrs.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ SECerrs.h 6 Dec 2005 18:38:36 -0000 1.2 @@ -17,9 +17,12 @@ * 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 **/ -/* General security error codes */ /* Caller must #include "secerr.h" */ - +/* + * SECerrs.h - General security error codes + * + * $Id$ + */ ER3(SEC_ERROR_IO, SEC_ERROR_BASE + 0, "An I/O error occurred during security authorization.") Index: SSLerrs.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadmsslutil/SSLerrs.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- SSLerrs.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ SSLerrs.h 6 Dec 2005 18:38:36 -0000 1.2 @@ -17,8 +17,12 @@ * 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 **/ -/* SSL-specific security error codes */ /* caller must include "sslerr.h" */ +/* + * SSLerrs.h - SSL-specific security error codes + * + * $Id$ + */ ER3(SSL_ERROR_EXPORT_ONLY_SERVER, SSL_ERROR_BASE + 0, "Unable to communicate securely. Peer does not support high-grade encryption.") Index: admsslutil.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadmsslutil/admsslutil.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- admsslutil.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ admsslutil.h 6 Dec 2005 18:38:36 -0000 1.2 @@ -17,6 +17,11 @@ * 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 **/ +/* + * admsslutil.h + * + * $Id$ + */ #ifndef __ADMSSLUTIL_H__ #define __ADMSSLUTIL_H__ Index: certmgt.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadmsslutil/certmgt.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- certmgt.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ certmgt.h 6 Dec 2005 18:38:36 -0000 1.2 @@ -17,6 +17,11 @@ * 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 **/ +/* + * certmgt.h + * + * $Id$ + */ #ifndef __certmgt_h #define __certmgt_h Index: psetcssl.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadmsslutil/psetcssl.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- psetcssl.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ psetcssl.h 6 Dec 2005 18:38:37 -0000 1.2 @@ -17,6 +17,11 @@ * 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 **/ +/* + * psetcssl.h + * + * $Id$ + */ #ifndef __PSETCSSL_H__ #define __PSETCSSL_H__ Index: srvutilssl.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadmsslutil/srvutilssl.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- srvutilssl.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ srvutilssl.h 6 Dec 2005 18:38:37 -0000 1.2 @@ -17,6 +17,11 @@ * 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 **/ +/* + * srvutilssl.h + * + * $Id$ + */ #ifndef __SRVUTILSSL_H__ #define __SRVUTILSSL_H__ Index: sslpset.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadmsslutil/sslpset.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- sslpset.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ sslpset.h 6 Dec 2005 18:38:37 -0000 1.2 @@ -34,6 +34,7 @@ * ------- * Wed Apr 7 00:45:16 1999 - Created * + * $Id$ */ #ifndef SSLPSET_H #define SSLPSET_H

1 0

[Fedora-directory-commits] adminutil/include/libadminutil admutil.h, 1.2, 1.3 distadm.h, 1.2, 1.3 prodinfo.h, 1.1.1.1, 1.2 psetc.h, 1.1.1.1, 1.2 resource.h, 1.1.1.1, 1.2 srvutil.h, 1.2, 1.3
by Doctor Conrad 06 Dec '05

06 Dec '05

Author: nhosoi Update of /cvs/dirsec/adminutil/include/libadminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818/include/libadminutil Modified Files: admutil.h distadm.h prodinfo.h psetc.h resource.h srvutil.h Log Message: [172166] Admin Util RPM 1) admin util library name has been updated from libadminutil10.so to libadminutil.so.1.0 with symbolic links libadminutil.so and libadminutil.so.1 2) dropped static library Index: admutil.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadminutil/admutil.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- admutil.h 29 Sep 2005 22:10:10 -0000 1.2 +++ admutil.h 6 Dec 2005 18:38:31 -0000 1.3 @@ -17,6 +17,13 @@ * 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 **/ + +/* + * adminutil.h - prototypes for libadminutil + * + * $Id$ + */ + #ifndef __ADMUTIL_H__ #define __ADMUTIL_H__ Index: distadm.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadminutil/distadm.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- distadm.h 29 Sep 2005 22:10:10 -0000 1.2 +++ distadm.h 6 Dec 2005 18:38:31 -0000 1.3 @@ -17,6 +17,11 @@ * 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 **/ +/* + * disadm.h + * + * $Id$ + */ #ifndef __DISTADM_H__ #define __DISTADM_H__ Index: prodinfo.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadminutil/prodinfo.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- prodinfo.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ prodinfo.h 6 Dec 2005 18:38:31 -0000 1.2 @@ -17,6 +17,11 @@ * 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 **/ +/* + * prodinfo.h + * + * $Id$ + */ #ifndef prodinfo_h #define prodinfo_h Index: psetc.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadminutil/psetc.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- psetc.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ psetc.h 6 Dec 2005 18:38:31 -0000 1.2 @@ -17,6 +17,11 @@ * 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 **/ +/* + * psetc.h + * + * $Id$ + */ #ifndef __PSETC_H__ #define __PSETC_H__ Index: resource.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadminutil/resource.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- resource.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ resource.h 6 Dec 2005 18:38:31 -0000 1.2 @@ -17,6 +17,11 @@ * 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 **/ +/* + * resource.h + * + * $Id$ + */ #ifndef _RESOURCE_H_ #define _RESOURCE_H_ Index: srvutil.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadminutil/srvutil.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- srvutil.h 16 Nov 2005 18:50:09 -0000 1.2 +++ srvutil.h 6 Dec 2005 18:38:31 -0000 1.3 @@ -17,6 +17,11 @@ * 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 **/ +/* + * srvutil.h + * + * $Id$ + */ #ifndef __SRVUTIL_H__ #define __SRVUTIL_H__

1 0

[Fedora-directory-commits] adminutil/include version.h,1.3,1.4
by Doctor Conrad 06 Dec '05

06 Dec '05

Author: nhosoi Update of /cvs/dirsec/adminutil/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818/include Modified Files: version.h Log Message: [172166] Admin Util RPM 1) admin util library name has been updated from libadminutil10.so to libadminutil.so.1.0 with symbolic links libadminutil.so and libadminutil.so.1 2) dropped static library Index: version.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/version.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- version.h 16 Nov 2005 18:50:04 -0000 1.3 +++ version.h 6 Dec 2005 18:38:26 -0000 1.4 @@ -23,10 +23,12 @@ files libadminutil/dllVersionINfo.rc and libadmsslutil/dllVersionInfo.rc */ +#ifdef XP_WIN32 #include <winver.h> +#endif -#define ADMSDK_NAME "Administration Server Utility" -#ifdef _DEBUG +#define ADMSDK_NAME "Administration Utility" +#ifdef MCC_DEBUG #define ADMSDK_PRODUCT ADMSDK_NAME " (debug)" #define ADMSDK_FLAGS VS_FF_DEBUG #else @@ -41,3 +43,5 @@ #define VI_COMPANYNAME "Red Hat, Inc." #define VI_COPYRIGHT "Copyright (C) 2005 Red Hat, Inc." + +#define ADMSDK_BUILDNUM "2005.334.210"

1 0

[Fedora-directory-commits] adminutil Makefile, 1.2, 1.3 adminutil.spec.tmpl, 1.2, 1.3 nsconfig.mk, 1.3, 1.4 pkgadminutil.mk, 1.4, 1.5
by Doctor Conrad 06 Dec '05

06 Dec '05

Author: nhosoi Update of /cvs/dirsec/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818 Modified Files: Makefile adminutil.spec.tmpl nsconfig.mk pkgadminutil.mk Log Message: [172166] Admin Util RPM 1) admin util library name has been updated from libadminutil10.so to libadminutil.so.1.0 with symbolic links libadminutil.so and libadminutil.so.1 2) dropped static library Index: Makefile =================================================================== RCS file: /cvs/dirsec/adminutil/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 16 Nov 2005 18:49:58 -0000 1.2 +++ Makefile 6 Dec 2005 18:38:20 -0000 1.3 @@ -69,6 +69,9 @@ buildnum: if test ! -d $(NSPLATFORM_ID); then mkdir $(NSPLATFORM_ID); fi; $(PERL5) buildnum.pl -p $(NSPLATFORM_ID) + @mybuildnum=`cat $(NSPLATFORM_ID)/buildnum.dat`; \ + sed -e "s/$ADMSDK_BUILDNUM$.*/\1 $$mybuildnum/" include/version.h > include/version.h.tmp; \ + mv include/version.h.tmp include/version.h $(DIRVER_H): if test ! -d $(DIRVERDIR); then mkdir -p $(DIRVERDIR); fi; Index: adminutil.spec.tmpl =================================================================== RCS file: /cvs/dirsec/adminutil/adminutil.spec.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- adminutil.spec.tmpl 16 Nov 2005 18:49:58 -0000 1.2 +++ adminutil.spec.tmpl 6 Dec 2005 18:38:20 -0000 1.3 @@ -57,22 +57,24 @@ cp -r $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/include $RPM_BUILD_ROOT/%{prefix}/usr %clean -rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil10.so -rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil10.so +rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil.so* +rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil.so* rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/adminutil-properties -rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil10.a -rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil10.a rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/include/adminutil-1.0 %files %defattr(-,root,root,-) -%{prefix}/usr/lib/libadminutil10.so -%{prefix}/usr/lib/libadmsslutil10.so +%{prefix}/usr/lib/libadminutil.so.1.0 +%{prefix}/usr/lib/libadmsslutil.so.1.0 %{prefix}/usr/lib/adminutil-properties/libadminutil_root.res %pre %post +ln -s $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil.so.1.0 $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil.so.1 +ln -s $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil.so.1.0 $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil.so +ln -s $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil.so.1.0 $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil.so.1 +ln -s $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil.so.1.0 $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil.so echo "Install finished." %postun @@ -89,8 +91,6 @@ %files devel %defattr(-,root,root,-) -%{prefix}/usr/lib/libadminutil10.a -%{prefix}/usr/lib/libadmsslutil10.a %{prefix}/usr/include/adminutil-1.0/libadminutil/admutil.h %{prefix}/usr/include/adminutil-1.0/libadminutil/distadm.h %{prefix}/usr/include/adminutil-1.0/libadminutil/prodinfo.h @@ -105,9 +105,6 @@ %{prefix}/usr/include/adminutil-1.0/libadmsslutil/SSLerrs.h %pre devel -mkdir -p $RPM_INSTALL_PREFIX/%{prefix}/usr/lib -mkdir -p $RPM_INSTALL_PREFIX/%{prefix}/usr/include/adminutil-1.0/libadminutil -mkdir -p $RPM_INSTALL_PREFIX/%{prefix}/usr/include/adminutil-1.0/libadmsslutil %postun devel rm -rf $RPM_INSTALL_PREFIX/%{prefix}/usr/include/adminutil-1.0 Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/adminutil/nsconfig.mk,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nsconfig.mk 26 Oct 2005 16:35:28 -0000 1.3 +++ nsconfig.mk 6 Dec 2005 18:38:20 -0000 1.4 @@ -158,13 +158,18 @@ #------------------- ifeq ($(ARCH), HPUX) #------------------- -DLL_SUFFIX=sl +HPUX_ARCH = $(shell uname -m) +ifeq ($(HPUX_ARCH), ia64) + DLL_SUFFIX=so +else + DLL_SUFFIX=sl +endif LDAP_DLL_SUFFIX=$(DLL_SUFFIX) ifeq ($(NSOS_RELEASE), B.11.00) - MODERNHP=1 + MODERNHP=1 endif ifeq ($(NSOS_RELEASE), B.11.11) - MODERNHP=1 + MODERNHP=1 endif ifeq ($(MODERNHP), 1) @@ -581,6 +586,8 @@ ######################################## ADMSDK_SO_VERSION=10 +ADMSDK_SO_DOTVERSION=1.0 +ADMSDK_SO_MAJORVERSION=1 ADMSDKOBJDIR=$(OBJDIR) ADMSDK_LIBPATH = $(ADMSDKOBJDIR)/lib ADMSDK_INCLUDE = $(ADMSDKOBJDIR)/include @@ -591,7 +598,7 @@ ADMSDKDLL_NAMES = $(addsuffix .dll, $ADMSDK_LIBNAMES)) ADMSDKLINK = $(addprefix $(ADMSDK_LIBPATH)/, $(ADMSDK_LIBS)) else - ADMSDK_LIBNAMES = adminutil$(ADMSDK_SO_VERSION) + ADMSDK_LIBNAMES = adminutil ADMSDK_LIBS = $(addsuffix .a, $(addprefix lib, $(ADMSDK_LIBNAMES))) LIBADMSDK = $(addprefix $(ADMSDK_LIBPATH)/, $(ADMSDK_LIBS)) ADMSDKLINK = -L$(ADMSDK_LIBPATH) $(addprefix -l, $(ADMSDK_LIBNAMES)) Index: pkgadminutil.mk =================================================================== RCS file: /cvs/dirsec/adminutil/pkgadminutil.mk,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pkgadminutil.mk 16 Nov 2005 18:49:58 -0000 1.4 +++ pkgadminutil.mk 6 Dec 2005 18:38:20 -0000 1.5 @@ -88,7 +88,7 @@ cp -p $(ABS_ROOT)/include/libadmsslutil/*.h $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadmsslutil # Don't package sslpset.h rm -f $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadmsslutil/sslpset.h - cp -p $(ADMSERV_OBJDIR)/lib/*.* $(PKGDIR)/lib + cd $(ADMSERV_OBJDIR)/lib; tar cf - *.* | (cd $(PKGDIR)/lib; tar xf -) cp -p $(ADMSERV_OBJDIR)/lib/libadminutil/lib*.res $(PKGDIR)/lib/$(PROP_ADMINUTIL) pkgSBC:

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm import.c, 1.5, 1.6 import.h, 1.4, 1.5 import-threads.c, 1.8, 1.9
by Doctor Conrad 06 Dec '05

06 Dec '05

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18714 Modified Files: import.c import.h import-threads.c Log Message: [175063] entry with escaped characters fails to import and index If missing entry_id is found, skip it and continue reading the primary db to be reindexed. Index: import.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.c 19 Apr 2005 22:07:38 -0000 1.5 +++ import.c 6 Dec 2005 18:28:14 -0000 1.6 @@ -91,7 +91,7 @@ return 0; } -FifoItem *import_fifo_fetch(ImportJob *job, ID id, int worker) +FifoItem *import_fifo_fetch(ImportJob *job, ID id, int worker, int shift) { int idx = id % job->fifo.size; FifoItem *fi; @@ -102,7 +102,7 @@ return NULL; } if (fi->entry) { - if (id != fi->entry->ep_id) + if (id != fi->entry->ep_id - shift) fi = NULL; else if (worker) { if (fi->bad) return NULL; Index: import.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.h 19 Apr 2005 22:07:38 -0000 1.4 +++ import.h 6 Dec 2005 18:28:14 -0000 1.5 @@ -201,7 +201,7 @@ /* import.c */ -FifoItem *import_fifo_fetch(ImportJob *job, ID id, int worker); +FifoItem *import_fifo_fetch(ImportJob *job, ID id, int worker, int shift); void import_free_job(ImportJob *job); void import_log_notice(ImportJob *job, char *format, ...); void import_abort_all(ImportJob *job, int wait_for_them); Index: import-threads.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import-threads.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import-threads.c 28 Apr 2005 17:31:54 -0000 1.8 +++ import-threads.c 6 Dec 2005 18:28:14 -0000 1.9 @@ -986,6 +986,7 @@ int ret = 0; struct attrinfo *parentid_ai; Slapi_PBlock *pb = slapi_pblock_new(); + int shift = 0; PR_ASSERT(info != NULL); PR_ASSERT(inst != NULL); @@ -1027,10 +1028,11 @@ info->state = RUNNING; /* Read that entry from the cache */ - fi = import_fifo_fetch(job, id, 0); + fi = import_fifo_fetch(job, id, 0, shift); if (! fi) { - import_log_notice(job, "ERROR: foreman fifo error"); - goto error; + import_log_notice(job, "WARNING: entry id %d is missing", id); + shift++; + continue; } /* first, fill in any operational attributes */ @@ -1050,7 +1052,7 @@ */ if (job->flags & FLAG_ABORT) { goto error; - } + } if (parent_status == IMPORT_ADD_OP_ATTRS_NO_PARENT) { /* If this entry is a suffix entry, this is not a problem */ @@ -1268,7 +1270,7 @@ info->state = RUNNING; /* Read that entry from the cache */ - fi = import_fifo_fetch(job, id, 1); + fi = import_fifo_fetch(job, id, 1, 0); ep = fi ? fi->entry : NULL; if (!ep) { /* skipping an entry that turned out to be bad */

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits December 2005