From a028bdc88a9fca7a274fe9a2f3dc7d824aedd8bc Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Mon, 9 Dec 2002 10:53:59 +0000 Subject: [PATCH] Fixed the warn(ACL won't be dumped) message. --- CHANGES | 6 +++++- THANKS | 3 ++- dump/traverse.c | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 9a80f92..dc98de1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -$Id: CHANGES,v 1.201 2002/11/28 08:54:00 stelian Exp $ +$Id: CHANGES,v 1.202 2002/12/09 10:53:59 stelian Exp $ Changes between versions 0.4b32 and 0.4b33 (released ?????????????????) ======================================================================= @@ -11,6 +11,10 @@ Changes between versions 0.4b32 and 0.4b33 (released ?????????????????) Thanks to Dark Force for reporting this bug and providing test cases. +3. Fixed the "ACL won't be dumped" warning message (which showed + an extra, unrelated error message). Thanks to Dragan Krnic + for reporting this bug. + Changes between versions 0.4b31 and 0.4b32 (released November 15, 2002) ======================================================================= diff --git a/THANKS b/THANKS index 3ed5f87..a1b8c09 100644 --- a/THANKS +++ b/THANKS @@ -1,4 +1,4 @@ -$Id: THANKS,v 1.70 2002/11/15 09:49:39 stelian Exp $ +$Id: THANKS,v 1.71 2002/12/09 10:53:59 stelian Exp $ Dump and restore were written by the people of the CSRG at the University of California, Berkeley. @@ -58,6 +58,7 @@ Richard Johnson Richard.Johnson3@ey.com Richard Jones rich@annexia.org Charles Karney karney@users.sourceforge.net Henry Katz hkatz@hkatz.dialup.access.net +Dragan Krnic dkrnic@lycos.com Klaus Kudielka kkudielk@cacofonix.nt.tuwien.ac.at Thorsten Kukuk kukuk@suse.de Florian La Roche florian@jurix.jura.uni-sb.de diff --git a/dump/traverse.c b/dump/traverse.c index a51e362..2613b5e 100644 --- a/dump/traverse.c +++ b/dump/traverse.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: traverse.c,v 1.51 2002/09/02 12:20:26 stelian Exp $"; + "$Id: traverse.c,v 1.52 2002/12/09 10:53:59 stelian Exp $"; #endif /* not lint */ #include @@ -825,7 +825,7 @@ dumpino(struct dinode *dp, dump_ino_t ino, int metaonly) nbi.di_uid = (((int32_t)dp->di_uidhigh) << 16) | dp->di_uid; nbi.di_gid = (((int32_t)dp->di_gidhigh) << 16) | dp->di_gid; if (dp->di_file_acl) - warn("ACLs in inode #%ld won't be dumped", (long)ino); + msg("ACLs in inode #%ld won't be dumped\n", (long)ino); memmove(&spcl.c_dinode, &nbi, sizeof(nbi)); #else /* __linux__ */ spcl.c_dinode = *dp; @@ -1083,7 +1083,7 @@ dumpdirino(struct dinode *dp, dump_ino_t ino) nbi.di_uid = (((int32_t)dp->di_uidhigh) << 16) | dp->di_uid; nbi.di_gid = (((int32_t)dp->di_gidhigh) << 16) | dp->di_gid; if (dp->di_file_acl) - warn("ACLs in inode #%ld won't be dumped", (long)ino); + msg("ACLs in inode #%ld won't be dumped\n", (long)ino); memmove(&spcl.c_dinode, &nbi, sizeof(nbi)); #else /* __linux__ */ spcl.c_dinode = *dp; -- 2.39.2