Author: aurel32
Date: 2007-04-21 18:52:47 +0000 (Sat, 21 Apr 2007)
New Revision: 2104
Modified:
glibc-package/branches/glibc-branch-etch/debian/patches/any/submitted-nis-netgrp.diff
glibc-package/branches/glibc-branch-etch/debian/patches/series
Log:
Fix bad interaction between submitted-nis-netgrp.diff and
cvs-nss_nis_setnetgrent.diff
Modified:
glibc-package/branches/glibc-branch-etch/debian/patches/any/submitted-nis-netgrp.diff
===================================================================
---
glibc-package/branches/glibc-branch-etch/debian/patches/any/submitted-nis-netgrp.diff
2007-04-20 17:02:08 UTC (rev 2103)
+++
glibc-package/branches/glibc-branch-etch/debian/patches/any/submitted-nis-netgrp.diff
2007-04-21 18:52:47 UTC (rev 2104)
@@ -16,7 +16,7 @@
@@ -76,7 +76,10 @@
and the last byte is filled with NUL. So we can simply
use that buffer. */
- assert (len > 0);
+ assert (len >= 0);
- assert (malloc_usable_size (netgrp->data) >= len + 1);
+ /* Call to malloc_usable_size disabled, this breaks if applications
+ redefine malloc/free with a different implementation.
Modified: glibc-package/branches/glibc-branch-etch/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-branch-etch/debian/patches/series
2007-04-20 17:02:08 UTC (rev 2103)
+++ glibc-package/branches/glibc-branch-etch/debian/patches/series
2007-04-21 18:52:47 UTC (rev 2104)
@@ -141,7 +141,7 @@
any/cvs-futimes.diff -p0
any/cvs-getcwd_c.diff -p1
any/cvs-itoa-c.diff -p1
-cvs-nss_nis_setnetgrent.diff -p0
+any/cvs-nss_nis_setnetgrent.diff -p0
any/cvs-nfs_h.diff -p0
any/cvs-path_log.diff -p0
any/cvs-regcomp_c.diff -p1
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
