emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* libmisc/copydir.c: Avoid conflict with glibc. Rename error to

Browse Source 
error_acl.
This commit is contained in:
nekral-guest 2011-11-11 11:59:21 +00:00
parent 61ba4bf46e
commit 3bb7c43694
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2011-11-11 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/copydir.c: Avoid conflict with glibc. Rename error to
error_acl.
2011-11-11 Nicolas François <nicolas.francois@centraliens.net> 2011-11-11 Nicolas François <nicolas.francois@centraliens.net>
* man/newusers.8.xml: Document the optional file argument. * man/newusers.8.xml: Document the optional file argument.

6
libmisc/copydir.c
View File

@ -174,9 +174,9 @@ int reset_selinux_file_context (void)
#if defined(WITH_ACL) || defined(WITH_ATTR) #if defined(WITH_ACL) || defined(WITH_ATTR)
/* /*
* error - format the error messages for the ACL and EQ libraries. * error_acl - format the error messages for the ACL and EQ libraries.
*/ */
static void error (struct error_context *ctx, const char *fmt, ...) static void error_acl (struct error_context *ctx, const char *fmt, ...)
{ {
va_list ap; va_list ap;
@ -190,7 +190,7 @@ static void error (struct error_context *ctx, const char *fmt, ...)
} }
static struct error_context ctx = { static struct error_context ctx = {
error error_acl
}; };
#endif /* WITH_ACL || WITH_ATTR */ #endif /* WITH_ACL || WITH_ATTR */