[Fedora-directory-commits] dsbuild objdirname.mk,1.3,1.4
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/dsbuild
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8857
Modified Files:
objdirname.mk
Log Message:
Added support for 64-bit Console build on Linux
Index: objdirname.mk
===================================================================
RCS file: /cvs/dirsec/dsbuild/objdirname.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- objdirname.mk 16 Feb 2006 21:33:42 -0000 1.3
+++ objdirname.mk 22 Feb 2006 18:15:24 -0000 1.4
@@ -168,10 +168,18 @@
# figure out which imports file to use - for console builds
ifeq (RHEL4,$(findstring RHEL4,$(OBJDIR_NAME)))
-IMPORTS.FILE=imports.FC3
+ ifeq ($(USE_64), 1)
+ IMPORTS.FILE=imports.FC3_x86_64
+ else
+ IMPORTS.FILE=imports.FC3
+ endif
endif
ifeq (Linux2.6,$(findstring Linux2.6,$(OBJDIR_NAME)))
-IMPORTS.FILE=imports.FC3
+ ifeq ($(USE_64), 1)
+ IMPORTS.FILE=imports.FC3_x86_64
+ else
+ IMPORTS.FILE=imports.FC3
+ endif
endif
ifeq (RHEL3,$(findstring RHEL3,$(OBJDIR_NAME)))
IMPORTS.FILE=imports.FC2
18 years, 2 months
[Fedora-directory-commits] console imports.FC3_x86_64,NONE,1.1
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2946
Added Files:
imports.FC3_x86_64
Log Message:
Added x86_64 imports file
--- NEW FILE imports.FC3_x86_64 ---
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation version
# 2.1 of the License.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# 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
#
# Defines component import locations for FC3 x86_64
# Mozilla LDAP JDK
ldapjdk.location=http://directory.fedora.redhat.com/built/components/ldap...
ldapjdk.import=ldapjdk.jar
# Mozilla JSS Library
jss.lib.location=http://directory.fedora.redhat.com/built/components/jss/...
jss.lib.import=mdbinary.jar
# Mozilla JSS Jar
jss.jar.location=http://directory.fedora.redhat.com/built/components/jss/...
jss.jar.import=xpclass.jar
# Mozilla NSS Library
nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_...
nss.import=mdbinary.jar
# Mozilla NSPR Library
nspr.location=http://directory.fedora.redhat.com/built/components/nspr/v4...
nspr.import=mdbinary.jar
18 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.15, 1.30.2.16
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2607
Modified Files:
Tag: Directory71RtmBranch
Makefile
Log Message:
When copyfile is a library, the extension was not treated correctly.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.15
retrieving revision 1.30.2.16
diff -u -r1.30.2.15 -r1.30.2.16
--- Makefile 17 Feb 2006 17:26:01 -0000 1.30.2.15
+++ Makefile 22 Feb 2006 03:08:49 -0000 1.30.2.16
@@ -726,7 +726,7 @@
sfile=`echo $$pair | awk -F: '{print $$2}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \
dfile=`echo $$pair | awk -F: '{print $$3}'` ; \
cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); \
- mkdir -p `dirname $$dfile`; cp $$sfile $$dfile ; \
+ mkdir -p `dirname $$dfile`; cp $$sfile `dirname $$dfile` ; \
echo $(ZIP) $(ABS_INSTDIR)/$$zipfile $$dfile ; \
$(ZIP) $(ABS_INSTDIR)/$$zipfile $$dfile ; \
done
18 years, 2 months
[Fedora-directory-commits] adminserver/admserv/newinst/src ux-update.cc, 1.18, 1.19
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv648
Modified Files:
ux-update.cc
Log Message:
Apache 2.2 uses different modules for auth/authz than 2.0. This change allows admin server post install to figure out what version of Apache is being used (via httpd -v) and select the appropriate httpd.conf template file based on that version.
Index: ux-update.cc
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-update.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ux-update.cc 12 Dec 2005 18:34:14 -0000 1.18
+++ ux-update.cc 22 Feb 2006 02:28:51 -0000 1.19
@@ -241,7 +241,6 @@
findApacheRoot(const char *dir)
{
char path[1024];
- char errMsg[SML_BUF];
struct stat st;
char *v;
@@ -264,6 +263,53 @@
return v;
}
+static char *get_version(char * file) {
+ char cmd[1024];
+ char buf[1024];
+ FILE *fp;
+ const char *versstr = "Server version: Apache/";
+
+ sprintf(cmd, "%s -v", file);
+ fp = popen(cmd, "r");
+
+ if (fp != NULL) {
+ char *x, *t;
+ while ((fgets(buf, sizeof(buf), fp)) > 0) {
+ x = (char *)strstr(buf, versstr);
+ if (x) {
+ t = x + strlen(versstr);
+ if (x = strchr(buf, '\n')) {
+ *x = '\0';
+ }
+ pclose(fp);
+ return (char *)(strdup(t));
+ }
+ }
+ }
+ pclose(fp);
+ return NULL;
+}
+
+static NSString
+findApacheVersion(const char *dir)
+{
+ char path[1024];
+ struct stat st;
+ char *v;
+
+ snprintf(path, sizeof(path), "%s/httpd.worker", dir);
+ if (stat(path, &st) != 0) {
+ snprintf(path, sizeof(path), "%s/httpd", dir);
+ if (stat(path, &st) != 0) {
+ return NULL;
+ }
+ }
+
+ v = get_version(path);
+
+ return v;
+}
+
void
configTasks(const Ldap *ldap, const char *sroot, const char *sieDN)
{
@@ -527,6 +573,7 @@
char apacheRoot[BIG_BUF];
char apacheDir[BIG_BUF];
char apacheBin[BIG_BUF];
+ char apacheVersion[BIG_BUF];
struct stat st;
NSString hostip = InstUtil::getHostIpAddress(hn);
char serverAddress[SML_BUF];
@@ -535,6 +582,7 @@
int port;
const char *s;
char *ss;
+ NSString tmp;
chdir(sroot);
@@ -577,6 +625,12 @@
}
}
+ apacheVersion[0] = '\0';
+ tmp = findApacheVersion(apacheDir);
+ if ((const char*)tmp) {
+ strcpy(apacheVersion, (const char *)tmp);
+ }
+
s = installInfo->get(SS_USER_ID);
if (NULL == s) {
fatal_error("InstallInfo: Server User \"SuiteSpotUserID\" is missing.", "", "");
@@ -1209,8 +1263,12 @@
restartarray[1] = (char *)sroot;
restartarray[2] = NULL;
+ if (0 == strncmp(apacheVersion, "2.2", 3)) {
+ snprintf(src, sizeof(tstr), "%s/shared/config/template/httpd-2.2.conf.tmpl", sroot);
+ } else {
+ snprintf(src, sizeof(tstr), "%s/shared/config/template/httpd.conf.tmpl", sroot);
+ }
snprintf(tstr, sizeof(tstr), "%s/admin-serv/config/httpd.conf", sroot);
- snprintf(src, sizeof(tstr), "%s/shared/config/template/httpd.conf.tmpl", sroot);
replaceTokensInFile(src, tstr, httparray);
chmod(tstr, S_IRUSR | S_IWUSR);
logUninstallInfo(sroot, "admin", "admin", tstr);
18 years, 2 months
[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.37, 1.38
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv618
Modified Files:
pkgadmin.mk
Log Message:
Added httpd-2.2.conf.tmpl - Apache 2.2 uses different modules than 2.0 for auth/authz
Admin server post install will figure out which one to use based on httpd -v
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- pkgadmin.mk 13 Feb 2006 22:12:55 -0000 1.37
+++ pkgadmin.mk 22 Feb 2006 02:25:27 -0000 1.38
@@ -280,6 +280,7 @@
cp $(BUILD_ROOT)/lib/ldaputil/certmap.conf $(ADMIN_DIR)/shared/config
cp -p $(BUILD_ROOT)/admserv/cfgstuff/httpd.conf $(ADMIN_DIR)/shared/config/template/httpd.conf.tmpl
+ cp -p $(BUILD_ROOT)/admserv/cfgstuff/httpd-2.2.conf $(ADMIN_DIR)/shared/config/template/httpd-2.2.conf.tmpl
cp -p $(BUILD_ROOT)/admserv/cfgstuff/admserv.conf $(ADMIN_DIR)/shared/config/template/admserv.conf.tmpl
cp -p $(BUILD_ROOT)/admserv/cfgstuff/console.conf $(ADMIN_DIR)/shared/config/template/console.conf.tmpl
cp -p $(BUILD_ROOT)/admserv/cfgstuff/nss.conf $(ADMIN_DIR)/shared/config/template/nss.conf.tmpl
18 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/cm fedora-patch.inf, 1.1.2.8, 1.1.2.9 redhat-patch.inf, 1.1.2.8, 1.1.2.9
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22038
Modified Files:
Tag: Directory71RtmBranch
fedora-patch.inf redhat-patch.inf
Log Message:
replaced library extensions ".so" with ".*" (fix for HP-UX patch packaging)
Index: fedora-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/fedora-patch.inf,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- fedora-patch.inf 21 Feb 2006 20:45:48 -0000 1.1.2.8
+++ fedora-patch.inf 21 Feb 2006 21:38:05 -0000 1.1.2.9
@@ -60,26 +60,26 @@
file: 169388,169954,170071,170350,181827,179135,179137: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
file: xxxxxx: README.txt
-file: M324525,M324529: shared/lib/libldap50.so
-file: M324525,M324529: shared/lib/libprldap50.so
-file: M324525,M324529: shared/lib/libssldap50.so
+file: M324525,M324529: shared/lib/libldap50.*
+file: M324525,M324529: shared/lib/libprldap50.*
+file: M324525,M324529: shared/lib/libssldap50.*
file: M324525,M324529: shared/bin/ldapcmp
file: M324525,M324529: shared/bin/ldapcompare
file: M324525,M324529: shared/bin/ldapdelete
file: M324525,M324529: shared/bin/ldapmodify
file: M324525,M324529: shared/bin/ldapsearch
-file: M324525,M324529: bin/slapd/lib/libldap50.so
-file: M324525,M324529: bin/slapd/lib/libprldap50.so
-file: M324525,M324529: bin/slapd/lib/libssldap50.so
-file: M324525,M324529: clients/lib/libldap50.so
-file: M324525,M324529: clients/lib/libprldap50.so
-file: M324525,M324529: clients/lib/libssldap50.so
+file: M324525,M324529: bin/slapd/lib/libldap50.*
+file: M324525,M324529: bin/slapd/lib/libprldap50.*
+file: M324525,M324529: bin/slapd/lib/libssldap50.*
+file: M324525,M324529: clients/lib/libldap50.*
+file: M324525,M324529: clients/lib/libprldap50.*
+file: M324525,M324529: clients/lib/libssldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/https/lib/libldap50.so
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/https/lib/libprldap50.so
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/https/lib/libssldap50.so
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/admin/lib/libldap50.so
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/admin/lib/libprldap50.so
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/admin/lib/libssldap50.so
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.*:bin/https/lib/libldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.*:bin/https/lib/libprldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.*:bin/https/lib/libssldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.*:bin/admin/lib/libldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.*:bin/admin/lib/libprldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.*:bin/admin/lib/libssldap50.*
compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help
Index: redhat-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- redhat-patch.inf 21 Feb 2006 20:45:48 -0000 1.1.2.8
+++ redhat-patch.inf 21 Feb 2006 21:38:05 -0000 1.1.2.9
@@ -60,26 +60,26 @@
file: 169388,169954,170071,170350,181827,179135,179137: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
file: xxxxxx: README.txt
-file: M324525,M324529: shared/lib/libldap50.so
-file: M324525,M324529: shared/lib/libprldap50.so
-file: M324525,M324529: shared/lib/libssldap50.so
+file: M324525,M324529: shared/lib/libldap50.*
+file: M324525,M324529: shared/lib/libprldap50.*
+file: M324525,M324529: shared/lib/libssldap50.*
file: M324525,M324529: shared/bin/ldapcmp
file: M324525,M324529: shared/bin/ldapcompare
file: M324525,M324529: shared/bin/ldapdelete
file: M324525,M324529: shared/bin/ldapmodify
file: M324525,M324529: shared/bin/ldapsearch
-file: M324525,M324529: bin/slapd/lib/libldap50.so
-file: M324525,M324529: bin/slapd/lib/libprldap50.so
-file: M324525,M324529: bin/slapd/lib/libssldap50.so
-file: M324525,M324529: clients/lib/libldap50.so
-file: M324525,M324529: clients/lib/libprldap50.so
-file: M324525,M324529: clients/lib/libssldap50.so
+file: M324525,M324529: bin/slapd/lib/libldap50.*
+file: M324525,M324529: bin/slapd/lib/libprldap50.*
+file: M324525,M324529: bin/slapd/lib/libssldap50.*
+file: M324525,M324529: clients/lib/libldap50.*
+file: M324525,M324529: clients/lib/libprldap50.*
+file: M324525,M324529: clients/lib/libssldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/https/lib/libldap50.so
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/https/lib/libprldap50.so
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/https/lib/libssldap50.so
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/admin/lib/libldap50.so
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/admin/lib/libprldap50.so
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/admin/lib/libssldap50.so
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.*:bin/https/lib/libldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.*:bin/https/lib/libprldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.*:bin/https/lib/libssldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.*:bin/admin/lib/libldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.*:bin/admin/lib/libprldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.*:bin/admin/lib/libssldap50.*
compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help
18 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/cm fedora-patch.inf, 1.1.2.7, 1.1.2.8 redhat-patch.inf, 1.1.2.7, 1.1.2.8
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19855
Modified Files:
Tag: Directory71RtmBranch
fedora-patch.inf redhat-patch.inf
Log Message:
added 175063,179135,179137,175897,179810,181827
Index: fedora-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/fedora-patch.inf,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- fedora-patch.inf 15 Feb 2006 21:32:27 -0000 1.1.2.7
+++ fedora-patch.inf 21 Feb 2006 20:45:48 -0000 1.1.2.8
@@ -45,11 +45,11 @@
base: ...
file: 147585: plugins/slapd/slapi/examples/testpreop.c
-file: 164834,165641,166229,173687: bin/slapd/server/ns-slapd
-file: 155276,164834,164843,165641,166229,173687: bin/slapd/server/libslapd.*
+file: 164834,165641,166229,173687,175063: bin/slapd/server/ns-slapd
+file: 155276,164834,164843,165641,166229,173687,175063,179135,179137: bin/slapd/server/libslapd.*
file: 151678: bin/slapd/admin/bin/ds_newinst
file: 151678: bin/slapd/admin/bin/ds_create
-file: 155276,164843,165641,165827,165862,166012: lib/libback-ldbm.*
+file: 155276,164843,165641,165827,165862,166012,175063,175897,179135,179137,179810: lib/libback-ldbm.*
file: 160003: bin/slapd/admin/scripts/template-db2index.pl
file: 160003: bin/slapd/admin/bin/upgradeServer
file: 164836,165600: lib/attr-unique-plugin.*
@@ -57,29 +57,29 @@
file: 167478,160589: setup/setup
file: 156120,159037,170321,170328,170556,170558,170816: winsync/PassSync.msi
file: 167761: java/jars/ds71.jar
-file: 169388,169954,170071,170350: lib/replication-plugin.*
+file: 169388,169954,170071,170350,181827,179135,179137: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
file: xxxxxx: README.txt
file: M324525,M324529: shared/lib/libldap50.so
file: M324525,M324529: shared/lib/libprldap50.so
file: M324525,M324529: shared/lib/libssldap50.so
+file: M324525,M324529: shared/bin/ldapcmp
+file: M324525,M324529: shared/bin/ldapcompare
+file: M324525,M324529: shared/bin/ldapdelete
+file: M324525,M324529: shared/bin/ldapmodify
+file: M324525,M324529: shared/bin/ldapsearch
file: M324525,M324529: bin/slapd/lib/libldap50.so
file: M324525,M324529: bin/slapd/lib/libprldap50.so
file: M324525,M324529: bin/slapd/lib/libssldap50.so
file: M324525,M324529: clients/lib/libldap50.so
file: M324525,M324529: clients/lib/libprldap50.so
file: M324525,M324529: clients/lib/libssldap50.so
-file: M324525,M324529: shared/bin/ldapcmp
-file: M324525,M324529: shared/bin/ldapcompare
-file: M324525,M324529: shared/bin/ldapdelete
-file: M324525,M324529: shared/bin/ldapmodify
-file: M324525,M324529: shared/bin/ldapsearch
-copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libldap50.so:bin/https/lib/libldap50.so
-copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libprldap50.so:bin/https/lib/libprldap50.so
-copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libssldap50.so:bin/https/lib/libssldap50.so
-copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libldap50.so:bin/admin/lib/libldap50.so
-copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libprldap50.so:bin/admin/lib/libprldap50.so
-copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libssldap50.so:bin/admin/lib/libssldap50.so
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/https/lib/libldap50.so
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/https/lib/libprldap50.so
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/https/lib/libssldap50.so
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/admin/lib/libldap50.so
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/admin/lib/libprldap50.so
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/admin/lib/libssldap50.so
compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help
Index: redhat-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- redhat-patch.inf 15 Feb 2006 21:32:27 -0000 1.1.2.7
+++ redhat-patch.inf 21 Feb 2006 20:45:48 -0000 1.1.2.8
@@ -45,11 +45,11 @@
base: /share/builds/products/server/directry/7.1
file: 147585: plugins/slapd/slapi/examples/testpreop.c
-file: 164834,165641,166229,173687: bin/slapd/server/ns-slapd
-file: 155276,164834,164843,165641,166229,173687: bin/slapd/server/libslapd.*
+file: 164834,165641,166229,173687,175063: bin/slapd/server/ns-slapd
+file: 155276,164834,164843,165641,166229,173687,175063,179135,179137: bin/slapd/server/libslapd.*
file: 151678: bin/slapd/admin/bin/ds_newinst
file: 151678: bin/slapd/admin/bin/ds_create
-file: 155276,164843,165641,165827,165862,166012: lib/libback-ldbm.*
+file: 155276,164843,165641,165827,165862,166012,175063,175897,179135,179137,179810: lib/libback-ldbm.*
file: 160003: bin/slapd/admin/scripts/template-db2index.pl
file: 160003: bin/slapd/admin/bin/upgradeServer
file: 164836,165600: lib/attr-unique-plugin.*
@@ -57,7 +57,7 @@
file: 167478,160589: setup/setup
file: 156120,159037,170321,170328,170556,170558,170816: winsync/PassSync.msi
file: 167761: java/jars/ds71.jar
-file: 169388,169954,170071,170350: lib/replication-plugin.*
+file: 169388,169954,170071,170350,181827,179135,179137: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
file: xxxxxx: README.txt
file: M324525,M324529: shared/lib/libldap50.so
18 years, 2 months
[Fedora-directory-commits] console imports.FC2, 1.2, 1.3 imports.FC3, 1.2, 1.3 imports.HP-UX11i, 1.2, 1.3 imports.Solaris9, 1.2, 1.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17289
Modified Files:
imports.FC2 imports.FC3 imports.HP-UX11i imports.Solaris9
Log Message:
Updated nss version and added x86_64 imports file
Index: imports.FC2
===================================================================
RCS file: /cvs/dirsec/console/imports.FC2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- imports.FC2 29 Nov 2005 18:36:50 -0000 1.2
+++ imports.FC2 21 Feb 2006 19:30:09 -0000 1.3
@@ -32,7 +32,7 @@
jss.jar.import=xpclass.jar
# Mozilla NSS Library
-nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_10_2_RTM/RHEL3_x86_gcc3_OPT.OBJ
+nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_11_RTM/RHEL3_x86_gcc3_OPT.OBJ
nss.import=mdbinary.jar
# Mozilla NSPR Library
Index: imports.FC3
===================================================================
RCS file: /cvs/dirsec/console/imports.FC3,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- imports.FC3 29 Nov 2005 18:36:50 -0000 1.2
+++ imports.FC3 21 Feb 2006 19:30:09 -0000 1.3
@@ -32,7 +32,7 @@
jss.jar.import=xpclass.jar
# Mozilla NSS Library
-nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_10_2_RTM/RHEL4_x86_gcc3_OPT.OBJ
+nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_11_RTM/RHEL4_x86_gcc3_OPT.OBJ
nss.import=mdbinary.jar
# Mozilla NSPR Library
Index: imports.HP-UX11i
===================================================================
RCS file: /cvs/dirsec/console/imports.HP-UX11i,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- imports.HP-UX11i 29 Nov 2005 18:36:50 -0000 1.2
+++ imports.HP-UX11i 21 Feb 2006 19:30:09 -0000 1.3
@@ -32,7 +32,7 @@
jss.jar.import=xpclass.jar
# Mozilla NSS Library
-nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_10_2_RTM/HP-UXB.11.11_OPT.OBJ
+nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_11_RTM/HP-UXB.11.11_OPT.OBJ
nss.import=mdbinary.jar
# Mozilla NSPR Library
Index: imports.Solaris9
===================================================================
RCS file: /cvs/dirsec/console/imports.Solaris9,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- imports.Solaris9 29 Nov 2005 18:36:50 -0000 1.2
+++ imports.Solaris9 21 Feb 2006 19:30:09 -0000 1.3
@@ -32,7 +32,7 @@
jss.jar.import=xpclass.jar
# Mozilla NSS Library
-nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_10_2_RTM/SunOS5.9_OPT.OBJ
+nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_11_RTM/SunOS5.9_OPT.OBJ
nss.import=mdbinary.jar
# Mozilla NSPR Library
18 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication windows_connection.c, 1.8.2.4, 1.8.2.5 windows_protocol_util.c, 1.20.2.2, 1.20.2.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26642
Modified Files:
Tag: Directory71RtmBranch
windows_connection.c windows_protocol_util.c
Log Message:
Bug(s) fixed: 181827
Bug Description: If you delete an attribute from an entry on AD, the attribute
doesn't get deleted on the DS side. The replication code doesn't even notice
that the entry changed.
Reviewed by: Rich, Noriko, Pete (thanks!)
Files: see diffs
Branch: HEAD, Directory71Branch
Fix Description: The dirsync search control passes back deleted attributes with no
values. If you try to add a Slapi_Attr with no values to a Slapi_Entry, it doesn't
get added. This fix stuffs the deleted attributes into the deleted attributes list
in the Slapi_Entry and checks for them when creating the modification
operations to be performed on the local entry.
Flag Day: no
Doc impact: no
QA impact: A regression test needs to be added
New Tests integrated into TET: none
Index: windows_connection.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_connection.c,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -u -r1.8.2.4 -r1.8.2.5
--- windows_connection.c 27 Oct 2005 19:11:14 -0000 1.8.2.4
+++ windows_connection.c 20 Feb 2006 19:50:29 -0000 1.8.2.5
@@ -557,7 +557,19 @@
{
type_to_use = a;
}
- slapi_entry_add_values( e, type_to_use, aVal);
+
+ /* If the list of attribute values is null, we need to delete this attribute
+ * from the local entry.
+ */
+ if (aVal == NULL) {
+ /* Windows will send us an attribute with no values if it was deleted
+ * on the AD side. Add this attribute to the deleted attributes list */
+ Slapi_Attr *attr = slapi_attr_new();
+ slapi_attr_init(attr, type_to_use);
+ entry_add_deleted_attribute_wsi(e, attr);
+ } else {
+ slapi_entry_add_values( e, type_to_use, aVal);
+ }
ldap_memfree(a);
ldap_value_free_len(aVal);
Index: windows_protocol_util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_protocol_util.c,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -r1.20.2.2 -r1.20.2.3
--- windows_protocol_util.c 20 Oct 2005 17:25:22 -0000 1.20.2.2
+++ windows_protocol_util.c 20 Feb 2006 19:50:29 -0000 1.20.2.3
@@ -2494,6 +2494,7 @@
{
int retval = 0;
Slapi_Attr *attr = NULL;
+ Slapi_Attr *del_attr = NULL;
int is_user = 0;
int is_group = 0;
int rc = 0;
@@ -2636,17 +2637,48 @@
*do_modify = 1;
}
}
+
if (vs)
{
slapi_valueset_free(vs);
vs = NULL;
}
- if (local_type)
- {
- slapi_ch_free((void**)&local_type);
- local_type = NULL;
- }
+
+ slapi_ch_free_string(&local_type);
}
+
+ /* Check if any attributes were deleted from the remote entry */
+ entry_first_deleted_attribute(remote_entry, &del_attr);
+ while (del_attr != NULL) {
+ Slapi_Attr *local_attr = NULL;
+ char *type = NULL;
+ char *local_type = NULL;
+ int mapdn = 0;
+
+ /* Map remote type to local type */
+ slapi_attr_get_type(del_attr, &type);
+ if ( is_straight_mapped_attr(type,is_user,is_nt4) ) {
+ local_type = slapi_ch_strdup(type);
+ } else {
+ windows_map_attr_name(type , to_windows, is_user, 0 /* not create */, &local_type, &mapdn);
+ }
+
+ /* Check if this attr exists in the local entry */
+ if (local_type) {
+ slapi_entry_attr_find(local_entry, local_type, &local_attr);
+ if (local_attr) {
+ slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name,
+ "windows_generate_update_mods: deleting %s attribute from local entry\n", local_type);
+ /* Delete this attr from the local entry */
+ slapi_mods_add_mod_values(smods, LDAP_MOD_DELETE, local_type, NULL);
+ *do_modify = 1;
+ }
+ }
+
+ entry_next_deleted_attribute(remote_entry, &del_attr);
+ slapi_ch_free_string(&local_type);
+ }
+
if (slapi_is_loglevel_set(SLAPI_LOG_REPL) && *do_modify)
{
slapi_mods_dump(smods,"windows sync");
@@ -2667,14 +2699,18 @@
/* Now perform the modify if we need to */
if (0 == retval && do_modify)
{
+ char dnbuf[BUFSIZ];
+ char *dn = slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry));
slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name,
- "windows_update_remote_entry: modifying entry %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry)));
+ "windows_update_remote_entry: modifying entry %s\n", escape_string(dn, dnbuf));
retval = windows_conn_send_modify(prp->conn, slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry)),slapi_mods_get_ldapmods_byref(&smods), NULL,NULL);
} else
{
+ char dnbuf[BUFSIZ];
+ char *dn = slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry));
slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name,
- "no mods generated for entry: %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry)));
+ "no mods generated for remote entry: %s\n", escape_string(dn, dnbuf));
}
slapi_mods_done(&smods);
return retval;
@@ -2699,8 +2735,10 @@
pb = slapi_pblock_new();
if (pb)
{
+ char dnbuf[BUFSIZ];
+ char *dn = slapi_sdn_get_dn(slapi_entry_get_sdn_const(local_entry));
slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name,
- "modifying entry: %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(local_entry)));
+ "modifying entry: %s\n", escape_string(dn, dnbuf));
slapi_modify_internal_set_pb (pb, slapi_entry_get_ndn(local_entry), slapi_mods_get_ldapmods_byref(&smods), NULL, NULL,
repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION), 0);
slapi_modify_internal_pb (pb);
@@ -2708,7 +2746,7 @@
if (rc)
{
slapi_log_error(SLAPI_LOG_FATAL, windows_repl_plugin_name,
- "windows_update_local_entry: failed to modify entry %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(local_entry)));
+ "windows_update_local_entry: failed to modify entry %s\n", escape_string(dn, dnbuf));
}
slapi_pblock_destroy(pb);
} else
@@ -2719,8 +2757,10 @@
} else
{
+ char dnbuf[BUFSIZ];
+ char *dn = slapi_sdn_get_dn(slapi_entry_get_sdn_const(local_entry));
slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name,
- "no mods generated for entry: %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry)));
+ "no mods generated for local entry: %s\n", escape_string(dn, dnbuf));
}
slapi_mods_done(&smods);
return retval;
@@ -2957,6 +2997,22 @@
windows_get_remote_entry(prp,slapi_entry_get_sdn_const(e),&remote_entry);
if (remote_entry)
{
+ /* We need to check for any deleted attrs from the dirsync entry
+ * and pass them into the newly fetched remote entry. */
+ Slapi_Attr *attr = NULL;
+ Slapi_Attr *rem_attr = NULL;
+ entry_first_deleted_attribute(e, &attr);
+ while (attr != NULL) {
+ /* We need to dup the attr and add it to the remote entry.
+ * rem_attr is now owned by remote_entry, so don't free it */
+ rem_attr = slapi_attr_dup(attr);
+ if (rem_attr) {
+ entry_add_deleted_attribute_wsi(remote_entry, rem_attr);
+ rem_attr = NULL;
+ }
+ entry_next_deleted_attribute(e, &attr);
+ }
+
rc = windows_update_local_entry(prp, remote_entry, local_entry);
slapi_entry_free(remote_entry);
remote_entry = NULL;
18 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication windows_connection.c, 1.12, 1.13 windows_protocol_util.c, 1.23, 1.24
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26379
Modified Files:
windows_connection.c windows_protocol_util.c
Log Message:
Bug(s) fixed: 181827
Bug Description: If you delete an attribute from an entry on AD, the attribute
doesn't get deleted on the DS side. The replication code doesn't even notice
that the entry changed.
Reviewed by: Rich, Noriko, Pete (thanks!)
Files: see diffs
Branch: HEAD, Directory71Branch
Fix Description: The dirsync search control passes back deleted attributes with no
values. If you try to add a Slapi_Attr with no values to a Slapi_Entry, it doesn't
get added. This fix stuffs the deleted attributes into the deleted attributes list
in the Slapi_Entry and checks for them when creating the modification
operations to be performed on the local entry.
Flag Day: no
Doc impact: no
QA impact: A regression test needs to be added
New Tests integrated into TET: none
Index: windows_connection.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_connection.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- windows_connection.c 27 Oct 2005 19:09:07 -0000 1.12
+++ windows_connection.c 20 Feb 2006 19:36:24 -0000 1.13
@@ -557,7 +557,19 @@
{
type_to_use = a;
}
- slapi_entry_add_values( e, type_to_use, aVal);
+
+ /* If the list of attribute values is null, we need to delete this attribute
+ * from the local entry.
+ */
+ if (aVal == NULL) {
+ /* Windows will send us an attribute with no values if it was deleted
+ * on the AD side. Add this attribute to the deleted attributes list */
+ Slapi_Attr *attr = slapi_attr_new();
+ slapi_attr_init(attr, type_to_use);
+ entry_add_deleted_attribute_wsi(e, attr);
+ } else {
+ slapi_entry_add_values( e, type_to_use, aVal);
+ }
ldap_memfree(a);
ldap_value_free_len(aVal);
Index: windows_protocol_util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_protocol_util.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- windows_protocol_util.c 22 Nov 2005 03:40:08 -0000 1.23
+++ windows_protocol_util.c 20 Feb 2006 19:36:24 -0000 1.24
@@ -2496,6 +2496,7 @@
{
int retval = 0;
Slapi_Attr *attr = NULL;
+ Slapi_Attr *del_attr = NULL;
int is_user = 0;
int is_group = 0;
int rc = 0;
@@ -2638,17 +2639,48 @@
*do_modify = 1;
}
}
+
if (vs)
{
slapi_valueset_free(vs);
vs = NULL;
}
- if (local_type)
- {
- slapi_ch_free((void**)&local_type);
- local_type = NULL;
- }
+
+ slapi_ch_free_string(&local_type);
}
+
+ /* Check if any attributes were deleted from the remote entry */
+ entry_first_deleted_attribute(remote_entry, &del_attr);
+ while (del_attr != NULL) {
+ Slapi_Attr *local_attr = NULL;
+ char *type = NULL;
+ char *local_type = NULL;
+ int mapdn = 0;
+
+ /* Map remote type to local type */
+ slapi_attr_get_type(del_attr, &type);
+ if ( is_straight_mapped_attr(type,is_user,is_nt4) ) {
+ local_type = slapi_ch_strdup(type);
+ } else {
+ windows_map_attr_name(type , to_windows, is_user, 0 /* not create */, &local_type, &mapdn);
+ }
+
+ /* Check if this attr exists in the local entry */
+ if (local_type) {
+ slapi_entry_attr_find(local_entry, local_type, &local_attr);
+ if (local_attr) {
+ slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name,
+ "windows_generate_update_mods: deleting %s attribute from local entry\n", local_type);
+ /* Delete this attr from the local entry */
+ slapi_mods_add_mod_values(smods, LDAP_MOD_DELETE, local_type, NULL);
+ *do_modify = 1;
+ }
+ }
+
+ entry_next_deleted_attribute(remote_entry, &del_attr);
+ slapi_ch_free_string(&local_type);
+ }
+
if (slapi_is_loglevel_set(SLAPI_LOG_REPL) && *do_modify)
{
slapi_mods_dump(smods,"windows sync");
@@ -2669,14 +2701,18 @@
/* Now perform the modify if we need to */
if (0 == retval && do_modify)
{
+ char dnbuf[BUFSIZ];
+ char *dn = slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry));
slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name,
- "windows_update_remote_entry: modifying entry %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry)));
+ "windows_update_remote_entry: modifying entry %s\n", escape_string(dn, dnbuf));
retval = windows_conn_send_modify(prp->conn, slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry)),slapi_mods_get_ldapmods_byref(&smods), NULL,NULL);
} else
{
+ char dnbuf[BUFSIZ];
+ char *dn = slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry));
slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name,
- "no mods generated for entry: %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry)));
+ "no mods generated for remote entry: %s\n", escape_string(dn, dnbuf));
}
slapi_mods_done(&smods);
return retval;
@@ -2701,8 +2737,10 @@
pb = slapi_pblock_new();
if (pb)
{
+ char dnbuf[BUFSIZ];
+ char *dn = slapi_sdn_get_dn(slapi_entry_get_sdn_const(local_entry));
slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name,
- "modifying entry: %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(local_entry)));
+ "modifying entry: %s\n", escape_string(dn, dnbuf));
slapi_modify_internal_set_pb (pb, slapi_entry_get_ndn(local_entry), slapi_mods_get_ldapmods_byref(&smods), NULL, NULL,
repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION), 0);
slapi_modify_internal_pb (pb);
@@ -2710,7 +2748,7 @@
if (rc)
{
slapi_log_error(SLAPI_LOG_FATAL, windows_repl_plugin_name,
- "windows_update_local_entry: failed to modify entry %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(local_entry)));
+ "windows_update_local_entry: failed to modify entry %s\n", escape_string(dn, dnbuf));
}
slapi_pblock_destroy(pb);
} else
@@ -2721,8 +2759,10 @@
} else
{
+ char dnbuf[BUFSIZ];
+ char *dn = slapi_sdn_get_dn(slapi_entry_get_sdn_const(local_entry));
slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name,
- "no mods generated for entry: %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry)));
+ "no mods generated for local entry: %s\n", escape_string(dn, dnbuf));
}
slapi_mods_done(&smods);
return retval;
@@ -2959,6 +2999,22 @@
windows_get_remote_entry(prp,slapi_entry_get_sdn_const(e),&remote_entry);
if (remote_entry)
{
+ /* We need to check for any deleted attrs from the dirsync entry
+ * and pass them into the newly fetched remote entry. */
+ Slapi_Attr *attr = NULL;
+ Slapi_Attr *rem_attr = NULL;
+ entry_first_deleted_attribute(e, &attr);
+ while (attr != NULL) {
+ /* We need to dup the attr and add it to the remote entry.
+ * rem_attr is now owned by remote_entry, so don't free it */
+ rem_attr = slapi_attr_dup(attr);
+ if (rem_attr) {
+ entry_add_deleted_attribute_wsi(remote_entry, rem_attr);
+ rem_attr = NULL;
+ }
+ entry_next_deleted_attribute(e, &attr);
+ }
+
rc = windows_update_local_entry(prp, remote_entry, local_entry);
slapi_entry_free(remote_entry);
remote_entry = NULL;
18 years, 2 months