summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/copy.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 28af1bcc7..46b7b02ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-02 Jim Meyering <jim@meyering.net>
+
+ * src/copy.c (copy_reg): Initialize local "con", before calling
+ getfscreatecon, in case that function (or its inline stub) does
+ not set it.
+
2007-04-01 Paul Eggert <eggert@cs.ucla.edu>
* src/ls.c (print_horizontal): Fix bug reported by Mike Frysinger:
diff --git a/src/copy.c b/src/copy.c
index d2088ae46..81636ae7b 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -306,7 +306,7 @@ copy_reg (char const *src_name, char const *dst_name,
that is used when the destination file doesn't already exist. */
if (x->preserve_security_context && 0 <= dest_desc)
{
- security_context_t con;
+ security_context_t con = NULL;
if (getfscreatecon (&con) < 0)
{
error (0, errno, _("failed to get file system create context"));