[Fedora-directory-commits] ldapserver/ldap/servers/slapd charray.c, 1.4, 1.5 saslbind.c, 1.18, 1.19 slapi-private.h, 1.11, 1.12
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13155/ldap/servers/slapd
Modified Files:
charray.c saslbind.c slapi-private.h
Log Message:
Related: 214238
Summary: Make fallback SASL path work for 64-bit Linux default location.
Index: charray.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/charray.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- charray.c 19 Apr 2005 22:07:36 -0000 1.4
+++ charray.c 7 Nov 2006 04:42:55 -0000 1.5
@@ -270,9 +270,20 @@
char **
str2charray( char *str, char *brkstr )
{
+ return( str2charray_ext( str, brkstr, 1 ));
+}
+
+/*
+ * extended version of str2charray lets you disallow
+ * duplicate values into the array.
+ */
+char **
+str2charray_ext( char *str, char *brkstr, int allow_dups )
+{
char **res;
char *s;
- int i;
+ int i, j;
+ int dup_found = 0;
char * iter = NULL;
i = 1;
@@ -284,9 +295,22 @@
res = (char **) slapi_ch_malloc( (i + 1) * sizeof(char *) );
i = 0;
- for ( s = ldap_utf8strtok_r( str, brkstr , &iter); s != NULL;
+ for ( s = ldap_utf8strtok_r( str, brkstr , &iter); s != NULL;
s = ldap_utf8strtok_r( NULL, brkstr , &iter) ) {
- res[i++] = slapi_ch_strdup( s );
+ dup_found = 0;
+ /* Always copy the first value into the array */
+ if ( (!allow_dups) && (i != 0) ) {
+ /* Check for duplicates */
+ for ( j = 0; j < i; j++ ) {
+ if ( strncmp( res[j], s, strlen( s ) ) == 0 ) {
+ dup_found = 1;
+ break;
+ }
+ }
+ }
+
+ if ( !dup_found )
+ res[i++] = slapi_ch_strdup( s );
}
res[i] = NULL;
Index: saslbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/saslbind.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- saslbind.c 6 Nov 2006 19:33:42 -0000 1.18
+++ saslbind.c 7 Nov 2006 04:42:55 -0000 1.19
@@ -560,7 +560,7 @@
char *pluginpath = config_get_saslpath();
if ((!pluginpath) || (*pluginpath == '\0')) {
if (!(pluginpath = getenv("SASL_PATH"))) {
- pluginpath = "/usr/lib/sasl2";
+ pluginpath = "/usr/lib64/sasl2:/usr/lib/sasl2";
}
}
*path = pluginpath;
@@ -744,7 +744,7 @@
LDAPDebug(LDAP_DEBUG_TRACE, "sasl library mechs: %s\n", str, 0, 0);
/* merge into result set */
dupstr = slapi_ch_strdup(str);
- others = str2charray(dupstr, ",");
+ others = str2charray_ext(dupstr, ",", 0 /* don't list duplicate mechanisms */);
charray_merge(&ret, others, 1);
charray_free(others);
slapi_ch_free((void**)&dupstr);
Index: slapi-private.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-private.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- slapi-private.h 15 Sep 2006 22:45:11 -0000 1.11
+++ slapi-private.h 7 Nov 2006 04:42:55 -0000 1.12
@@ -760,6 +760,7 @@
int charray_utf8_inlist( char **a, char *s );
char ** charray_dup( char **a );
char ** str2charray( char *str, char *brkstr );
+char ** str2charray_ext( char *str, char *brkstr, int allow_dups );
int charray_remove(char **a,const char *s);
char ** cool_charray_dup( char **a );
void cool_charray_free( char **array );
17 years, 5 months
[Fedora-directory-commits] dsbuild/ds/ldapserver checksums, 1.13, 1.14
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13041
Modified Files:
checksums
Log Message:
updated fedora-ds-1.0.4.tar.gz
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/checksums,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- checksums 6 Nov 2006 21:51:28 -0000 1.13
+++ checksums 7 Nov 2006 04:28:24 -0000 1.14
@@ -1,2 +1,2 @@
-88b5f8799d6d92caab5a32e340372bdc download/fedora-ds-1.0.4.tar.gz
+fca8c94d2bfdc3a762c0e8b09ab04b09 download/fedora-ds-1.0.4.tar.gz
657d4f7cca9c3a4ea65012ae8203d395 download/ldap_cm_Makefile_104.patch
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/systools idsktune.c, 1.12, 1.13
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/systools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12915/ldapserver/ldap/systools
Modified Files:
idsktune.c
Log Message:
1) Fedora Core 6 build fixes
FC 6 does not have /usr/include/linux/sys.h. The two files in the diff below include it, but I'm not sure why. If you look at the file on an earlier system, it appears that there is nothing in it. All it seems to do is define NR_syscalls, which is not used anywhere in any include file that I can find, nor in any ds code. So I propose changing the code not to include this file.
2) Change version to 1.0.4
I already got the other files, except for ldap/cm/Makefile
Index: idsktune.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/systools/idsktune.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- idsktune.c 19 Apr 2005 22:07:44 -0000 1.12
+++ idsktune.c 7 Nov 2006 04:20:19 -0000 1.13
@@ -108,7 +108,6 @@
#include <sys/vfs.h>
#include <sys/utsname.h>
#include <linux/kernel.h>
-#include <linux/sys.h>
#include <sys/time.h>
#include <sys/param.h>
#include <mntent.h>
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm dblayer.c, 1.11, 1.12
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12915/ldapserver/ldap/servers/slapd/back-ldbm
Modified Files:
dblayer.c
Log Message:
1) Fedora Core 6 build fixes
FC 6 does not have /usr/include/linux/sys.h. The two files in the diff below include it, but I'm not sure why. If you look at the file on an earlier system, it appears that there is nothing in it. All it seems to do is define NR_syscalls, which is not used anywhere in any include file that I can find, nor in any ds code. So I propose changing the code not to include this file.
2) Change version to 1.0.4
I already got the other files, except for ldap/cm/Makefile
Index: dblayer.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dblayer.c 18 Apr 2006 18:25:02 -0000 1.11
+++ dblayer.c 7 Nov 2006 04:20:14 -0000 1.12
@@ -683,7 +683,6 @@
#endif
#ifdef LINUX
#include <linux/kernel.h>
-#include <linux/sys.h>
#include <sys/sysinfo.h> /* undocumented (?) */
#include <sys/resource.h>
#endif
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.68,1.69
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12915/ldapserver/ldap/cm
Modified Files:
Makefile
Log Message:
1) Fedora Core 6 build fixes
FC 6 does not have /usr/include/linux/sys.h. The two files in the diff below include it, but I'm not sure why. If you look at the file on an earlier system, it appears that there is nothing in it. All it seems to do is define NR_syscalls, which is not used anywhere in any include file that I can find, nor in any ds code. So I propose changing the code not to include this file.
2) Change version to 1.0.4
I already got the other files, except for ldap/cm/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- Makefile 3 Nov 2006 19:49:52 -0000 1.68
+++ Makefile 7 Nov 2006 04:20:13 -0000 1.69
@@ -110,9 +110,9 @@
endif
ifdef USE_64
-VERSION=-ver 1.0.3-64bit
+VERSION=-ver 1.0.4-64bit
else
-VERSION=-ver 1.0.3
+VERSION=-ver 1.0.4
endif
ifeq ($(ARCH), HPUX)
@@ -276,7 +276,7 @@
ifdef BUILD_RPM
# name and version of RPM - must correspond to the spec file - these get branded
RPM_BASE_NAME=fedora
- RPM_VERSION=1.0.3
+ RPM_VERSION=1.0.4
RPM_FILE_BASE=$(RPM_BASE_NAME)-ds-$(RPM_VERSION)
RPM_ARCH = $(shell uname -i)
# root dir for RPM built and temp files
17 years, 5 months
[Fedora-directory-commits] dsbuild/meta/ds Makefile,1.9,1.10
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/meta/ds
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24919
Modified Files:
Makefile
Log Message:
bump version to 1.0.4
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/meta/ds/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile 13 Oct 2006 23:31:29 -0000 1.9
+++ Makefile 6 Nov 2006 22:43:22 -0000 1.10
@@ -1,5 +1,5 @@
GARNAME = ds
-GARVERSION = 1.0.3
+GARVERSION = 1.0.4
CATEGORIES = meta
# assume that if someone defines DEBUG=1 they mean DEBUG=full
17 years, 5 months
[Fedora-directory-commits] dsbuild/ds/adminutil checksums,1.8,1.9
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21606
Modified Files:
checksums
Log Message:
update adminutil checksums
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminutil/checksums,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- checksums 6 Nov 2006 21:51:28 -0000 1.8
+++ checksums 6 Nov 2006 21:54:25 -0000 1.9
@@ -1 +1 @@
-7e0f3fa9e397e40faa14e4b9804dd5dc download/fedora-adminutil-1.0.4.tar.gz
+e98dd6f0f4f812f2fc4418edb4bed326 download/fedora-adminutil-1.0.4.tar.gz
17 years, 5 months
[Fedora-directory-commits] dsbuild/ds/mod_admserv Makefile,1.4,1.5
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21498/dsbuild/ds/mod_admserv
Modified Files:
Makefile
Log Message:
initial checkin of upgrades for Fedora DS 1.0.4 - use adminutil 1.0.4 - added patch file for ldapserver/ldap/cm/Makefile because trunk version is too FHS-ized to use anymore - use fedora-ds 1.0.4
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/mod_admserv/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile 11 Oct 2006 14:36:19 -0000 1.4
+++ Makefile 6 Nov 2006 21:51:29 -0000 1.5
@@ -17,7 +17,7 @@
MOZILLA_DIST = $(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla/dist
-ADMINUTIL = $(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.3/built/adminutil/$(OBJDIR_NAME)
+ADMINUTIL = $(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.4/built/adminutil/$(OBJDIR_NAME)
ICU = $(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4/built
INSTALL_SCRIPTS = custom
17 years, 5 months
[Fedora-directory-commits] dsbuild/ds/ldapserver Makefile, 1.7, 1.8 checksums, 1.12, 1.13
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21498/dsbuild/ds/ldapserver
Modified Files:
Makefile checksums
Log Message:
initial checkin of upgrades for Fedora DS 1.0.4 - use adminutil 1.0.4 - added patch file for ldapserver/ldap/cm/Makefile because trunk version is too FHS-ized to use anymore - use fedora-ds 1.0.4
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile 12 Oct 2006 20:08:12 -0000 1.7
+++ Makefile 6 Nov 2006 21:51:28 -0000 1.8
@@ -1,12 +1,12 @@
include ../../objdirname.mk
GARNAME = fedora-ds
-GARVERSION = 1.0.3
+GARVERSION = 1.0.4
CATEGORIES = ds
# have the regular download rule download the patch rather than listing it in PATCHFILES
# this is so we can override the default patch rule
#MYPATCH = ldapserver-gcc4.patch
-PATCHFILES =
+PATCHFILES = ldap_cm_Makefile_104.patch
PKGDIR = $(ABS_GARDIR)/$(CATEGORIES)/ldapserver/work/pkg
@@ -30,7 +30,7 @@
MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \
MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) \
ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \
- ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.3 \
+ ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.4 \
SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.3 \
DB_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/db/work/db-4.2.52.NC \
ADMINSERVER_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminserver/work/fedora-adminserver-1.0.3 \
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/checksums,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- checksums 17 Oct 2006 15:24:31 -0000 1.12
+++ checksums 6 Nov 2006 21:51:28 -0000 1.13
@@ -1 +1,2 @@
-23bcc3a47cba03e82520cbcd31b25d1d download/fedora-ds-1.0.3.tar.gz
+88b5f8799d6d92caab5a32e340372bdc download/fedora-ds-1.0.4.tar.gz
+657d4f7cca9c3a4ea65012ae8203d395 download/ldap_cm_Makefile_104.patch
17 years, 5 months
[Fedora-directory-commits] dsbuild/ds/adminutil Makefile, 1.5, 1.6 checksums, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21498/dsbuild/ds/adminutil
Modified Files:
Makefile checksums
Log Message:
initial checkin of upgrades for Fedora DS 1.0.4 - use adminutil 1.0.4 - added patch file for ldapserver/ldap/cm/Makefile because trunk version is too FHS-ized to use anymore - use fedora-ds 1.0.4
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminutil/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile 11 Oct 2006 14:36:11 -0000 1.5
+++ Makefile 6 Nov 2006 21:51:28 -0000 1.6
@@ -1,7 +1,7 @@
include ../../objdirname.mk
GARNAME = fedora-adminutil
-GARVERSION = 1.0.3
+GARVERSION = 1.0.4
CATEGORIES = ds
PATCHFILES =
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminutil/checksums,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- checksums 13 Oct 2006 23:31:28 -0000 1.7
+++ checksums 6 Nov 2006 21:51:28 -0000 1.8
@@ -1 +1 @@
-d63fbb0fb6b14e7cd961b4b4274ded51 download/fedora-adminutil-1.0.3.tar.gz
+7e0f3fa9e397e40faa14e4b9804dd5dc download/fedora-adminutil-1.0.4.tar.gz
17 years, 5 months