From 1db68add042814a9cfe3f50d38b948c0920bc4e9 Mon Sep 17 00:00:00 2001 From: Peter Vrabec Date: Apr 10 2007 10:14:19 +0000 Subject: fix 235641: useradd dumps core when build without WITH_SELINUX --- diff --git a/shadow-4.0.16-lOption.patch b/shadow-4.0.16-lOption.patch index b9407db..1202cc5 100644 --- a/shadow-4.0.16-lOption.patch +++ b/shadow-4.0.16-lOption.patch @@ -16,7 +16,7 @@ Gflg = 0, /* secondary group set for new account */ kflg = 0, /* specify a directory to fill new user directory */ mflg = 0, /* create user's home directory if it doesn't exist */ -+ lflg = 0; /* do not add user to lastlog database file */ ++ lflg = 0, /* do not add user to lastlog database file */ Mflg = 0, /* do NOT create user's home directory no matter what */ nflg = 0, /* do NOT create a group having the same name as the user */ oflg = 0, /* permit non-unique user ID to be specified with -u */ diff --git a/shadow-4.0.17-useradd.patch b/shadow-4.0.17-useradd.patch index 91fddad..a800bea 100644 --- a/shadow-4.0.17-useradd.patch +++ b/shadow-4.0.17-useradd.patch @@ -213,7 +213,7 @@ +#ifdef WITH_SELINUX + getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mlMnrop:s:u:Z:", +#else -+ getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mlMnrop:s:u", ++ getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mlMnrop:s:u:", +#endif long_options, NULL)) != -1) { switch (c) { diff --git a/shadow-utils.spec b/shadow-utils.spec index fa07c6c..cd88bd8 100644 --- a/shadow-utils.spec +++ b/shadow-utils.spec @@ -5,7 +5,7 @@ Summary: Utilities for managing accounts and shadow password files Name: shadow-utils Version: 4.0.18.1 -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 2 URL: http://shadow.pld.org.pl/ Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2 @@ -223,6 +223,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/*/man8/faillog.8* %changelog +* Tue Apr 10 2007 Peter Vrabec 2:4.0.18.1-13 +- fix useradd dump core when build without WITH_SELINUX (#235641) + * Mon Mar 26 2007 Peter Vrabec 2:4.0.18.1-12 - create user's mailbox file by default (#231311)