-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This patch looks good to me. acked. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk5D6RYACgkQrlYvE4MpobO9kACeJbGgxW/By+f2OWBisA/6uq4D JKUAn0j75rQgjwLJlqJtpZlEOAPlX/t0 =PnQB -----END PGP SIGNATURE-----
>From 2475e361179a7c61617b6bd1dff62604eb8d1e71 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@xxxxxxxxxx>
Date: Sun, 10 Jul 2011 17:35:24 +0200
Subject: [PATCH 30/96] policycoreutils: setfiles: make the restore function
exclude() non-static
Stuff wants to use it later. Make it non-static.
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
---
policycoreutils/setfiles/restore.c | 3 +--
policycoreutils/setfiles/restore.h | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/policycoreutils/setfiles/restore.c b/policycoreutils/setfiles/restore.c
index f3f2339..7d9eaa7 100644
--- a/policycoreutils/setfiles/restore.c
+++ b/policycoreutils/setfiles/restore.c
@@ -32,7 +32,6 @@ struct edir {
static file_spec_t *fl_head;
-static int exclude(const char *file);
static int filespec_add(ino_t ino, const security_context_t con, const char *file);
static int only_changed_user(const char *a, const char *b);
struct restore_opts *r_opts = NULL;
@@ -439,7 +438,7 @@ int process_one_realpath(char *name, int recurse)
}
}
-static int exclude(const char *file)
+int exclude(const char *file)
{
int i = 0;
for (i = 0; i < excludeCtr; i++) {
diff --git a/policycoreutils/setfiles/restore.h b/policycoreutils/setfiles/restore.h
index 00743a0..ac27222 100644
--- a/policycoreutils/setfiles/restore.h
+++ b/policycoreutils/setfiles/restore.h
@@ -45,6 +45,7 @@ struct restore_opts {
void restore_init(struct restore_opts *opts);
void restore_finish();
int add_exclude(const char *directory);
+int exclude(const char *path);
void remove_exclude(const char *directory);
int process_one_realpath(char *name, int recurse);
int process_glob(char *name, int recurse);
--
1.7.6
Attachment:
0030-policycoreutils-setfiles-make-the-restore-function-e.patch.sig
Description: PGP signature
