[Fedora-directory-commits] dsbuild/ds/directoryconsole checksums, 1.2, 1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/directoryconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22671/dsbuild/ds/directoryconsole
Modified Files:
checksums
Log Message:
new checksums for 1.0.2 release
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/directoryconsole/checksums,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- checksums 14 Feb 2006 22:28:38 -0000 1.2
+++ checksums 24 Feb 2006 17:23:32 -0000 1.3
@@ -1,2 +1 @@
-ea552fe1c83fb87b9ad652f0422a77fa download/fedora-directoryconsole-1.0.tar.gz
-7a057db966ee7bbe59a98a82d31bc087 download/fedora-directoryconsole-1.0.2.tar.gz
+7d4229a06ad466c67ae5c7877ec09599 download/fedora-directoryconsole-1.0.2.tar.gz
18 years, 1 month
[Fedora-directory-commits] dsbuild/ds/console checksums,1.2,1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22671/dsbuild/ds/console
Modified Files:
checksums
Log Message:
new checksums for 1.0.2 release
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/console/checksums,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- checksums 14 Feb 2006 22:28:30 -0000 1.2
+++ checksums 24 Feb 2006 17:23:27 -0000 1.3
@@ -1,2 +1 @@
-7514ba3946a23d638e7d0ab60f26255b download/fedora-console-1.0.tar.gz
-31b26c651997500690de9dd186bf1e30 download/fedora-console-1.0.2.tar.gz
+cc2ccdf7a0f0a1ce78326251105a12f9 download/fedora-console-1.0.2.tar.gz
18 years, 1 month
[Fedora-directory-commits] dsbuild/ds/adminutil checksums,1.2,1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22671/dsbuild/ds/adminutil
Modified Files:
checksums
Log Message:
new checksums for 1.0.2 release
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminutil/checksums,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- checksums 14 Feb 2006 22:28:25 -0000 1.2
+++ checksums 24 Feb 2006 17:23:21 -0000 1.3
@@ -1,2 +1 @@
-08c514a30604e192a22d7a035a9dfccc download/fedora-adminutil-1.0.tar.gz
-ff441f6af22846102592ad101929e02e download/fedora-adminutil-1.0.2.tar.gz
+2d191d3954cb527c4a94613b8e828d72 download/fedora-adminutil-1.0.2.tar.gz
18 years, 1 month
[Fedora-directory-commits] dsbuild/ds/adminserver checksums, 1.2, 1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22671/dsbuild/ds/adminserver
Modified Files:
checksums
Log Message:
new checksums for 1.0.2 release
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminserver/checksums,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- checksums 14 Feb 2006 22:28:18 -0000 1.2
+++ checksums 24 Feb 2006 17:23:16 -0000 1.3
@@ -1,3 +1 @@
-b61ebbdff8d4a911ed54f94108476e37 download/fedora-adminserver-1.0.tar.gz
-e2e2557b9548bb3d2f54803b5fcf9103 download/fedora-adminserver-1.0.1.tar.gz
-f3c89782dd1642bbc9939f07a3fd22d2 download/fedora-adminserver-1.0.2.tar.gz
+00d8de5cb839225349f73b8335d6cfdb download/fedora-adminserver-1.0.2.tar.gz
18 years, 1 month
[Fedora-directory-commits] dsbuild/meta/ds Makefile,1.3,1.4
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/meta/ds
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20380
Modified Files:
Makefile
Log Message:
added dochecksums target which will regenerate the checksums files for all dependencies
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/meta/ds/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 16 Feb 2006 21:34:15 -0000 1.3
+++ Makefile 24 Feb 2006 16:53:21 -0000 1.4
@@ -39,3 +39,8 @@
install-%/Makefile:
@mkdir -p $(COOKIEDIR)/install-$*
$(MAKECOOKIE)
+
+dochecksums:
+ @for i in $(LIBDEPS) $(BUILDDEPS); do \
+ $(MAKE) -s -C $(GARDIR)/$$i makesum;\
+ done
18 years, 1 month
[Fedora-directory-commits] mod_admserv mod_admserv.c,1.19,1.20
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19903
Modified Files:
mod_admserv.c
Log Message:
Bug(s) fixed: 182556
Bug Description: Cannot assign multiple domains to nsAdminAccessHosts
Reviewed by: Nathan (Thanks!)
Fix Description: The adminserver console uses a pattern like
(pat1|pat2|...|patN) to encode the host and IP address access allowed
lists. apr_fnmatch is not smart enough to grok this pattern, so we have
to have mod_admserv pre-digest it. The strdup is because strtok
modifies it's argument. apr_strdup allocates memory out of a per
request pool, and automatically frees it at the end of the request, so
we don't have to free it here.
Platforms tested: Fedora Core 4
Flag Day: no
Doc impact: no
Index: mod_admserv.c
===================================================================
RCS file: /cvs/dirsec/mod_admserv/mod_admserv.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mod_admserv.c 18 Jan 2006 02:26:25 -0000 1.19
+++ mod_admserv.c 24 Feb 2006 16:19:23 -0000 1.20
@@ -1822,8 +1822,29 @@
return 1;
}
-/* Check if the caller hostname or ip address is disallowed */
+/* pattern is (pat1|pat2|...|patN) where patN is a simple apr_fnmatch pattern
+ if we get a match, just return immediately with success, otherwise, loop
+ through all the patterns and return a failure code if no match
+*/
+static apr_status_t
+admserv_match_list(char *patterns, const char *string, int flags)
+{
+ apr_status_t rc = APR_SUCCESS;
+ char *last = NULL;
+ char *pattern = apr_strtok(patterns, "()|", &last);
+
+ while (pattern) {
+ rc = apr_fnmatch(pattern, string, flags);
+ if (rc == APR_SUCCESS) {
+ return rc;
+ }
+ pattern = apr_strtok(NULL, "()|", &last);
+ }
+ return rc;
+}
+
+/* Check if the caller hostname or ip address is disallowed */
static int
admserv_host_ip_check(request_rec *r)
{
@@ -1845,7 +1866,7 @@
const char *maxdns = ap_get_remote_host(r->connection, r->per_dir_config,
REMOTE_HOST, NULL);
if (maxdns) {
- apr_status_t rc = apr_fnmatch(accessHosts, maxdns, matchflags);
+ apr_status_t rc = admserv_match_list(apr_pstrdup(r->pool, accessHosts), maxdns, matchflags);
if (rc != APR_SUCCESS) {
} else {
return DECLINED;
@@ -1858,13 +1879,15 @@
char buf[PR_NETDB_BUF_SIZE];
PRHostEnt hEntry;
if (PR_SUCCESS == PR_GetHostByAddr(&addr, buf, sizeof(buf), &hEntry)) {
- if (APR_SUCCESS != apr_fnmatch(accessHosts, hEntry.h_name, matchflags)) {
+ if (APR_SUCCESS != admserv_match_list(apr_pstrdup(r->pool, accessHosts),
+ hEntry.h_name, matchflags)) {
char ** x;
ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r,
"admserv_host_ip_check: host [%s] did not match pattern [%s] -"
"will scan aliases", hEntry.h_name, accessHosts);
for (x = hEntry.h_aliases; x && *x; x++) {
- if (APR_SUCCESS != apr_fnmatch(accessHosts, *x, matchflags)) {
+ if (APR_SUCCESS != admserv_match_list(apr_pstrdup(r->pool, accessHosts),
+ *x, matchflags)) {
ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r,
"admserv_host_ip_check: host alias [%s] did not match pattern [%s]",
*x, accessHosts);
@@ -1889,7 +1912,7 @@
if (accessAddresses && *accessAddresses) {
int matchflags = APR_FNM_PERIOD;
- apr_status_t rc = apr_fnmatch(accessAddresses, clientIP, matchflags);
+ apr_status_t rc = admserv_match_list(apr_pstrdup(r->pool, accessAddresses), clientIP, matchflags);
if (rc == APR_SUCCESS) {
} else {
return DECLINED;
18 years, 1 month
[Fedora-directory-commits] setuputil component_versions.mk, 1.2, 1.3 components.mk, 1.1.1.1, 1.2 internal_comp_deps.mk, 1.1.1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9935
Modified Files:
component_versions.mk components.mk internal_comp_deps.mk
Log Message:
[179394] HP-UX IPF/PA-RISC support
upgraded internal LDAP C SDK to v5.17
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/component_versions.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- component_versions.mk 23 Feb 2006 21:47:45 -0000 1.2
+++ component_versions.mk 23 Feb 2006 22:50:21 -0000 1.3
@@ -49,7 +49,7 @@
# LDAP SDK
ifndef LDAP_RELDATE
- LDAP_RELDATE = v5.16
+ LDAP_RELDATE = v5.17
endif
ifndef LDAPCOMP_DIR
LDAPCOMP_DIR=ldapsdk50
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/components.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- components.mk 29 Jul 2005 22:16:18 -0000 1.1.1.1
+++ components.mk 23 Feb 2006 22:50:21 -0000 1.2
@@ -215,7 +215,7 @@
else
LDAPSDK_LIBPATH = $(LDAP_ROOT)/lib
LDAPSDK_INCDIR = $(LDAP_ROOT)/include
- LDAPSDK_BINPATH = $(LDAP_ROOT)/tools
+ LDAPSDK_BINPATH = $(LDAP_ROOT)/bin
endif
LDAPSDK_INCLUDE = -I$(LDAPSDK_INCDIR)
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/internal_comp_deps.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- internal_comp_deps.mk 29 Jul 2005 22:16:18 -0000 1.1.1.1
+++ internal_comp_deps.mk 23 Feb 2006 22:50:21 -0000 1.2
@@ -57,7 +57,7 @@
mkdir -p $(LDAP_LIBPATH)
$(FTP_PULL) -method $(LDAPSDK_PULL_METHOD) \
-objdir $(LDAP_ROOT) -componentdir $(LDAP_RELEASE) \
- -files include,$(LDAPSDK_PULL_LIBS),tools
+ -files include,$(LDAPSDK_PULL_LIBS),bin
endif
-@if [ ! -f $@ ] ; \
then echo "Error: could not get component LDAPSDK file $@" ; \
18 years, 1 month
[Fedora-directory-commits] setuputil/installer Makefile,1.4,1.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/setuputil/installer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7489/installer
Modified Files:
Makefile
Log Message:
[179394] HP-UX IPF/PA-RISC support
NSPR_RELDATE = v4.6
SECURITY_RELDATE = NSS_3_11_RTM
added _ia64 tag to NSCONFIG
replaced --exclude option with more common -X <exclude_file> for tar.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/setuputil/installer/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile 20 Dec 2005 00:06:45 -0000 1.4
+++ Makefile 23 Feb 2006 21:47:51 -0000 1.5
@@ -38,6 +38,8 @@
include $(BUILD_ROOT)/nsconfig.mk
endif
+TMPLIST := $(shell echo /tmp/build.$$$$)
+
PKGDIR_NAME=$(PLATFORM_DEST)
PKGTOP=$(ABS_ROOT)/built/package/$(PKGDIR_NAME)
ifdef BUILD_INTL
@@ -171,8 +173,15 @@
ifneq ($(ARCH), WINNT)
# create a source tar ball (ABS_INSTDIR is always new and clean)
cd $(ABS_INSTDIR); ln -s $(ABS_ROOT) $(RPM_FILE_BASE); \
- tar cfh - --exclude \*/built --exclude \*/CVS $(RPM_FILE_BASE) --exclude \*/branding --exclude \*/RHEL* --exclude \*/SunOS* --exclude \*/HP* --exclude \*/Linux** | gzip > $(RPM_FILE_BASE).tar.gz; \
+ echo $(RPM_FILE_BASE)/built > $(TMPLIST) ; \
+ find $(RPM_FILE_BASE)/* -name "CVS" -a -type d -print | egrep -v built >> $(TMPLIST) ; \
+ find $(RPM_FILE_BASE)/* -name "HP-UX*" -a -type d -print | egrep -v built >> $(TMPLIST) ; \
+ find $(RPM_FILE_BASE)/* -name "SunOS*" -a -type d -print | egrep -v built >> $(TMPLIST) ; \
+ find $(RPM_FILE_BASE)/* -name "RHEL*" -a -type d -print | egrep -v built >> $(TMPLIST) ; \
+ find $(RPM_FILE_BASE)/* -name "Linux*" -a -type d -print | egrep -v built >> $(TMPLIST) ; \
+ tar cfh - -X $(TMPLIST) $(RPM_FILE_BASE) | gzip > $(RPM_FILE_BASE).tar.gz; \
$(RM) $(RPM_FILE_BASE)
+ -$(RM) -rf $(TMPLIST)
endif
pkgRPM: pkgSBC
18 years, 1 month
[Fedora-directory-commits] setuputil component_versions.mk, 1.1.1.1, 1.2 nsconfig.mk, 1.7, 1.8
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7489
Modified Files:
component_versions.mk nsconfig.mk
Log Message:
[179394] HP-UX IPF/PA-RISC support
NSPR_RELDATE = v4.6
SECURITY_RELDATE = NSS_3_11_RTM
added _ia64 tag to NSCONFIG
replaced --exclude option with more common -X <exclude_file> for tar.
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/component_versions.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- component_versions.mk 29 Jul 2005 22:16:18 -0000 1.1.1.1
+++ component_versions.mk 23 Feb 2006 21:47:45 -0000 1.2
@@ -34,12 +34,12 @@
# naming scheme.
# NSPR
ifndef NSPR_RELDATE
- NSPR_RELDATE = v4.4.1
+ NSPR_RELDATE = v4.6
endif
# SECURITY (NSS) LIBRARY
ifndef SECURITY_RELDATE
- SECURITY_RELDATE = NSS_3_9_3_RTM
+ SECURITY_RELDATE = NSS_3_11_RTM
endif
# DBM Library
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsconfig.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nsconfig.mk 15 Feb 2006 22:51:00 -0000 1.7
+++ nsconfig.mk 23 Feb 2006 21:47:45 -0000 1.8
@@ -68,8 +68,13 @@
NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)
endif
ifeq ($(NSOS_ARCH),HP-UX)
+ ifeq ($(NSOS_TEST1), ia64)
NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)
NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)
+ else
+ NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)
+ NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)
+ endif
else
NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)
NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)
18 years, 1 month
[Fedora-directory-commits] ldapserver/ldap/servers/slapd attr.c, 1.6, 1.7
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4989/ldapserver/ldap/servers/slapd
Modified Files:
attr.c
Log Message:
Bug: 179810
Description: crash: modify/delete when attr name doesn't match database
Reviewed by: All (Thanks!)
Fix description: Use case insensitive comparison for attribute names.
Index: attr.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/attr.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- attr.c 25 Aug 2005 00:58:27 -0000 1.6
+++ attr.c 23 Feb 2006 20:55:53 -0000 1.7
@@ -112,7 +112,7 @@
switch ( opt ) {
case SLAPI_TYPE_CMP_EXACT: /* compare base name + options as given */
- rc = strcmp( a1, a2 );
+ rc = strcasecmp( a1, a2 );
break;
case SLAPI_TYPE_CMP_BASE: /* ignore options on both names - compare base names only */
18 years, 1 month