Don't attempt to extract EA in 'restore -N' mode.

diff --git a/CHANGES b/CHANGES
index e41a1bee85fd5a430f258b2e3e3d78357f79e1cb..9d72214df7d01d16999aa84d882815938cc0e21c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.306 2009/12/03 12:46:29 stelian Exp $
+$Id: CHANGES,v 1.307 2010/03/08 10:40:52 stelian Exp $

 
 Changes between versions 0.4b42 and 0.4b43 (released ?????????????)
 ===================================================================
 
 Changes between versions 0.4b42 and 0.4b43 (released ?????????????)
 ===================================================================


@@ -21,6 +21,10 @@ Changes between versions 0.4b42 and 0.4b43 (released ?????????????)
 4.     Fix restoration of extended attributes of fifos and device nodes.
        Thanks to Igor Zhbanov <izh1979@gmail.com> for the bug report.
 
 4.     Fix restoration of extended attributes of fifos and device nodes.
        Thanks to Igor Zhbanov <izh1979@gmail.com> for the bug report.
 

+5.     Don't attempt to set extended attributes on files that were not
+       extracted in 'restore -N' mode. Thanks to Jan Görig
+       <jgorig@users.sourceforge.net> for the patch.
+

 Changes between versions 0.4b41 and 0.4b42 (released June 18, 2009)
 ===================================================================
 
 Changes between versions 0.4b41 and 0.4b42 (released June 18, 2009)
 ===================================================================
 

diff --git a/restore/xattr.c b/restore/xattr.c
index 4d24a6f281c4473226b225e539fa1be76c2d62ba..ccc01c14c21e74177ce4b4af95cdf4f227b79991 100644 (file)
--- a/restore/xattr.c
+++ b/restore/xattr.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: xattr.c,v 1.5 2008/06/09 13:25:40 stelian Exp $";
+       "$Id: xattr.c,v 1.6 2010/03/08 10:40:52 stelian Exp $";

 #endif /* not lint */
 
 #include <config.h>
 #endif /* not lint */
 
 #include <config.h>


@@ -423,7 +423,10 @@ xattr_cb_set(char *name, char *value, int valuelen, int isSELinux, void *private
 {
        char *path = (char *)private;
        int err;
 {
        char *path = (char *)private;
        int err;

-       
+
+       if (Nflag)
+               return GOOD;
+

        isSELinux;
 #ifdef TRANSSELINUX                    /*GAN6May06 SELinux MLS */
        if (isSELinux)
        isSELinux;
 #ifdef TRANSSELINUX                    /*GAN6May06 SELinux MLS */
        if (isSELinux)