Fixed the warn(ACL won't be dumped) message.

diff --git a/CHANGES b/CHANGES
index 9a80f923f4b36367168be9009744c85eb1aef46d..dc98de196e49a6a4baae4984478f7f45c5ea56a4 100644 (file)
--- 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 ?????????????????)
 =======================================================================
 
 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 <daq4th@users.sourceforge.net> for
        reporting this bug and providing test cases.
 
        Thanks to Dark Force <daq4th@users.sourceforge.net> 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
+       <dkrnic@lycos.com> for reporting this bug.
+

 Changes between versions 0.4b31 and 0.4b32 (released November 15, 2002)
 =======================================================================
 
 Changes between versions 0.4b31 and 0.4b32 (released November 15, 2002)
 =======================================================================
 

diff --git a/THANKS b/THANKS
index 3ed5f87a02ce1eab5c526117fac7ac901b3ebe4c..a1b8c093091b4aafd224868e7780163e3a77d8d5 100644 (file)
--- 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.
 
 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
 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
 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 a51e36265d9a1fdf189bfb8ff59d0dc73aac7ebc..2613b5ef5d68b54c1544bfd89ab29359942230ce 100644 (file)
--- a/dump/traverse.c
+++ b/dump/traverse.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #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 <config.h>
 #endif /* not lint */
 
 #include <config.h>


@@ -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)
        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;
        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)
        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;
        memmove(&spcl.c_dinode, &nbi, sizeof(nbi));
 #else  /* __linux__ */
        spcl.c_dinode = *dp;