Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[BZ #5778]
	* sysdeps/unix/sysv/linux/pathconf.h: Declare
	__statfs_chown_restricted.
	* sysdeps/unix/sysv/linux/fpathconf.c: Call __statfs_chown_restricted
	for _PC_CHOWN_RESTRICTED.
	* sysdeps/unix/sysv/linux/pathconf.c: Likewise.
	Implement __statfs_chown_restricted.
	* sysdeps/unix/sysv/linux/bits/posix_opt.h: Change
	_POSIX_CHOWN_RESTRICTED value to zero.

2008-02-26  Harsha Jagasia  <harsha.jagasia@amd.com>
  • Loading branch information
Ulrich Drepper committed Mar 8, 2008
1 parent 78c2bf0 commit 443db17
Show file tree
Hide file tree
Showing 9 changed files with 91 additions and 15 deletions.
12 changes: 11 additions & 1 deletion ChangeLog
@@ -1,8 +1,18 @@
2008-03-07 Ulrich Drepper <drepper@redhat.com>

[BZ #5778]
* sysdeps/unix/sysv/linux/pathconf.h: Declare
__statfs_chown_restricted.
* sysdeps/unix/sysv/linux/fpathconf.c: Call __statfs_chown_restricted
for _PC_CHOWN_RESTRICTED.
* sysdeps/unix/sysv/linux/pathconf.c: Likewise.
Implement __statfs_chown_restricted.
* sysdeps/unix/sysv/linux/bits/posix_opt.h: Change
_POSIX_CHOWN_RESTRICTED value to zero.

* sysdeps/x86_64/rtld-memset.c: New file.

2008-2-26 Harsha Jagasia <harsha.jagasia@amd.com>
2008-02-26 Harsha Jagasia <harsha.jagasia@amd.com>

* sysdeps/x86_64/cacheinfo.c (NOT_USED_RIGHT_NOW): Remove ifdef guards.

Expand Down
5 changes: 5 additions & 0 deletions localedata/ChangeLog
@@ -1,3 +1,8 @@
2008-03-07 Ulrich Drepper <drepper@redhat.com>

[BZ #5777]
* locales/es_CR: Define am/pm format.

2008-03-04 Ulrich Drepper <drepper@redhat.com>

* SUPPORTED (SUPPORTED-LOCALES): Add shs_CA.UTF-8.
Expand Down
4 changes: 2 additions & 2 deletions localedata/locales/es_CR
Expand Up @@ -108,8 +108,8 @@ mon "<U0065><U006E><U0065><U0072><U006F>";/
d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
t_fmt "<U0025><U0054>"
am_pm "";""
t_fmt_ampm ""
am_pm "<U0061><U002E><U006D><U002E>";"<U0070><U002E><U006D><U002E>"
t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070>"
date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
<U0025><U005A><U0020><U0025><U0059>"
Expand Down
6 changes: 6 additions & 0 deletions nptl/ChangeLog
@@ -1,3 +1,9 @@
2008-03-07 Ulrich Drepper <drepper@redhat.com>

[BZ #5778]
* sysdeps/unix/sysv/linux/bits/posix_opt.h: Change
_POSIX_CHOWN_RESTRICTED value to zero.

2008-01-31 Roland McGrath <roland@redhat.com>

* Makefile (omit-deps): Variable removed.
Expand Down
6 changes: 3 additions & 3 deletions nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
@@ -1,5 +1,5 @@
/* Define POSIX options for Linux.
Copyright (C) 1996-2004, 2006 Free Software Foundation, Inc.
Copyright (C) 1996-2004, 2006, 2008 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
Expand Down Expand Up @@ -47,8 +47,8 @@
/* Setting of memory protections is supported. */
#define _POSIX_MEMORY_PROTECTION 200112L

/* Only root can change owner of file. */
#define _POSIX_CHOWN_RESTRICTED 1
/* Some filesystems allow all users to change file ownership. */
#define _POSIX_CHOWN_RESTRICTED 0

/* `c_cc' member of 'struct termios' structure can be disabled by
using the value _POSIX_VDISABLE. */
Expand Down
7 changes: 4 additions & 3 deletions sysdeps/unix/sysv/linux/bits/posix_opt.h
@@ -1,5 +1,6 @@
/* Define POSIX options for Linux.
Copyright (C) 1996,1997,1999,2000,2002,2003 Free Software Foundation, Inc.
Copyright (C) 1996,1997,1999,2000,2002,2003,2008
Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
Expand Down Expand Up @@ -51,8 +52,8 @@
/* Setting of memory protections is supported. */
#define _POSIX_MEMORY_PROTECTION 200112L

/* Only root can change owner of file. */
#define _POSIX_CHOWN_RESTRICTED 1
/* Some filesystems allow all users to change file ownership. */
#define _POSIX_CHOWN_RESTRICTED 0

/* `c_cc' member of 'struct termios' structure can be disabled by
using the value _POSIX_VDISABLE. */
Expand Down
5 changes: 4 additions & 1 deletion sysdeps/unix/sysv/linux/fpathconf.c
@@ -1,5 +1,5 @@
/* Get file-specific information about descriptor FD. Linux version.
Copyright (C) 1991,1995,1996,1998-2002,2003 Free Software Foundation, Inc.
Copyright (C) 1991,1995,1996,1998-2003,2008 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
Expand Down Expand Up @@ -45,6 +45,9 @@ __fpathconf (fd, name)
case _PC_2_SYMLINKS:
return __statfs_symlinks (__fstatfs (fd, &fsbuf), &fsbuf);

case _PC_CHOWN_RESTRICTED:
return __statfs_chown_restricted (__fstatfs (fd, &fsbuf), &fsbuf);

default:
return posix_fpathconf (fd, name);
}
Expand Down
48 changes: 47 additions & 1 deletion sysdeps/unix/sysv/linux/pathconf.c
@@ -1,5 +1,5 @@
/* Get file-specific information about a file. Linux version.
Copyright (C) 1991,1995,1996,1998-2002,2003 Free Software Foundation, Inc.
Copyright (C) 1991,1995,1996,1998-2003,2008 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
Expand All @@ -19,8 +19,10 @@

#include <unistd.h>
#include <errno.h>

#include "pathconf.h"
#include "linux_fsinfo.h"
#include <not-cancel.h>

static long int posix_pathconf (const char *file, int name);

Expand All @@ -46,6 +48,9 @@ __pathconf (const char *file, int name)
case _PC_2_SYMLINKS:
return __statfs_symlinks (__statfs (file, &fsbuf), &fsbuf);

case _PC_CHOWN_RESTRICTED:
return __statfs_chown_restricted (__statfs (file, &fsbuf), &fsbuf);

default:
return posix_pathconf (file, name);
}
Expand Down Expand Up @@ -179,3 +184,44 @@ __statfs_symlinks (int result, const struct statfs *fsbuf)
return 1;
}
}


/* Used like: return __statfs_chown_restricted (__statfs (name, &buf), &buf);*/
long int
__statfs_chown_restricted (int result, const struct statfs *fsbuf)
{
if (result < 0)
{
if (errno == ENOSYS)
/* Not possible, return the default value. */
return 1;

/* Some error occured. */
return -1;
}

int fd;
long int retval = 1;
switch (fsbuf->f_type)
{
case XFS_SUPER_MAGIC:
/* Read the value from /proc/sys/fs/xfs/restrict_chown. If we cannot
read it default to assume the restriction is in place. */
fd = open_not_cancel_2 ("/proc/sys/fs/xfs/restrict_chown", O_RDONLY);
if (fd != -1)
{
char buf[2];
if (TEMP_FAILURE_RETRY (read_not_cancel (fd, buf, 2)) == 2
&& buf[0] >= '0' && buf[0] <= '1')
retval = buf[0] - '0';

close_not_cancel_no_status (fd);
}
break;

default:
break;
}

return retval;
}
13 changes: 9 additions & 4 deletions sysdeps/unix/sysv/linux/pathconf.h
@@ -1,5 +1,5 @@
/* Common parts of Linux implementation of pathconf and fpathconf.
Copyright (C) 1991,1995,1996,1998-2002,2003 Free Software Foundation, Inc.
Copyright (C) 1991,1995,1996,1998-2003,2008 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
Expand All @@ -22,13 +22,18 @@
#include <sys/statfs.h>


/* Used like: return statfs_link_max (__statfs (name, &buf), &buf); */
/* Used like: return __statfs_link_max (__statfs (name, &buf), &buf); */
extern long int __statfs_link_max (int result, const struct statfs *fsbuf);


/* Used like: return statfs_filesize_max (__statfs (name, &buf), &buf); */
/* Used like: return __statfs_filesize_max (__statfs (name, &buf), &buf); */
extern long int __statfs_filesize_max (int result, const struct statfs *fsbuf);


/* Used like: return statfs_link_max (__statfs (name, &buf), &buf); */
/* Used like: return __statfs_link_max (__statfs (name, &buf), &buf); */
extern long int __statfs_symlinks (int result, const struct statfs *fsbuf);


/* Used like: return __statfs_chown_restricted (__statfs (name, &buf), &buf);*/
extern long int __statfs_chown_restricted (int result,
const struct statfs *fsbuf);

0 comments on commit 443db17

Please sign in to comment.