rpms/shadow-utils/devel shadow-4.0.11.1-notOverwriteHome.patch, NONE, 1.1 shadow-utils.spec, 1.51, 1.52

[fedora-cvs-commits at redhat.com]

Author: pvrabec

Update of /cvs/dist/rpms/shadow-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6088

Modified Files:
	shadow-utils.spec 
Added Files:
	shadow-4.0.11.1-notOverwriteHome.patch 
Log Message:
- do not copy files from skel directory if home directory
  already exist (#89591,#80242)


shadow-4.0.11.1-notOverwriteHome.patch:
 useradd.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE shadow-4.0.11.1-notOverwriteHome.patch ---
--- shadow-4.0.11.1/src/useradd.c.notOverwriteHome	2005-08-08 10:38:14.000000000 +0000
+++ shadow-4.0.11.1/src/useradd.c	2005-08-08 10:39:34.000000000 +0000
@@ -1821,7 +1821,13 @@
 
 	if (mflg) {
 		create_home ();
-		copy_tree (def_template, user_home, user_id, user_gid);
+		if(home_added)
+			copy_tree (def_template, user_home, user_id, user_gid);
+		else
+			fprintf (stderr,
+                         _
+                         ("%s: warning: The home directory already exists. Not copying any file into it.\n"),
+                         Prog);
 	}
         /* Warning removed to protect the innocent. */
         /*


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- shadow-utils.spec	5 Aug 2005 11:48:41 -0000	1.51
+++ shadow-utils.spec	8 Aug 2005 08:46:33 -0000	1.52
@@ -7,7 +7,7 @@
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
 Version: 4.0.11.1
-Release: 1
+Release: 2
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
@@ -22,6 +22,7 @@
 Patch6: shadow-4.0.11.1-uniqueGroup.patch
 Patch7: shadow-4.0.11.1-chageList.patch
 Patch8: shadow-4.0.11.1-isSelinuxEnabled.patch
+Patch9: shadow-4.0.11.1-notOverwriteHome.patch
 
 License: BSD
 Group: System Environment/Base
@@ -53,6 +54,7 @@
 %patch6 -p1 -b .uniqueGroup
 %patch7 -p1 -b .chageList
 %patch8 -p1 -b .isSelinuxEnabled
+%patch9 -p1 -b .notOverwriteHome
 
 rm po/*.gmo
 rm po/stamp-po
@@ -231,6 +233,10 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Mon Aug 08 2005 Peter Vrabec <pvrabec at redhat.com> 2:4.0.11.1-2
+- do not copy files from skel directory if home directory 
+  already exist (#89591,#80242)
+
 * Fri Aug 05 2005 Peter Vrabec <pvrabec at redhat.com> 2:4.0.11.1-1
 - upgrade