CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-17 17:18:45 +02:00
Code Issues Projects Releases Wiki Activity

accommodate older SELinux which lacks matchpathcon_init_prefix

Browse Source 
* m4/jm-macros.m4: Check for matchpathcon_init_prefix.
* src/install.c [!HAVE_MATCHPATHCON_INIT_PREFIX]
(matchpathcon_init_prefix): Define away.
* gl/lib/se-selinux.in.h (matchpathcon_init_prefix): Define.
Reported by Ilya N. Golubev in
<http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/13686>.
This commit is contained in:
Jim Meyering
2008-06-02 21:17:57 +02:00
parent 77b1bfc85c
commit 0647f3eb5a
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
THANKS
View File

@@ -220,6 +220,7 @@ Ian Jackson ijackson@chiark.greenend.org.uk
Ian Lance Taylor ian@cygnus.com
Ian Turner vectro@pipeline.com
Iida Yosiaki iida@gnu.org
Ilya N. Golubev gin@mo.msk.ru
Ingo Saitz ingo@debian.org
Ivo Timmermans ivo@debian.org
James james@albion.glarp.com

7
gl/lib/se-selinux.in.h
View File

@@ -17,7 +17,8 @@ typedef unsigned short security_class_t;
# define security_context_t char*
# define is_selinux_enabled() 0
static inline int getcon (security_context_t *con) { errno = ENOTSUP; return -1; }
static inline int getcon (security_context_t *con)
{ errno = ENOTSUP; return -1; }
static inline void freecon (security_context_t con) {}
@@ -28,7 +29,9 @@ static inline int setfscreatecon (security_context_t con)
static inline int matchpathcon (char const *s, mode_t m,
security_context_t *con)
{ errno = ENOTSUP; return -1; }
static inline int matchpathcon_init_prefix (const char *path,
const char *prefix)
{ errno = ENOTSUP; return -1; }
static inline int getfilecon (char const *s, security_context_t *con)
{ errno = ENOTSUP; return -1; }
static inline int lgetfilecon (char const *s, security_context_t *con)

5
m4/jm-macros.m4
View File

@@ -2,7 +2,7 @@
dnl Misc type-related macros for coreutils.
# Copyright (C) 1998, 2000-2007 Free Software Foundation, Inc.
# Copyright (C) 1998, 2000-2008 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -46,6 +46,9 @@ AC_DEFUN([coreutils_MACROS],
# used by shred
AC_CHECK_FUNCS_ONCE(directio)
# Used by install.c.
AC_CHECK_FUNCS_ONCE([matchpathcon_init_prefix])
AC_CHECK_FUNCS_ONCE( \
endgrent \
endpwent \

4
src/install.c
View File

@@ -66,6 +66,10 @@ static bool use_default_selinux_context = true;
# define lchown(name, uid, gid) chown (name, uid, gid)
#endif
#if ! HAVE_MATCHPATHCON_INIT_PREFIX
# define matchpathcon_init_prefix(a, p) /* empty */
#endif
/* Initial number of entries in each hash table entry's table of inodes. */
#define INITIAL_HASH_MODULE 100