From 5c7f501f3772c279d1360a0b0c8b23465bbc42f59c3055e40773b22eca699909 Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <null@suse.de>
Date: Tue, 20 Nov 2012 09:46:06 +0000
Subject: [PATCH] Accepting request 142025 from home:dimstar:branches:network

- Fix useradd invocation: -o is useless without -u and newer
  versions of pwdutils/shadowutils fail on this now.

Error masked by7 || :

OBS-URL: https://build.opensuse.org/request/show/142025
OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=47
---
 vsftpd.changes | 6 ++++++
 vsftpd.spec    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/vsftpd.changes b/vsftpd.changes
index 3da391b..29dfa6e 100644
--- a/vsftpd.changes
+++ b/vsftpd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov 20 09:21:17 UTC 2012 - dimstar@opensuse.org
+
+- Fix useradd invocation: -o is useless without -u and newer
+  versions of pwdutils/shadowutils fail on this now.
+
 -------------------------------------------------------------------
 Mon Oct 22 13:38:57 UTC 2012 - mvyskocil@suse.com
 
diff --git a/vsftpd.spec b/vsftpd.spec
index 00c183c..72cc934 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -112,7 +112,7 @@ install -D -m 0644 %SOURCE7 %{buildroot}/%{_unitdir}/%{name}.service
 %endif
 
 %pre
-/usr/sbin/useradd -r -o -g nogroup -s /bin/false -c "Secure FTP User" -d /var/lib/empty ftpsecure 2> /dev/null || :
+/usr/sbin/useradd -r -g nogroup -s /bin/false -c "Secure FTP User" -d /var/lib/empty ftpsecure 2> /dev/null || :
 %if 0%{?suse_version} > 1140
 %service_add_pre %{name}.service
 %endif