rpms/nfs-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Only try to create nfsnobody if the uid/gid are not found (bz 1488897)

Browse Source 
Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
Zbigniew Jedrzejewski-Szmek 2018-05-15 14:26:09 -04:00 committed by Steve Dickson
parent e2170b5355
commit b079c3ee75
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nfs-utils.spec
View File

@ -2,11 +2,11 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
Name: nfs-utils Name: nfs-utils
URL: http://linux-nfs.org/ URL: http://linux-nfs.org/
Version: 2.3.1 Version: 2.3.1
Release: 8.rc1%{?dist} Release: 9.rc1%{?dist}
Epoch: 1 Epoch: 1
# group all 32bit related archs # group all 32bit related archs
%define all_32bit_archs i386 i486 i586 i686 athlon ppc sparcv9 %global all_32bit_archs i386 i486 i586 i686 athlon ppc sparcv9
Source0: https://www.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz Source0: https://www.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz
Source1: id_resolver.conf Source1: id_resolver.conf
@ -52,7 +52,7 @@ BuildRequires: krb5-devel, libmount-devel
BuildRequires: sqlite-devel BuildRequires: sqlite-devel
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: systemd BuildRequires: systemd
BuildRequires: rpcgen #BuildRequires: rpcgen
Requires(pre): shadow-utils >= 4.0.3-25 Requires(pre): shadow-utils >= 4.0.3-25
Requires(pre): util-linux Requires(pre): util-linux
Requires(pre): coreutils Requires(pre): coreutils
@ -108,7 +108,7 @@ find -name \*.py -exec sed -r -i '1s|^#!\s*/usr/bin.*python.*|#!%{__python3}|' {
%build %build
sh -x autogen.sh sh -x autogen.sh
%define _statdpath /var/lib/nfs/statd %global _statdpath /var/lib/nfs/statd
%configure \ %configure \
CFLAGS="%{build_cflags} -D_FILE_OFFSET_BITS=64" \ CFLAGS="%{build_cflags} -D_FILE_OFFSET_BITS=64" \
LDFLAGS="%{build_ldflags}" \ LDFLAGS="%{build_ldflags}" \
@ -123,7 +123,7 @@ sh -x autogen.sh
%make_build all %make_build all
%install %install
%define _pkgdir %{_prefix}/lib/systemd %global _pkgdir %{_prefix}/lib/systemd
rm -rf $RPM_BUILD_ROOT/* rm -rf $RPM_BUILD_ROOT/*
@ -184,7 +184,7 @@ for x in gssd idmapd ; do
fi fi
done done
%define rpcuser_uid 29 %global rpcuser_uid 29
# Create rpcuser gid as long as it does not already exist # Create rpcuser gid as long as it does not already exist
cat /etc/group | cut -d':' -f 1 | grep --quiet rpcuser 2>/dev/null cat /etc/group | cut -d':' -f 1 | grep --quiet rpcuser 2>/dev/null
if [ "$?" -eq 1 ]; then if [ "$?" -eq 1 ]; then
@ -203,24 +203,23 @@ else
fi fi
# Using the 16-bit value of -2 for the nfsnobody uid and gid # Using the 16-bit value of -2 for the nfsnobody uid and gid
%define nfsnobody_uid 65534 %global nfsnobody_uid 65534
# Nowadays 'nobody/65534' user/group are included in setup rpm. But on
# systems installed previously, nobody/99 might be present, with user
# 65534 missing. Let's create nfsnobody/65534 in that case.
# Create nfsnobody gid as long as it does not already exist # Create nfsnobody gid as long as it does not already exist
cat /etc/group | cut -d':' -f 1 | grep --quiet nfsnobody 2>/dev/null cat /etc/group | cut -d':' -f 3 | grep --quiet %{nfsnobody_uid} 2>/dev/null
if [ "$?" -eq 1 ]; then if [ "$?" -eq 1 ]; then
/usr/sbin/groupadd -g %{nfsnobody_uid} nfsnobody >/dev/null 2>&1 || : /usr/sbin/groupadd -g %{nfsnobody_uid} nfsnobody >/dev/null 2>&1 || :
else
/usr/sbin/groupmod -g %{nfsnobody_uid} nfsnobody >/dev/null 2>&1 || :
fi fi
# Create nfsnobody uid as long as it does not already exist. # Create nfsnobody uid as long as it does not already exist.
cat /etc/passwd | cut -d':' -f 1 | grep --quiet nfsnobody 2>/dev/null cat /etc/passwd | cut -d':' -f 3 | grep --quiet %{nfsnobody_uid} 2>/dev/null
if [ $? -eq 1 ]; then if [ $? -eq 1 ]; then
/usr/sbin/useradd -l -c "Anonymous NFS User" -r -g %{nfsnobody_uid} \ /usr/sbin/useradd -l -c "Anonymous NFS User" -r -g %{nfsnobody_uid} \
-s /sbin/nologin -u %{nfsnobody_uid} -d /var/lib/nfs nfsnobody >/dev/null 2>&1 || : -s /sbin/nologin -u %{nfsnobody_uid} -d /var/lib/nfs nfsnobody >/dev/null 2>&1 || :
else
/usr/sbin/usermod -u %{nfsnobody_uid} -g %{nfsnobody_uid} nfsnobody >/dev/null 2>&1 || :
fi fi
%post %post
@ -311,6 +310,9 @@ fi
%{_libdir}/libnfsidmap.so %{_libdir}/libnfsidmap.so
%changelog %changelog
* Tue May 15 2018 Zbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl> 2.3.1-9.rc1
- Only try to create nfsnobody if the uid/gid are not found (bz 1488897)
* Thu May 3 2018 Steve Dickson <steved@redhat.com> 2.3.1-8.rc1 * Thu May 3 2018 Steve Dickson <steved@redhat.com> 2.3.1-8.rc1
- nfsd: Set default minor versions (bz 1570066) - nfsd: Set default minor versions (bz 1570066)