[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication repl5_protocol_util.c, 1.8, 1.8.2.1
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31454
Modified Files:
Tag: Directory71RtmBranch
repl5_protocol_util.c
Log Message:
Resolves: 196523
Summary: miscellaneous memory leaks
Description: applying the patch to Directory71RtmBranch
Index: repl5_protocol_util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_protocol_util.c,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- repl5_protocol_util.c 18 May 2005 03:17:33 -0000 1.8
+++ repl5_protocol_util.c 9 Jan 2008 18:59:55 -0000 1.8.2.1
@@ -112,6 +112,10 @@
int return_value;
ConnResult crc;
Repl_Connection *conn;
+ struct berval *retdata = NULL;
+ char *retoid = NULL;
+ Slapi_DN *replarea_sdn = NULL;
+ struct berval **ruv_bervals = NULL;
PR_ASSERT(prp && prot_oid);
@@ -195,9 +199,6 @@
} else
{
CSN *current_csn = NULL;
- struct berval *retdata = NULL;
- char *retoid = NULL;
- Slapi_DN *replarea_sdn;
/* Good to go. Start the protocol. */
@@ -238,7 +239,6 @@
* Extop was processed. Look at extop response to see if we're
* permitted to go ahead.
*/
- struct berval **ruv_bervals = NULL;
int extop_result;
int extop_rc = decode_repl_ext_response(retdata, &extop_result,
&ruv_bervals);
@@ -392,8 +392,6 @@
prp->last_acquire_response_code = NSDS50_REPL_INTERNAL_ERROR;
return_value = ACQUIRE_FATAL_ERROR;
}
- if (NULL != ruv_bervals)
- ber_bvecfree(ruv_bervals);
}
else
{
@@ -418,15 +416,18 @@
agmt_get_long_name(prp->agmt));
return_value = ACQUIRE_FATAL_ERROR;
}
- slapi_sdn_free(&replarea_sdn);
- if (NULL != retoid)
- ldap_memfree(retoid);
- if (NULL != retdata)
- ber_bvfree(retdata);
}
}
}
error:
+ if (NULL != ruv_bervals)
+ ber_bvecfree(ruv_bervals);
+ if (NULL != replarea_sdn)
+ slapi_sdn_free(&replarea_sdn);
+ if (NULL != retoid)
+ ldap_memfree(retoid);
+ if (NULL != retdata)
+ ber_bvfree(retdata);
if (ACQUIRE_SUCCESS != return_value)
{
16 years, 3 months
[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.10.2.9, 1.10.2.10
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10587
Modified Files:
Tag: Directory71RtmBranch
ldapserver.spec.tmpl
Log Message:
Resolves: #203670
Summary: Tracking bug for Directory Server 7.1 SP 4
Description:
- apply patches defined in DS7.1 SP4 PRD
- increace the release number from 5 to 6
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/Attic/ldapserver.spec.tmpl,v
retrieving revision 1.10.2.9
retrieving revision 1.10.2.10
diff -u -r1.10.2.9 -r1.10.2.10
--- ldapserver.spec.tmpl 26 May 2006 23:43:39 -0000 1.10.2.9
+++ ldapserver.spec.tmpl 8 Jan 2008 00:52:20 -0000 1.10.2.10
@@ -45,7 +45,7 @@
Summary: @COMPANY-PRODUCT-NAME@
Name: @LCASE-COMPANY-NAME-NOSP@-ds
Version: @GEN-VERSION@
-Release: 5.@PLATFORM@
+Release: 6.@PLATFORM@
License: GPL plus extensions
Group: System Environment/Daemons
URL: @COMPANY-URL@
@@ -135,6 +135,9 @@
fi
%changelog
+* Mon Jan 07 2008 Noriko Hosoi <nhosoi(a)redhat.com> 7.1-4
+- apply patches defined in DS7.1 SP4 PRD
+
* Tue Sep 13 2005 Nathan Kinder <nkinder(a)redhat.com> 7.1-3
- use a macro for require list that is passed in via rpmbuild
16 years, 3 months
[Fedora-directory-commits] ldapserver/ldap/cm fedora-patch.inf, 1.1.2.15, 1.1.2.16 redhat-patch.inf, 1.1.2.16, 1.1.2.17
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22429
Modified Files:
Tag: Directory71RtmBranch
fedora-patch.inf redhat-patch.inf
Log Message:
Resolves: #203670
Summary: Tracking bug for Directory Server 7.1 SP 4
Description: updating patch info file to include the following patches:
202890, 229513, 231507, 247725, 297221, 339791,
Index: fedora-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Attic/fedora-patch.inf,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- fedora-patch.inf 8 Jun 2006 19:08:20 -0000 1.1.2.15
+++ fedora-patch.inf 7 Jan 2008 22:32:16 -0000 1.1.2.16
@@ -49,15 +49,18 @@
base: ...
file: 147585: plugins/slapd/slapi/examples/testpreop.c
-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: 164834,165641,166229,173687,175063,202890,247725,297221: bin/slapd/server/ns-slapd
+file: 155276,164834,164843,165641,166229,173687,175063,179135,179137,202890,247725,297221: 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,175063,175897,179135,179137,179810,189264,192901: lib/libback-ldbm.*
+file: 155276,164843,165641,165827,165862,166012,175063,175897,179135,179137,179810,189264,192901,231507: 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.*
file: 165640: lib/views-plugin.*
+file: 339791: lib/syntax-plugin.*
+file: 297221: lib/acl-plugin.*
+file: 297221: lib/statechange-plugin.*
file: 167478,160589: setup/setup
file: 156120,159037,170321,170328,170556,170558,170816,185765: winsync/PassSync.msi
file: 167761: java/jars/ds71.jar
Index: redhat-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Attic/redhat-patch.inf,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- redhat-patch.inf 26 Jul 2006 06:17:59 -0000 1.1.2.16
+++ redhat-patch.inf 7 Jan 2008 22:32:16 -0000 1.1.2.17
@@ -49,15 +49,18 @@
base: /share/builds/products/server/directry/7.1
file: 147585: plugins/slapd/slapi/examples/testpreop.c
-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: 164834,165641,166229,173687,175063,202890,247725,297221: bin/slapd/server/ns-slapd
+file: 155276,164834,164843,165641,166229,173687,175063,179135,179137,202890,247725,297221: 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,175063,175897,179135,179137,179810,189264,192901: lib/libback-ldbm.*
+file: 155276,164843,165641,165827,165862,166012,175063,175897,179135,179137,179810,189264,192901,231507: 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.*
file: 165640: lib/views-plugin.*
+file: 339791: lib/syntax-plugin.*
+file: 297221: lib/acl-plugin.*
+file: 297221: lib/statechange-plugin.*
file: 167478,160589: setup/setup
file: 156120,159037,170321,170328,170556,170558,170816,185765: winsync/PassSync.msi
file: 167761: java/jars/ds71.jar
16 years, 4 months
[Fedora-directory-commits] mod_nss nss_engine_vars.c,1.10,1.11
by Doctor Conrad
Author: rcritten
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2854
Modified Files:
nss_engine_vars.c
Log Message:
Resolves BZ 248722
See if the certificate has a version before trying to decode it into a
CGI variable.
Index: nss_engine_vars.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_vars.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nss_engine_vars.c 18 Oct 2007 18:26:21 -0000 1.10
+++ nss_engine_vars.c 3 Jan 2008 21:35:28 -0000 1.11
@@ -336,8 +336,13 @@
resdup = TRUE;
if (strcEQ(var, "M_VERSION")) {
- result = apr_psprintf(p, "%lu", DER_GetInteger(&xs->version)+1);
- resdup = FALSE;
+ if (xs->version.data != NULL) {
+ result = apr_psprintf(p, "%lu", DER_GetInteger(&xs->version)+1);
+ resdup = FALSE;
+ } else {
+ result = apr_pstrdup(p, "UNKNOWN");
+ resdup = FALSE;
+ }
}
else if (strcEQ(var, "M_SERIAL")) {
result = apr_psprintf(p, "%lu", DER_GetInteger(&xs->serialNumber));
16 years, 4 months