source: clfs-sysroot/patches/shadow-4.1.4.1-sysroot_hacks-1.patch@ c6124b0

Last change on this file since c6124b0 was fc7c84a, checked in by Joe Ciccone <jciccone@…>, 15 years ago

Updated Shadow to 4.1.4.1.
  • Property mode set to 100644
File size: 68.5 KB
RevLine 
[fc7c84a]1Submitted By: Joe Ciccone <jciccone@gmail.com>
2Date: 2006-11-24
3Initial Package Version: 4.0.18.1
4 Rediffed Against 4.1.2.2 by Joe Ciccone on 2009-01-03
5 Rediffed Against 4.1.4.1 by Joe Ciccone on 2009-07-11
6Origin: Joe Ciccone
7Upstream Status: None
8Description: Changes the hardcoded /etc to the value of the --sysconfdir
9 parameter passed to configure. Allows the utilities to be run
10 as a user other then root and properly modify the passwd and group
11 files for the target system. This patch also disables the
12 calls that flushes the nscd cache. There is no point in flushing
13 the hosts cache db when it wasn't modified.
14
15diff -Naur shadow-4.1.4.1.orig/aclocal.m4 shadow-4.1.4.1/aclocal.m4
16--- shadow-4.1.4.1.orig/aclocal.m4 2009-05-22 09:55:38.000000000 -0400
17+++ shadow-4.1.4.1/aclocal.m4 2009-07-11 22:35:20.185755870 -0400
18@@ -1,4 +1,4 @@
19-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
20+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
21
22 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
23 # 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
24@@ -13,7 +13,7 @@
25
26 m4_ifndef([AC_AUTOCONF_VERSION],
27 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
28-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
29+m4_if(AC_AUTOCONF_VERSION, [2.63],,
30 [m4_warning([this file was generated for autoconf 2.63.
31 You have another version of autoconf. It may work, but is not guaranteed to.
32 If you have problems, you may need to regenerate the build system entirely.
33@@ -4122,18 +4122,6 @@
34 dynamic_linker='GNU/Linux ld.so'
35 ;;
36
37-netbsdelf*-gnu)
38- version_type=linux
39- need_lib_prefix=no
40- need_version=no
41- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
42- soname_spec='${libname}${release}${shared_ext}$major'
43- shlibpath_var=LD_LIBRARY_PATH
44- shlibpath_overrides_runpath=no
45- hardcode_into_libs=yes
46- dynamic_linker='NetBSD ld.elf_so'
47- ;;
48-
49 netbsd*)
50 version_type=sunos
51 need_lib_prefix=no
52@@ -4725,7 +4713,7 @@
53 lt_cv_deplibs_check_method=pass_all
54 ;;
55
56-netbsd* | netbsdelf*-gnu)
57+netbsd*)
58 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
59 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
60 else
61@@ -5406,7 +5394,7 @@
62 ;;
63 esac
64 ;;
65- netbsd* | netbsdelf*-gnu)
66+ netbsd*)
67 ;;
68 *qnx* | *nto*)
69 # QNX uses GNU C++, but need to define -shared option too, otherwise
70@@ -5831,9 +5819,6 @@
71 cygwin* | mingw* | cegcc*)
72 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
73 ;;
74- linux* | k*bsd*-gnu)
75- _LT_TAGVAR(link_all_deplibs, $1)=no
76- ;;
77 *)
78 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
79 ;;
80@@ -5898,9 +5883,6 @@
81 openbsd*)
82 with_gnu_ld=no
83 ;;
84- linux* | k*bsd*-gnu)
85- _LT_TAGVAR(link_all_deplibs, $1)=no
86- ;;
87 esac
88
89 _LT_TAGVAR(ld_shlibs, $1)=yes
90@@ -6083,7 +6065,7 @@
91 fi
92 ;;
93
94- netbsd* | netbsdelf*-gnu)
95+ netbsd*)
96 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
97 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
98 wlarc=
99@@ -6258,7 +6240,6 @@
100 if test "$aix_use_runtimelinking" = yes; then
101 shared_flag="$shared_flag "'${wl}-G'
102 fi
103- _LT_TAGVAR(link_all_deplibs, $1)=no
104 else
105 # not using gcc
106 if test "$host_cpu" = ia64; then
107@@ -6497,7 +6478,7 @@
108 _LT_TAGVAR(link_all_deplibs, $1)=yes
109 ;;
110
111- netbsd* | netbsdelf*-gnu)
112+ netbsd*)
113 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
114 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
115 else
116@@ -10181,7 +10162,7 @@
117 AC_SUBST($1)dnl
118 ])
119
120-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
121+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
122 #
123 # This file is free software; the Free Software Foundation
124 # gives unlimited permission to copy and/or distribute it,
125@@ -10196,7 +10177,7 @@
126 [am__api_version='1.10'
127 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
128 dnl require some minimum version. Point them to the right macro.
129-m4_if([$1], [1.10.2], [],
130+m4_if([$1], [1.10.1], [],
131 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
132 ])
133
134@@ -10210,12 +10191,12 @@
135 # AM_SET_CURRENT_AUTOMAKE_VERSION
136 # -------------------------------
137 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
138-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
139+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
140 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
141-[AM_AUTOMAKE_VERSION([1.10.2])dnl
142+[AM_AUTOMAKE_VERSION([1.10.1])dnl
143 m4_ifndef([AC_AUTOCONF_VERSION],
144 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
145-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
146+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
147
148 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
149
150@@ -10465,28 +10446,19 @@
151
152 # Generate code to set up dependency tracking. -*- Autoconf -*-
153
154-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
155+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
156 # Free Software Foundation, Inc.
157 #
158 # This file is free software; the Free Software Foundation
159 # gives unlimited permission to copy and/or distribute it,
160 # with or without modifications, as long as this notice is preserved.
161
162-#serial 4
163+#serial 3
164
165 # _AM_OUTPUT_DEPENDENCY_COMMANDS
166 # ------------------------------
167 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
168-[# Autoconf 2.62 quotes --file arguments for eval, but not when files
169-# are listed without --file. Let's play safe and only enable the eval
170-# if we detect the quoting.
171-case $CONFIG_FILES in
172-*\'*) eval set x "$CONFIG_FILES" ;;
173-*) set x $CONFIG_FILES ;;
174-esac
175-shift
176-for mf
177-do
178+[for mf in $CONFIG_FILES; do
179 # Strip MF so we end up with the name of the file.
180 mf=`echo "$mf" | sed -e 's/:.*$//'`
181 # Check whether this is an Automake generated Makefile or not.
182@@ -10847,13 +10819,13 @@
183
184 # Helper functions for option handling. -*- Autoconf -*-
185
186-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
187+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
188 #
189 # This file is free software; the Free Software Foundation
190 # gives unlimited permission to copy and/or distribute it,
191 # with or without modifications, as long as this notice is preserved.
192
193-# serial 4
194+# serial 3
195
196 # _AM_MANGLE_OPTION(NAME)
197 # -----------------------
198@@ -10870,7 +10842,7 @@
199 # ----------------------------------
200 # OPTIONS is a space-separated list of Automake options.
201 AC_DEFUN([_AM_SET_OPTIONS],
202-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
203+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
204
205 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
206 # -------------------------------------------
207diff -Naur shadow-4.1.4.1.orig/configure shadow-4.1.4.1/configure
208--- shadow-4.1.4.1.orig/configure 2009-05-22 09:55:41.000000000 -0400
209+++ shadow-4.1.4.1/configure 2009-07-11 22:35:22.129088886 -0400
210@@ -6786,7 +6786,7 @@
211 lt_cv_deplibs_check_method=pass_all
212 ;;
213
214-netbsd* | netbsdelf*-gnu)
215+netbsd*)
216 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
217 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
218 else
219@@ -9444,9 +9444,6 @@
220 openbsd*)
221 with_gnu_ld=no
222 ;;
223- linux* | k*bsd*-gnu)
224- link_all_deplibs=no
225- ;;
226 esac
227
228 ld_shlibs=yes
229@@ -9629,7 +9626,7 @@
230 fi
231 ;;
232
233- netbsd* | netbsdelf*-gnu)
234+ netbsd*)
235 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
236 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
237 wlarc=
238@@ -9804,7 +9801,6 @@
239 if test "$aix_use_runtimelinking" = yes; then
240 shared_flag="$shared_flag "'${wl}-G'
241 fi
242- link_all_deplibs=no
243 else
244 # not using gcc
245 if test "$host_cpu" = ia64; then
246@@ -10219,7 +10215,7 @@
247 link_all_deplibs=yes
248 ;;
249
250- netbsd* | netbsdelf*-gnu)
251+ netbsd*)
252 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
253 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
254 else
255@@ -11196,18 +11192,6 @@
256 dynamic_linker='GNU/Linux ld.so'
257 ;;
258
259-netbsdelf*-gnu)
260- version_type=linux
261- need_lib_prefix=no
262- need_version=no
263- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
264- soname_spec='${libname}${release}${shared_ext}$major'
265- shlibpath_var=LD_LIBRARY_PATH
266- shlibpath_overrides_runpath=no
267- hardcode_into_libs=yes
268- dynamic_linker='NetBSD ld.elf_so'
269- ;;
270-
271 netbsd*)
272 version_type=sunos
273 need_lib_prefix=no
274@@ -12141,7 +12125,7 @@
275 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
276 lt_status=$lt_dlunknown
277 cat > conftest.$ac_ext <<_LT_EOF
278-#line 12144 "configure"
279+#line 12128 "configure"
280 #include "confdefs.h"
281
282 #if HAVE_DLFCN_H
283@@ -12237,7 +12221,7 @@
284 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
285 lt_status=$lt_dlunknown
286 cat > conftest.$ac_ext <<_LT_EOF
287-#line 12240 "configure"
288+#line 12224 "configure"
289 #include "confdefs.h"
290
291 #if HAVE_DLFCN_H
292@@ -24899,16 +24883,7 @@
293
294
295 case $ac_file$ac_mode in
296- "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
297-# are listed without --file. Let's play safe and only enable the eval
298-# if we detect the quoting.
299-case $CONFIG_FILES in
300-*\'*) eval set x "$CONFIG_FILES" ;;
301-*) set x $CONFIG_FILES ;;
302-esac
303-shift
304-for mf
305-do
306+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
307 # Strip MF so we end up with the name of the file.
308 mf=`echo "$mf" | sed -e 's/:.*$//'`
309 # Check whether this is an Automake generated Makefile or not.
310diff -Naur shadow-4.1.4.1.orig/contrib/Makefile.in shadow-4.1.4.1/contrib/Makefile.in
311--- shadow-4.1.4.1.orig/contrib/Makefile.in 2009-05-22 09:55:43.000000000 -0400
312+++ shadow-4.1.4.1/contrib/Makefile.in 2009-07-11 22:35:22.838280410 -0400
313@@ -1,4 +1,4 @@
314-# Makefile.in generated by automake 1.10.2 from Makefile.am.
315+# Makefile.in generated by automake 1.10.1 from Makefile.am.
316 # @configure_input@
317
318 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
319@@ -200,8 +200,8 @@
320 @for dep in $?; do \
321 case '$(am__configure_deps)' in \
322 *$$dep*) \
323- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
324- && { if test -f $@; then exit 0; else break; fi; }; \
325+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
326+ && exit 0; \
327 exit 1;; \
328 esac; \
329 done; \
330diff -Naur shadow-4.1.4.1.orig/doc/Makefile.in shadow-4.1.4.1/doc/Makefile.in
331--- shadow-4.1.4.1.orig/doc/Makefile.in 2009-05-22 09:55:43.000000000 -0400
332+++ shadow-4.1.4.1/doc/Makefile.in 2009-07-11 22:35:22.875755513 -0400
333@@ -1,4 +1,4 @@
334-# Makefile.in generated by automake 1.10.2 from Makefile.am.
335+# Makefile.in generated by automake 1.10.1 from Makefile.am.
336 # @configure_input@
337
338 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
339@@ -199,8 +199,8 @@
340 @for dep in $?; do \
341 case '$(am__configure_deps)' in \
342 *$$dep*) \
343- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
344- && { if test -f $@; then exit 0; else break; fi; }; \
345+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
346+ && exit 0; \
347 exit 1;; \
348 esac; \
349 done; \
350diff -Naur shadow-4.1.4.1.orig/etc/Makefile.in shadow-4.1.4.1/etc/Makefile.in
351--- shadow-4.1.4.1.orig/etc/Makefile.in 2009-05-22 09:55:43.000000000 -0400
352+++ shadow-4.1.4.1/etc/Makefile.in 2009-07-11 22:35:22.925755384 -0400
353@@ -1,4 +1,4 @@
354-# Makefile.in generated by automake 1.10.2 from Makefile.am.
355+# Makefile.in generated by automake 1.10.1 from Makefile.am.
356 # @configure_input@
357
358 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
359@@ -238,8 +238,8 @@
360 @for dep in $?; do \
361 case '$(am__configure_deps)' in \
362 *$$dep*) \
363- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
364- && { if test -f $@; then exit 0; else break; fi; }; \
365+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
366+ && exit 0; \
367 exit 1;; \
368 esac; \
369 done; \
370@@ -396,7 +396,7 @@
371 unique=`for i in $$list; do \
372 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
373 done | \
374- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
375+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
376 END { if (nonempty) { for (i in files) print i; }; }'`; \
377 mkid -fID $$unique
378 tags: TAGS
379diff -Naur shadow-4.1.4.1.orig/etc/pam.d/Makefile.in shadow-4.1.4.1/etc/pam.d/Makefile.in
380--- shadow-4.1.4.1.orig/etc/pam.d/Makefile.in 2009-05-22 09:55:43.000000000 -0400
381+++ shadow-4.1.4.1/etc/pam.d/Makefile.in 2009-07-11 22:35:22.964921740 -0400
382@@ -1,4 +1,4 @@
383-# Makefile.in generated by automake 1.10.2 from Makefile.am.
384+# Makefile.in generated by automake 1.10.1 from Makefile.am.
385 # @configure_input@
386
387 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
388@@ -230,8 +230,8 @@
389 @for dep in $?; do \
390 case '$(am__configure_deps)' in \
391 *$$dep*) \
392- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
393- && { if test -f $@; then exit 0; else break; fi; }; \
394+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
395+ && exit 0; \
396 exit 1;; \
397 esac; \
398 done; \
399diff -Naur shadow-4.1.4.1.orig/lib/commonio.c shadow-4.1.4.1/lib/commonio.c
400--- shadow-4.1.4.1.orig/lib/commonio.c 2009-05-10 09:49:05.000000000 -0400
401+++ shadow-4.1.4.1/lib/commonio.c 2009-07-11 22:34:19.184931422 -0400
402@@ -215,16 +215,6 @@
403 return NULL;
404 }
405
406-#ifdef HAVE_FCHOWN
407- if (fchown (fileno (fp), sb->st_uid, sb->st_gid) != 0) {
408- goto fail;
409- }
410-#else
411- if (chown (name, sb->st_mode) != 0) {
412- goto fail;
413- }
414-#endif
415-
416 #ifdef HAVE_FCHMOD
417 if (fchmod (fileno (fp), sb->st_mode & 0664) != 0) {
418 goto fail;
419@@ -408,8 +398,8 @@
420 /* Tell nscd when lock count goes to zero,
421 if any of the files were changed. */
422 if (nscd_need_reload) {
423- nscd_flush_cache ("passwd");
424- nscd_flush_cache ("group");
425+// nscd_flush_cache ("passwd");
426+// nscd_flush_cache ("group");
427 nscd_need_reload = false;
428 }
429 #ifdef HAVE_LCKPWDF
430@@ -872,7 +862,7 @@
431 * Default permissions for new [g]shadow files.
432 * (passwd and group always exist...)
433 */
434- sb.st_mode = 0400;
435+ sb.st_mode = 0600;
436 sb.st_uid = 0;
437 sb.st_gid = 0;
438 }
439diff -Naur shadow-4.1.4.1.orig/lib/defines.h shadow-4.1.4.1/lib/defines.h
440--- shadow-4.1.4.1.orig/lib/defines.h 2009-05-19 04:05:10.000000000 -0400
441+++ shadow-4.1.4.1/lib/defines.h 2009-07-11 22:34:19.184931422 -0400
442@@ -299,20 +299,20 @@
443 (strncpy((A), (B), sizeof(A) - 1), (A)[sizeof(A) - 1] = '\0')
444
445 #ifndef PASSWD_FILE
446-#define PASSWD_FILE "/etc/passwd"
447+#define PASSWD_FILE SYSCONFDIR"/passwd"
448 #endif
449
450 #ifndef GROUP_FILE
451-#define GROUP_FILE "/etc/group"
452+#define GROUP_FILE SYSCONFDIR"/group"
453 #endif
454
455 #ifndef SHADOW_FILE
456-#define SHADOW_FILE "/etc/shadow"
457+#define SHADOW_FILE SYSCONFDIR"/shadow"
458 #endif
459
460 #ifdef SHADOWGRP
461 #ifndef SGROUP_FILE
462-#define SGROUP_FILE "/etc/gshadow"
463+#define SGROUP_FILE SYSCONFDIR"/gshadow"
464 #endif
465 #endif
466
467diff -Naur shadow-4.1.4.1.orig/lib/getdef.c shadow-4.1.4.1/lib/getdef.c
468--- shadow-4.1.4.1.orig/lib/getdef.c 2009-04-23 07:46:47.000000000 -0400
469+++ shadow-4.1.4.1/lib/getdef.c 2009-07-11 22:34:19.184931422 -0400
470@@ -128,7 +128,7 @@
471 };
472
473 #ifndef LOGINDEFS
474-#define LOGINDEFS "/etc/login.defs"
475+#define LOGINDEFS SYSCONFDIR"/login.defs"
476 #endif
477
478 static char def_fname[] = LOGINDEFS; /* login config defs file */
479diff -Naur shadow-4.1.4.1.orig/lib/gshadow_.h shadow-4.1.4.1/lib/gshadow_.h
480--- shadow-4.1.4.1.orig/lib/gshadow_.h 2009-04-24 20:20:11.000000000 -0400
481+++ shadow-4.1.4.1/lib/gshadow_.h 2009-07-11 22:34:19.184931422 -0400
482@@ -71,5 +71,5 @@
483 int putsgent ();
484 #endif
485
486-#define GSHADOW "/etc/gshadow"
487+#define GSHADOW SYSCONFDIR"/gshadow"
488 #endif /* ifndef _H_GSHADOW */
489diff -Naur shadow-4.1.4.1.orig/lib/Makefile.am shadow-4.1.4.1/lib/Makefile.am
490--- shadow-4.1.4.1.orig/lib/Makefile.am 2009-04-24 05:47:28.000000000 -0400
491+++ shadow-4.1.4.1/lib/Makefile.am 2009-07-11 22:34:19.184931422 -0400
492@@ -2,6 +2,7 @@
493 AUTOMAKE_OPTIONS = 1.0 foreign
494
495 DEFS =
496+AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\"
497
498 noinst_LTLIBRARIES = libshadow.la
499
500diff -Naur shadow-4.1.4.1.orig/lib/Makefile.in shadow-4.1.4.1/lib/Makefile.in
501--- shadow-4.1.4.1.orig/lib/Makefile.in 2009-05-22 09:55:43.000000000 -0400
502+++ shadow-4.1.4.1/lib/Makefile.in 2009-07-11 22:35:23.021588901 -0400
503@@ -1,4 +1,4 @@
504-# Makefile.in generated by automake 1.10.2 from Makefile.am.
505+# Makefile.in generated by automake 1.10.1 from Makefile.am.
506 # @configure_input@
507
508 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
509@@ -214,6 +214,7 @@
510 top_builddir = @top_builddir@
511 top_srcdir = @top_srcdir@
512 AUTOMAKE_OPTIONS = 1.0 foreign
513+AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\"
514 noinst_LTLIBRARIES = libshadow.la
515 libshadow_la_LDFLAGS = -version-info 0:0:0
516 libshadow_la_SOURCES = \
517@@ -275,8 +276,8 @@
518 @for dep in $?; do \
519 case '$(am__configure_deps)' in \
520 *$$dep*) \
521- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
522- && { if test -f $@; then exit 0; else break; fi; }; \
523+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
524+ && exit 0; \
525 exit 1;; \
526 esac; \
527 done; \
528@@ -377,7 +378,7 @@
529 unique=`for i in $$list; do \
530 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
531 done | \
532- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
533+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
534 END { if (nonempty) { for (i in files) print i; }; }'`; \
535 mkid -fID $$unique
536 tags: TAGS
537diff -Naur shadow-4.1.4.1.orig/lib/port.h shadow-4.1.4.1/lib/port.h
538--- shadow-4.1.4.1.orig/lib/port.h 2008-04-26 20:40:13.000000000 -0400
539+++ shadow-4.1.4.1/lib/port.h 2009-07-11 22:34:19.184931422 -0400
540@@ -52,7 +52,7 @@
541 * PORT_DAY - Day of the week to a bit value (0 = Sunday).
542 */
543
544-#define PORTS "/etc/porttime"
545+#define PORTS SYSCONFDIR"/porttime"
546 #define PORT_IDS 64
547 #define PORT_TTY 64
548 #define PORT_TIMES 24
549diff -Naur shadow-4.1.4.1.orig/libmisc/limits.c shadow-4.1.4.1/libmisc/limits.c
550--- shadow-4.1.4.1.orig/libmisc/limits.c 2009-04-30 17:08:50.000000000 -0400
551+++ shadow-4.1.4.1/libmisc/limits.c 2009-07-11 22:34:19.188262019 -0400
552@@ -54,7 +54,7 @@
553 #endif
554 #ifdef LIMITS
555 #ifndef LIMITS_FILE
556-#define LIMITS_FILE "/etc/limits"
557+#define LIMITS_FILE SYSCONFDIR"/limits"
558 #endif
559 #define LOGIN_ERROR_RLIMIT 1
560 #define LOGIN_ERROR_LOGIN 2
561diff -Naur shadow-4.1.4.1.orig/libmisc/Makefile.am shadow-4.1.4.1/libmisc/Makefile.am
562--- shadow-4.1.4.1.orig/libmisc/Makefile.am 2009-05-17 14:39:06.000000000 -0400
563+++ shadow-4.1.4.1/libmisc/Makefile.am 2009-07-11 22:34:19.188262019 -0400
564@@ -1,6 +1,8 @@
565
566 EXTRA_DIST = .indent.pro xgetXXbyYY.c
567
568+AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\"
569+
570 INCLUDES = -I$(top_srcdir)/lib
571
572 noinst_LIBRARIES = libmisc.a
573diff -Naur shadow-4.1.4.1.orig/libmisc/Makefile.in shadow-4.1.4.1/libmisc/Makefile.in
574--- shadow-4.1.4.1.orig/libmisc/Makefile.in 2009-05-22 09:55:43.000000000 -0400
575+++ shadow-4.1.4.1/libmisc/Makefile.in 2009-07-11 22:35:23.078255559 -0400
576@@ -1,4 +1,4 @@
577-# Makefile.in generated by automake 1.10.2 from Makefile.am.
578+# Makefile.in generated by automake 1.10.1 from Makefile.am.
579 # @configure_input@
580
581 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
582@@ -233,6 +233,7 @@
583 top_builddir = @top_builddir@
584 top_srcdir = @top_srcdir@
585 EXTRA_DIST = .indent.pro xgetXXbyYY.c
586+AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\"
587 INCLUDES = -I$(top_srcdir)/lib
588 noinst_LIBRARIES = libmisc.a
589 libmisc_a_SOURCES = \
590@@ -305,8 +306,8 @@
591 @for dep in $?; do \
592 case '$(am__configure_deps)' in \
593 *$$dep*) \
594- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
595- && { if test -f $@; then exit 0; else break; fi; }; \
596+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
597+ && exit 0; \
598 exit 1;; \
599 esac; \
600 done; \
601@@ -438,7 +439,7 @@
602 unique=`for i in $$list; do \
603 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
604 done | \
605- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
606+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
607 END { if (nonempty) { for (i in files) print i; }; }'`; \
608 mkid -fID $$unique
609 tags: TAGS
610diff -Naur shadow-4.1.4.1.orig/Makefile.in shadow-4.1.4.1/Makefile.in
611--- shadow-4.1.4.1.orig/Makefile.in 2009-05-22 09:55:44.000000000 -0400
612+++ shadow-4.1.4.1/Makefile.in 2009-07-11 22:35:24.044922145 -0400
613@@ -1,4 +1,4 @@
614-# Makefile.in generated by automake 1.10.2 from Makefile.am.
615+# Makefile.in generated by automake 1.10.1 from Makefile.am.
616 # @configure_input@
617
618 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
619@@ -283,7 +283,7 @@
620 -rm -rf .libs _libs
621
622 distclean-libtool:
623- -rm -f libtool config.lt
624+ -rm -f libtool
625
626 # This directory's subdirectories are mostly independent; you can cd
627 # into them and run `make' without going through this Makefile.
628@@ -360,7 +360,7 @@
629 unique=`for i in $$list; do \
630 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
631 done | \
632- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
633+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
634 END { if (nonempty) { for (i in files) print i; }; }'`; \
635 mkid -fID $$unique
636 tags: TAGS
637diff -Naur shadow-4.1.4.1.orig/man/cs/Makefile.in shadow-4.1.4.1/man/cs/Makefile.in
638--- shadow-4.1.4.1.orig/man/cs/Makefile.in 2009-05-22 09:55:43.000000000 -0400
639+++ shadow-4.1.4.1/man/cs/Makefile.in 2009-07-11 22:35:23.184922170 -0400
640@@ -1,4 +1,4 @@
641-# Makefile.in generated by automake 1.10.2 from Makefile.am.
642+# Makefile.in generated by automake 1.10.1 from Makefile.am.
643 # @configure_input@
644
645 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
646@@ -223,8 +223,8 @@
647 @for dep in $?; do \
648 case '$(am__configure_deps)' in \
649 *$$dep*) \
650- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
651- && { if test -f $@; then exit 0; else break; fi; }; \
652+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
653+ && exit 0; \
654 exit 1;; \
655 esac; \
656 done; \
657@@ -265,8 +265,8 @@
658 esac; \
659 done; \
660 for i in $$list; do \
661- if test -f $$i; then file=$$i; \
662- else file=$(srcdir)/$$i; fi; \
663+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
664+ else file=$$i; fi; \
665 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
666 case "$$ext" in \
667 1*) ;; \
668@@ -310,8 +310,8 @@
669 esac; \
670 done; \
671 for i in $$list; do \
672- if test -f $$i; then file=$$i; \
673- else file=$(srcdir)/$$i; fi; \
674+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
675+ else file=$$i; fi; \
676 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
677 case "$$ext" in \
678 5*) ;; \
679@@ -355,8 +355,8 @@
680 esac; \
681 done; \
682 for i in $$list; do \
683- if test -f $$i; then file=$$i; \
684- else file=$(srcdir)/$$i; fi; \
685+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
686+ else file=$$i; fi; \
687 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
688 case "$$ext" in \
689 8*) ;; \
690diff -Naur shadow-4.1.4.1.orig/man/de/Makefile.in shadow-4.1.4.1/man/de/Makefile.in
691--- shadow-4.1.4.1.orig/man/de/Makefile.in 2009-05-22 09:55:43.000000000 -0400
692+++ shadow-4.1.4.1/man/de/Makefile.in 2009-07-11 22:35:23.231588838 -0400
693@@ -1,4 +1,4 @@
694-# Makefile.in generated by automake 1.10.2 from Makefile.am.
695+# Makefile.in generated by automake 1.10.1 from Makefile.am.
696 # @configure_input@
697
698 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
699@@ -223,8 +223,8 @@
700 @for dep in $?; do \
701 case '$(am__configure_deps)' in \
702 *$$dep*) \
703- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
704- && { if test -f $@; then exit 0; else break; fi; }; \
705+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
706+ && exit 0; \
707 exit 1;; \
708 esac; \
709 done; \
710@@ -265,8 +265,8 @@
711 esac; \
712 done; \
713 for i in $$list; do \
714- if test -f $$i; then file=$$i; \
715- else file=$(srcdir)/$$i; fi; \
716+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
717+ else file=$$i; fi; \
718 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
719 case "$$ext" in \
720 1*) ;; \
721@@ -310,8 +310,8 @@
722 esac; \
723 done; \
724 for i in $$list; do \
725- if test -f $$i; then file=$$i; \
726- else file=$(srcdir)/$$i; fi; \
727+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
728+ else file=$$i; fi; \
729 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
730 case "$$ext" in \
731 5*) ;; \
732@@ -355,8 +355,8 @@
733 esac; \
734 done; \
735 for i in $$list; do \
736- if test -f $$i; then file=$$i; \
737- else file=$(srcdir)/$$i; fi; \
738+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
739+ else file=$$i; fi; \
740 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
741 case "$$ext" in \
742 8*) ;; \
743diff -Naur shadow-4.1.4.1.orig/man/es/Makefile.in shadow-4.1.4.1/man/es/Makefile.in
744--- shadow-4.1.4.1.orig/man/es/Makefile.in 2009-05-22 09:55:43.000000000 -0400
745+++ shadow-4.1.4.1/man/es/Makefile.in 2009-07-11 22:35:23.268255758 -0400
746@@ -1,4 +1,4 @@
747-# Makefile.in generated by automake 1.10.2 from Makefile.am.
748+# Makefile.in generated by automake 1.10.1 from Makefile.am.
749 # @configure_input@
750
751 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
752@@ -206,8 +206,8 @@
753 @for dep in $?; do \
754 case '$(am__configure_deps)' in \
755 *$$dep*) \
756- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
757- && { if test -f $@; then exit 0; else break; fi; }; \
758+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
759+ && exit 0; \
760 exit 1;; \
761 esac; \
762 done; \
763diff -Naur shadow-4.1.4.1.orig/man/fi/Makefile.in shadow-4.1.4.1/man/fi/Makefile.in
764--- shadow-4.1.4.1.orig/man/fi/Makefile.in 2009-05-22 09:55:43.000000000 -0400
765+++ shadow-4.1.4.1/man/fi/Makefile.in 2009-07-11 22:35:23.304922244 -0400
766@@ -1,4 +1,4 @@
767-# Makefile.in generated by automake 1.10.2 from Makefile.am.
768+# Makefile.in generated by automake 1.10.1 from Makefile.am.
769 # @configure_input@
770
771 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
772@@ -204,8 +204,8 @@
773 @for dep in $?; do \
774 case '$(am__configure_deps)' in \
775 *$$dep*) \
776- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
777- && { if test -f $@; then exit 0; else break; fi; }; \
778+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
779+ && exit 0; \
780 exit 1;; \
781 esac; \
782 done; \
783@@ -246,8 +246,8 @@
784 esac; \
785 done; \
786 for i in $$list; do \
787- if test -f $$i; then file=$$i; \
788- else file=$(srcdir)/$$i; fi; \
789+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
790+ else file=$$i; fi; \
791 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
792 case "$$ext" in \
793 1*) ;; \
794diff -Naur shadow-4.1.4.1.orig/man/fr/Makefile.in shadow-4.1.4.1/man/fr/Makefile.in
795--- shadow-4.1.4.1.orig/man/fr/Makefile.in 2009-05-22 09:55:43.000000000 -0400
796+++ shadow-4.1.4.1/man/fr/Makefile.in 2009-07-11 22:35:23.354922350 -0400
797@@ -1,4 +1,4 @@
798-# Makefile.in generated by automake 1.10.2 from Makefile.am.
799+# Makefile.in generated by automake 1.10.1 from Makefile.am.
800 # @configure_input@
801
802 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
803@@ -229,8 +229,8 @@
804 @for dep in $?; do \
805 case '$(am__configure_deps)' in \
806 *$$dep*) \
807- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
808- && { if test -f $@; then exit 0; else break; fi; }; \
809+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
810+ && exit 0; \
811 exit 1;; \
812 esac; \
813 done; \
814@@ -271,8 +271,8 @@
815 esac; \
816 done; \
817 for i in $$list; do \
818- if test -f $$i; then file=$$i; \
819- else file=$(srcdir)/$$i; fi; \
820+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
821+ else file=$$i; fi; \
822 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
823 case "$$ext" in \
824 1*) ;; \
825@@ -316,8 +316,8 @@
826 esac; \
827 done; \
828 for i in $$list; do \
829- if test -f $$i; then file=$$i; \
830- else file=$(srcdir)/$$i; fi; \
831+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
832+ else file=$$i; fi; \
833 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
834 case "$$ext" in \
835 3*) ;; \
836@@ -361,8 +361,8 @@
837 esac; \
838 done; \
839 for i in $$list; do \
840- if test -f $$i; then file=$$i; \
841- else file=$(srcdir)/$$i; fi; \
842+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
843+ else file=$$i; fi; \
844 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
845 case "$$ext" in \
846 5*) ;; \
847@@ -406,8 +406,8 @@
848 esac; \
849 done; \
850 for i in $$list; do \
851- if test -f $$i; then file=$$i; \
852- else file=$(srcdir)/$$i; fi; \
853+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
854+ else file=$$i; fi; \
855 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
856 case "$$ext" in \
857 8*) ;; \
858diff -Naur shadow-4.1.4.1.orig/man/hu/Makefile.in shadow-4.1.4.1/man/hu/Makefile.in
859--- shadow-4.1.4.1.orig/man/hu/Makefile.in 2009-05-22 09:55:43.000000000 -0400
860+++ shadow-4.1.4.1/man/hu/Makefile.in 2009-07-11 22:35:23.394922201 -0400
861@@ -1,4 +1,4 @@
862-# Makefile.in generated by automake 1.10.2 from Makefile.am.
863+# Makefile.in generated by automake 1.10.1 from Makefile.am.
864 # @configure_input@
865
866 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
867@@ -213,8 +213,8 @@
868 @for dep in $?; do \
869 case '$(am__configure_deps)' in \
870 *$$dep*) \
871- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
872- && { if test -f $@; then exit 0; else break; fi; }; \
873+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
874+ && exit 0; \
875 exit 1;; \
876 esac; \
877 done; \
878@@ -255,8 +255,8 @@
879 esac; \
880 done; \
881 for i in $$list; do \
882- if test -f $$i; then file=$$i; \
883- else file=$(srcdir)/$$i; fi; \
884+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
885+ else file=$$i; fi; \
886 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
887 case "$$ext" in \
888 1*) ;; \
889@@ -300,8 +300,8 @@
890 esac; \
891 done; \
892 for i in $$list; do \
893- if test -f $$i; then file=$$i; \
894- else file=$(srcdir)/$$i; fi; \
895+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
896+ else file=$$i; fi; \
897 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
898 case "$$ext" in \
899 5*) ;; \
900@@ -345,8 +345,8 @@
901 esac; \
902 done; \
903 for i in $$list; do \
904- if test -f $$i; then file=$$i; \
905- else file=$(srcdir)/$$i; fi; \
906+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
907+ else file=$$i; fi; \
908 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
909 case "$$ext" in \
910 8*) ;; \
911diff -Naur shadow-4.1.4.1.orig/man/id/Makefile.in shadow-4.1.4.1/man/id/Makefile.in
912--- shadow-4.1.4.1.orig/man/id/Makefile.in 2009-05-22 09:55:43.000000000 -0400
913+++ shadow-4.1.4.1/man/id/Makefile.in 2009-07-11 22:35:23.434922183 -0400
914@@ -1,4 +1,4 @@
915-# Makefile.in generated by automake 1.10.2 from Makefile.am.
916+# Makefile.in generated by automake 1.10.1 from Makefile.am.
917 # @configure_input@
918
919 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
920@@ -204,8 +204,8 @@
921 @for dep in $?; do \
922 case '$(am__configure_deps)' in \
923 *$$dep*) \
924- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
925- && { if test -f $@; then exit 0; else break; fi; }; \
926+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
927+ && exit 0; \
928 exit 1;; \
929 esac; \
930 done; \
931@@ -246,8 +246,8 @@
932 esac; \
933 done; \
934 for i in $$list; do \
935- if test -f $$i; then file=$$i; \
936- else file=$(srcdir)/$$i; fi; \
937+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
938+ else file=$$i; fi; \
939 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
940 case "$$ext" in \
941 1*) ;; \
942@@ -291,8 +291,8 @@
943 esac; \
944 done; \
945 for i in $$list; do \
946- if test -f $$i; then file=$$i; \
947- else file=$(srcdir)/$$i; fi; \
948+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
949+ else file=$$i; fi; \
950 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
951 case "$$ext" in \
952 8*) ;; \
953diff -Naur shadow-4.1.4.1.orig/man/it/Makefile.in shadow-4.1.4.1/man/it/Makefile.in
954--- shadow-4.1.4.1.orig/man/it/Makefile.in 2009-05-22 09:55:44.000000000 -0400
955+++ shadow-4.1.4.1/man/it/Makefile.in 2009-07-11 22:35:23.481588879 -0400
956@@ -1,4 +1,4 @@
957-# Makefile.in generated by automake 1.10.2 from Makefile.am.
958+# Makefile.in generated by automake 1.10.1 from Makefile.am.
959 # @configure_input@
960
961 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
962@@ -227,8 +227,8 @@
963 @for dep in $?; do \
964 case '$(am__configure_deps)' in \
965 *$$dep*) \
966- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
967- && { if test -f $@; then exit 0; else break; fi; }; \
968+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
969+ && exit 0; \
970 exit 1;; \
971 esac; \
972 done; \
973@@ -269,8 +269,8 @@
974 esac; \
975 done; \
976 for i in $$list; do \
977- if test -f $$i; then file=$$i; \
978- else file=$(srcdir)/$$i; fi; \
979+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
980+ else file=$$i; fi; \
981 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
982 case "$$ext" in \
983 1*) ;; \
984@@ -314,8 +314,8 @@
985 esac; \
986 done; \
987 for i in $$list; do \
988- if test -f $$i; then file=$$i; \
989- else file=$(srcdir)/$$i; fi; \
990+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
991+ else file=$$i; fi; \
992 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
993 case "$$ext" in \
994 3*) ;; \
995@@ -359,8 +359,8 @@
996 esac; \
997 done; \
998 for i in $$list; do \
999- if test -f $$i; then file=$$i; \
1000- else file=$(srcdir)/$$i; fi; \
1001+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1002+ else file=$$i; fi; \
1003 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1004 case "$$ext" in \
1005 5*) ;; \
1006@@ -404,8 +404,8 @@
1007 esac; \
1008 done; \
1009 for i in $$list; do \
1010- if test -f $$i; then file=$$i; \
1011- else file=$(srcdir)/$$i; fi; \
1012+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1013+ else file=$$i; fi; \
1014 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1015 case "$$ext" in \
1016 8*) ;; \
1017diff -Naur shadow-4.1.4.1.orig/man/ja/Makefile.in shadow-4.1.4.1/man/ja/Makefile.in
1018--- shadow-4.1.4.1.orig/man/ja/Makefile.in 2009-05-22 09:55:44.000000000 -0400
1019+++ shadow-4.1.4.1/man/ja/Makefile.in 2009-07-11 22:35:23.521588814 -0400
1020@@ -1,4 +1,4 @@
1021-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1022+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1023 # @configure_input@
1024
1025 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1026@@ -219,8 +219,8 @@
1027 @for dep in $?; do \
1028 case '$(am__configure_deps)' in \
1029 *$$dep*) \
1030- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1031- && { if test -f $@; then exit 0; else break; fi; }; \
1032+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1033+ && exit 0; \
1034 exit 1;; \
1035 esac; \
1036 done; \
1037@@ -261,8 +261,8 @@
1038 esac; \
1039 done; \
1040 for i in $$list; do \
1041- if test -f $$i; then file=$$i; \
1042- else file=$(srcdir)/$$i; fi; \
1043+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1044+ else file=$$i; fi; \
1045 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1046 case "$$ext" in \
1047 1*) ;; \
1048@@ -306,8 +306,8 @@
1049 esac; \
1050 done; \
1051 for i in $$list; do \
1052- if test -f $$i; then file=$$i; \
1053- else file=$(srcdir)/$$i; fi; \
1054+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1055+ else file=$$i; fi; \
1056 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1057 case "$$ext" in \
1058 5*) ;; \
1059@@ -351,8 +351,8 @@
1060 esac; \
1061 done; \
1062 for i in $$list; do \
1063- if test -f $$i; then file=$$i; \
1064- else file=$(srcdir)/$$i; fi; \
1065+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1066+ else file=$$i; fi; \
1067 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1068 case "$$ext" in \
1069 8*) ;; \
1070diff -Naur shadow-4.1.4.1.orig/man/ko/Makefile.in shadow-4.1.4.1/man/ko/Makefile.in
1071--- shadow-4.1.4.1.orig/man/ko/Makefile.in 2009-05-22 09:55:44.000000000 -0400
1072+++ shadow-4.1.4.1/man/ko/Makefile.in 2009-07-11 22:35:23.564921655 -0400
1073@@ -1,4 +1,4 @@
1074-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1075+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1076 # @configure_input@
1077
1078 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1079@@ -213,8 +213,8 @@
1080 @for dep in $?; do \
1081 case '$(am__configure_deps)' in \
1082 *$$dep*) \
1083- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1084- && { if test -f $@; then exit 0; else break; fi; }; \
1085+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1086+ && exit 0; \
1087 exit 1;; \
1088 esac; \
1089 done; \
1090@@ -255,8 +255,8 @@
1091 esac; \
1092 done; \
1093 for i in $$list; do \
1094- if test -f $$i; then file=$$i; \
1095- else file=$(srcdir)/$$i; fi; \
1096+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1097+ else file=$$i; fi; \
1098 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1099 case "$$ext" in \
1100 1*) ;; \
1101@@ -300,8 +300,8 @@
1102 esac; \
1103 done; \
1104 for i in $$list; do \
1105- if test -f $$i; then file=$$i; \
1106- else file=$(srcdir)/$$i; fi; \
1107+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1108+ else file=$$i; fi; \
1109 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1110 case "$$ext" in \
1111 5*) ;; \
1112@@ -345,8 +345,8 @@
1113 esac; \
1114 done; \
1115 for i in $$list; do \
1116- if test -f $$i; then file=$$i; \
1117- else file=$(srcdir)/$$i; fi; \
1118+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1119+ else file=$$i; fi; \
1120 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1121 case "$$ext" in \
1122 8*) ;; \
1123diff -Naur shadow-4.1.4.1.orig/man/Makefile.in shadow-4.1.4.1/man/Makefile.in
1124--- shadow-4.1.4.1.orig/man/Makefile.in 2009-05-22 09:55:58.000000000 -0400
1125+++ shadow-4.1.4.1/man/Makefile.in 2009-07-11 22:35:23.144922197 -0400
1126@@ -1,4 +1,4 @@
1127-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1128+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1129 # @configure_input@
1130
1131 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1132@@ -353,8 +353,8 @@
1133 @for dep in $?; do \
1134 case '$(am__configure_deps)' in \
1135 *$$dep*) \
1136- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1137- && { if test -f $@; then exit 0; else break; fi; }; \
1138+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1139+ && exit 0; \
1140 exit 1;; \
1141 esac; \
1142 done; \
1143@@ -397,8 +397,8 @@
1144 esac; \
1145 done; \
1146 for i in $$list; do \
1147- if test -f $$i; then file=$$i; \
1148- else file=$(srcdir)/$$i; fi; \
1149+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1150+ else file=$$i; fi; \
1151 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1152 case "$$ext" in \
1153 1*) ;; \
1154@@ -442,8 +442,8 @@
1155 esac; \
1156 done; \
1157 for i in $$list; do \
1158- if test -f $$i; then file=$$i; \
1159- else file=$(srcdir)/$$i; fi; \
1160+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1161+ else file=$$i; fi; \
1162 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1163 case "$$ext" in \
1164 3*) ;; \
1165@@ -487,8 +487,8 @@
1166 esac; \
1167 done; \
1168 for i in $$list; do \
1169- if test -f $$i; then file=$$i; \
1170- else file=$(srcdir)/$$i; fi; \
1171+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1172+ else file=$$i; fi; \
1173 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1174 case "$$ext" in \
1175 5*) ;; \
1176@@ -532,8 +532,8 @@
1177 esac; \
1178 done; \
1179 for i in $$list; do \
1180- if test -f $$i; then file=$$i; \
1181- else file=$(srcdir)/$$i; fi; \
1182+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1183+ else file=$$i; fi; \
1184 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1185 case "$$ext" in \
1186 8*) ;; \
1187@@ -642,7 +642,7 @@
1188 unique=`for i in $$list; do \
1189 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1190 done | \
1191- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1192+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
1193 END { if (nonempty) { for (i in files) print i; }; }'`; \
1194 mkid -fID $$unique
1195 tags: TAGS
1196diff -Naur shadow-4.1.4.1.orig/man/pl/Makefile.in shadow-4.1.4.1/man/pl/Makefile.in
1197--- shadow-4.1.4.1.orig/man/pl/Makefile.in 2009-05-22 09:55:44.000000000 -0400
1198+++ shadow-4.1.4.1/man/pl/Makefile.in 2009-07-11 22:35:23.611588917 -0400
1199@@ -1,4 +1,4 @@
1200-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1201+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1202 # @configure_input@
1203
1204 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1205@@ -230,8 +230,8 @@
1206 @for dep in $?; do \
1207 case '$(am__configure_deps)' in \
1208 *$$dep*) \
1209- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1210- && { if test -f $@; then exit 0; else break; fi; }; \
1211+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1212+ && exit 0; \
1213 exit 1;; \
1214 esac; \
1215 done; \
1216@@ -272,8 +272,8 @@
1217 esac; \
1218 done; \
1219 for i in $$list; do \
1220- if test -f $$i; then file=$$i; \
1221- else file=$(srcdir)/$$i; fi; \
1222+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1223+ else file=$$i; fi; \
1224 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1225 case "$$ext" in \
1226 1*) ;; \
1227@@ -317,8 +317,8 @@
1228 esac; \
1229 done; \
1230 for i in $$list; do \
1231- if test -f $$i; then file=$$i; \
1232- else file=$(srcdir)/$$i; fi; \
1233+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1234+ else file=$$i; fi; \
1235 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1236 case "$$ext" in \
1237 5*) ;; \
1238@@ -362,8 +362,8 @@
1239 esac; \
1240 done; \
1241 for i in $$list; do \
1242- if test -f $$i; then file=$$i; \
1243- else file=$(srcdir)/$$i; fi; \
1244+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1245+ else file=$$i; fi; \
1246 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1247 case "$$ext" in \
1248 8*) ;; \
1249diff -Naur shadow-4.1.4.1.orig/man/pt_BR/Makefile.in shadow-4.1.4.1/man/pt_BR/Makefile.in
1250--- shadow-4.1.4.1.orig/man/pt_BR/Makefile.in 2009-05-22 09:55:44.000000000 -0400
1251+++ shadow-4.1.4.1/man/pt_BR/Makefile.in 2009-07-11 22:35:23.651588848 -0400
1252@@ -1,4 +1,4 @@
1253-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1254+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1255 # @configure_input@
1256
1257 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1258@@ -209,8 +209,8 @@
1259 @for dep in $?; do \
1260 case '$(am__configure_deps)' in \
1261 *$$dep*) \
1262- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1263- && { if test -f $@; then exit 0; else break; fi; }; \
1264+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1265+ && exit 0; \
1266 exit 1;; \
1267 esac; \
1268 done; \
1269@@ -251,8 +251,8 @@
1270 esac; \
1271 done; \
1272 for i in $$list; do \
1273- if test -f $$i; then file=$$i; \
1274- else file=$(srcdir)/$$i; fi; \
1275+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1276+ else file=$$i; fi; \
1277 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1278 case "$$ext" in \
1279 1*) ;; \
1280@@ -296,8 +296,8 @@
1281 esac; \
1282 done; \
1283 for i in $$list; do \
1284- if test -f $$i; then file=$$i; \
1285- else file=$(srcdir)/$$i; fi; \
1286+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1287+ else file=$$i; fi; \
1288 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1289 case "$$ext" in \
1290 5*) ;; \
1291@@ -341,8 +341,8 @@
1292 esac; \
1293 done; \
1294 for i in $$list; do \
1295- if test -f $$i; then file=$$i; \
1296- else file=$(srcdir)/$$i; fi; \
1297+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1298+ else file=$$i; fi; \
1299 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1300 case "$$ext" in \
1301 8*) ;; \
1302diff -Naur shadow-4.1.4.1.orig/man/ru/Makefile.in shadow-4.1.4.1/man/ru/Makefile.in
1303--- shadow-4.1.4.1.orig/man/ru/Makefile.in 2009-05-22 09:55:44.000000000 -0400
1304+++ shadow-4.1.4.1/man/ru/Makefile.in 2009-07-11 22:35:23.698255416 -0400
1305@@ -1,4 +1,4 @@
1306-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1307+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1308 # @configure_input@
1309
1310 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1311@@ -230,8 +230,8 @@
1312 @for dep in $?; do \
1313 case '$(am__configure_deps)' in \
1314 *$$dep*) \
1315- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1316- && { if test -f $@; then exit 0; else break; fi; }; \
1317+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1318+ && exit 0; \
1319 exit 1;; \
1320 esac; \
1321 done; \
1322@@ -272,8 +272,8 @@
1323 esac; \
1324 done; \
1325 for i in $$list; do \
1326- if test -f $$i; then file=$$i; \
1327- else file=$(srcdir)/$$i; fi; \
1328+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1329+ else file=$$i; fi; \
1330 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1331 case "$$ext" in \
1332 1*) ;; \
1333@@ -317,8 +317,8 @@
1334 esac; \
1335 done; \
1336 for i in $$list; do \
1337- if test -f $$i; then file=$$i; \
1338- else file=$(srcdir)/$$i; fi; \
1339+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1340+ else file=$$i; fi; \
1341 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1342 case "$$ext" in \
1343 3*) ;; \
1344@@ -362,8 +362,8 @@
1345 esac; \
1346 done; \
1347 for i in $$list; do \
1348- if test -f $$i; then file=$$i; \
1349- else file=$(srcdir)/$$i; fi; \
1350+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1351+ else file=$$i; fi; \
1352 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1353 case "$$ext" in \
1354 5*) ;; \
1355@@ -407,8 +407,8 @@
1356 esac; \
1357 done; \
1358 for i in $$list; do \
1359- if test -f $$i; then file=$$i; \
1360- else file=$(srcdir)/$$i; fi; \
1361+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1362+ else file=$$i; fi; \
1363 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1364 case "$$ext" in \
1365 8*) ;; \
1366diff -Naur shadow-4.1.4.1.orig/man/sv/Makefile.in shadow-4.1.4.1/man/sv/Makefile.in
1367--- shadow-4.1.4.1.orig/man/sv/Makefile.in 2009-05-22 09:55:44.000000000 -0400
1368+++ shadow-4.1.4.1/man/sv/Makefile.in 2009-07-11 22:35:23.744922116 -0400
1369@@ -1,4 +1,4 @@
1370-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1371+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1372 # @configure_input@
1373
1374 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1375@@ -228,8 +228,8 @@
1376 @for dep in $?; do \
1377 case '$(am__configure_deps)' in \
1378 *$$dep*) \
1379- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1380- && { if test -f $@; then exit 0; else break; fi; }; \
1381+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1382+ && exit 0; \
1383 exit 1;; \
1384 esac; \
1385 done; \
1386@@ -270,8 +270,8 @@
1387 esac; \
1388 done; \
1389 for i in $$list; do \
1390- if test -f $$i; then file=$$i; \
1391- else file=$(srcdir)/$$i; fi; \
1392+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1393+ else file=$$i; fi; \
1394 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1395 case "$$ext" in \
1396 1*) ;; \
1397@@ -315,8 +315,8 @@
1398 esac; \
1399 done; \
1400 for i in $$list; do \
1401- if test -f $$i; then file=$$i; \
1402- else file=$(srcdir)/$$i; fi; \
1403+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1404+ else file=$$i; fi; \
1405 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1406 case "$$ext" in \
1407 3*) ;; \
1408@@ -360,8 +360,8 @@
1409 esac; \
1410 done; \
1411 for i in $$list; do \
1412- if test -f $$i; then file=$$i; \
1413- else file=$(srcdir)/$$i; fi; \
1414+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1415+ else file=$$i; fi; \
1416 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1417 case "$$ext" in \
1418 5*) ;; \
1419@@ -405,8 +405,8 @@
1420 esac; \
1421 done; \
1422 for i in $$list; do \
1423- if test -f $$i; then file=$$i; \
1424- else file=$(srcdir)/$$i; fi; \
1425+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1426+ else file=$$i; fi; \
1427 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1428 case "$$ext" in \
1429 8*) ;; \
1430diff -Naur shadow-4.1.4.1.orig/man/tr/Makefile.in shadow-4.1.4.1/man/tr/Makefile.in
1431--- shadow-4.1.4.1.orig/man/tr/Makefile.in 2009-05-22 09:55:44.000000000 -0400
1432+++ shadow-4.1.4.1/man/tr/Makefile.in 2009-07-11 22:35:23.784922158 -0400
1433@@ -1,4 +1,4 @@
1434-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1435+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1436 # @configure_input@
1437
1438 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1439@@ -216,8 +216,8 @@
1440 @for dep in $?; do \
1441 case '$(am__configure_deps)' in \
1442 *$$dep*) \
1443- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1444- && { if test -f $@; then exit 0; else break; fi; }; \
1445+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1446+ && exit 0; \
1447 exit 1;; \
1448 esac; \
1449 done; \
1450@@ -258,8 +258,8 @@
1451 esac; \
1452 done; \
1453 for i in $$list; do \
1454- if test -f $$i; then file=$$i; \
1455- else file=$(srcdir)/$$i; fi; \
1456+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1457+ else file=$$i; fi; \
1458 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1459 case "$$ext" in \
1460 1*) ;; \
1461@@ -303,8 +303,8 @@
1462 esac; \
1463 done; \
1464 for i in $$list; do \
1465- if test -f $$i; then file=$$i; \
1466- else file=$(srcdir)/$$i; fi; \
1467+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1468+ else file=$$i; fi; \
1469 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1470 case "$$ext" in \
1471 5*) ;; \
1472@@ -348,8 +348,8 @@
1473 esac; \
1474 done; \
1475 for i in $$list; do \
1476- if test -f $$i; then file=$$i; \
1477- else file=$(srcdir)/$$i; fi; \
1478+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1479+ else file=$$i; fi; \
1480 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1481 case "$$ext" in \
1482 8*) ;; \
1483diff -Naur shadow-4.1.4.1.orig/man/zh_CN/Makefile.in shadow-4.1.4.1/man/zh_CN/Makefile.in
1484--- shadow-4.1.4.1.orig/man/zh_CN/Makefile.in 2009-05-22 09:55:44.000000000 -0400
1485+++ shadow-4.1.4.1/man/zh_CN/Makefile.in 2009-07-11 22:35:23.824922223 -0400
1486@@ -1,4 +1,4 @@
1487-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1488+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1489 # @configure_input@
1490
1491 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1492@@ -217,8 +217,8 @@
1493 @for dep in $?; do \
1494 case '$(am__configure_deps)' in \
1495 *$$dep*) \
1496- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1497- && { if test -f $@; then exit 0; else break; fi; }; \
1498+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1499+ && exit 0; \
1500 exit 1;; \
1501 esac; \
1502 done; \
1503@@ -259,8 +259,8 @@
1504 esac; \
1505 done; \
1506 for i in $$list; do \
1507- if test -f $$i; then file=$$i; \
1508- else file=$(srcdir)/$$i; fi; \
1509+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1510+ else file=$$i; fi; \
1511 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1512 case "$$ext" in \
1513 1*) ;; \
1514@@ -304,8 +304,8 @@
1515 esac; \
1516 done; \
1517 for i in $$list; do \
1518- if test -f $$i; then file=$$i; \
1519- else file=$(srcdir)/$$i; fi; \
1520+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1521+ else file=$$i; fi; \
1522 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1523 case "$$ext" in \
1524 5*) ;; \
1525@@ -349,8 +349,8 @@
1526 esac; \
1527 done; \
1528 for i in $$list; do \
1529- if test -f $$i; then file=$$i; \
1530- else file=$(srcdir)/$$i; fi; \
1531+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1532+ else file=$$i; fi; \
1533 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1534 case "$$ext" in \
1535 8*) ;; \
1536diff -Naur shadow-4.1.4.1.orig/man/zh_TW/Makefile.in shadow-4.1.4.1/man/zh_TW/Makefile.in
1537--- shadow-4.1.4.1.orig/man/zh_TW/Makefile.in 2009-05-22 09:55:44.000000000 -0400
1538+++ shadow-4.1.4.1/man/zh_TW/Makefile.in 2009-07-11 22:35:23.868255516 -0400
1539@@ -1,4 +1,4 @@
1540-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1541+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1542 # @configure_input@
1543
1544 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1545@@ -217,8 +217,8 @@
1546 @for dep in $?; do \
1547 case '$(am__configure_deps)' in \
1548 *$$dep*) \
1549- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1550- && { if test -f $@; then exit 0; else break; fi; }; \
1551+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1552+ && exit 0; \
1553 exit 1;; \
1554 esac; \
1555 done; \
1556@@ -259,8 +259,8 @@
1557 esac; \
1558 done; \
1559 for i in $$list; do \
1560- if test -f $$i; then file=$$i; \
1561- else file=$(srcdir)/$$i; fi; \
1562+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1563+ else file=$$i; fi; \
1564 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1565 case "$$ext" in \
1566 1*) ;; \
1567@@ -304,8 +304,8 @@
1568 esac; \
1569 done; \
1570 for i in $$list; do \
1571- if test -f $$i; then file=$$i; \
1572- else file=$(srcdir)/$$i; fi; \
1573+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1574+ else file=$$i; fi; \
1575 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1576 case "$$ext" in \
1577 5*) ;; \
1578@@ -349,8 +349,8 @@
1579 esac; \
1580 done; \
1581 for i in $$list; do \
1582- if test -f $$i; then file=$$i; \
1583- else file=$(srcdir)/$$i; fi; \
1584+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1585+ else file=$$i; fi; \
1586 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1587 case "$$ext" in \
1588 8*) ;; \
1589diff -Naur shadow-4.1.4.1.orig/src/chage.c shadow-4.1.4.1/src/chage.c
1590--- shadow-4.1.4.1.orig/src/chage.c 2009-04-30 17:39:39.000000000 -0400
1591+++ shadow-4.1.4.1/src/chage.c 2009-07-11 22:34:19.188262019 -0400
1592@@ -808,7 +808,7 @@
1593
1594 ruid = getuid ();
1595 rgid = getgid ();
1596- amroot = (ruid == 0);
1597+ amroot = 1; /* (ruid == 0); */
1598 #ifdef WITH_SELINUX
1599 if (amroot && (is_selinux_enabled () > 0)) {
1600 amroot = (selinux_check_passwd_access (PASSWD__ROOTOK) == 0);
1601diff -Naur shadow-4.1.4.1.orig/src/chfn.c shadow-4.1.4.1/src/chfn.c
1602--- shadow-4.1.4.1.orig/src/chfn.c 2009-04-30 17:39:39.000000000 -0400
1603+++ shadow-4.1.4.1/src/chfn.c 2009-07-11 22:34:19.188262019 -0400
1604@@ -719,7 +719,7 @@
1605
1606 SYSLOG ((LOG_INFO, "changed user '%s' information", user));
1607
1608- nscd_flush_cache ("passwd");
1609+// nscd_flush_cache ("passwd");
1610
1611 closelog ();
1612 exit (E_SUCCESS);
1613diff -Naur shadow-4.1.4.1.orig/src/chgpasswd.c shadow-4.1.4.1/src/chgpasswd.c
1614--- shadow-4.1.4.1.orig/src/chgpasswd.c 2009-04-30 17:39:39.000000000 -0400
1615+++ shadow-4.1.4.1/src/chgpasswd.c 2009-07-11 22:34:19.188262019 -0400
1616@@ -537,7 +537,7 @@
1617
1618 close_files ();
1619
1620- nscd_flush_cache ("group");
1621+// nscd_flush_cache ("group");
1622
1623 return (0);
1624 }
1625diff -Naur shadow-4.1.4.1.orig/src/chpasswd.c shadow-4.1.4.1/src/chpasswd.c
1626--- shadow-4.1.4.1.orig/src/chpasswd.c 2009-05-10 09:49:05.000000000 -0400
1627+++ shadow-4.1.4.1/src/chpasswd.c 2009-07-11 22:34:19.188262019 -0400
1628@@ -578,7 +578,7 @@
1629 close_files ();
1630 #endif
1631
1632- nscd_flush_cache ("passwd");
1633+// nscd_flush_cache ("passwd");
1634
1635 return (0);
1636 }
1637diff -Naur shadow-4.1.4.1.orig/src/chsh.c shadow-4.1.4.1/src/chsh.c
1638--- shadow-4.1.4.1.orig/src/chsh.c 2009-04-30 17:39:39.000000000 -0400
1639+++ shadow-4.1.4.1/src/chsh.c 2009-07-11 22:34:19.188262019 -0400
1640@@ -56,7 +56,7 @@
1641 #include "exitcodes.h"
1642
1643 #ifndef SHELLS_FILE
1644-#define SHELLS_FILE "/etc/shells"
1645+#define SHELLS_FILE SYSCONFDIR"/shells"
1646 #endif
1647 /*
1648 * Global variables
1649@@ -443,7 +443,7 @@
1650 /*
1651 * This command behaves different for root and non-root users.
1652 */
1653- amroot = (getuid () == 0);
1654+ amroot = 1; //(getuid () == 0);
1655
1656 /*
1657 * Get the program name. The program name is used as a prefix to
1658@@ -543,7 +543,7 @@
1659
1660 SYSLOG ((LOG_INFO, "changed user '%s' shell to '%s'", user, loginsh));
1661
1662- nscd_flush_cache ("passwd");
1663+// nscd_flush_cache ("passwd");
1664
1665 closelog ();
1666 exit (E_SUCCESS);
1667diff -Naur shadow-4.1.4.1.orig/src/gpasswd.c shadow-4.1.4.1/src/gpasswd.c
1668--- shadow-4.1.4.1.orig/src/gpasswd.c 2009-04-30 17:39:40.000000000 -0400
1669+++ shadow-4.1.4.1/src/gpasswd.c 2009-07-11 22:34:19.188262019 -0400
1670@@ -86,7 +86,7 @@
1671 /* The UID of the caller */
1672 static uid_t bywho;
1673 /* Indicate if gpasswd was called by root */
1674-#define amroot (0 == bywho)
1675+#define amroot 1 /* (0 == bywho) */
1676
1677 /* The number of retries for th user to provide and repeat a new password */
1678 #ifndef RETRIES
1679@@ -1173,12 +1173,14 @@
1680 * output, etc.
1681 */
1682 output:
1683+/*
1684 if (setuid (0) != 0) {
1685 fputs (_("Cannot change ID to root.\n"), stderr);
1686 SYSLOG ((LOG_ERR, "can't setuid(0)"));
1687 closelog ();
1688 exit (E_NOPERM);
1689 }
1690+*/
1691 pwd_init ();
1692
1693 open_files ();
1694@@ -1191,7 +1193,7 @@
1695
1696 close_files ();
1697
1698- nscd_flush_cache ("group");
1699+// nscd_flush_cache ("group");
1700
1701 exit (E_SUCCESS);
1702 }
1703diff -Naur shadow-4.1.4.1.orig/src/groupadd.c shadow-4.1.4.1/src/groupadd.c
1704--- shadow-4.1.4.1.orig/src/groupadd.c 2009-04-30 17:39:40.000000000 -0400
1705+++ shadow-4.1.4.1/src/groupadd.c 2009-07-11 22:34:19.191595316 -0400
1706@@ -602,7 +602,7 @@
1707 grp_update ();
1708 close_files ();
1709
1710- nscd_flush_cache ("group");
1711+// nscd_flush_cache ("group");
1712
1713 exit (E_SUCCESS);
1714 /*@notreached@*/
1715diff -Naur shadow-4.1.4.1.orig/src/groupdel.c shadow-4.1.4.1/src/groupdel.c
1716--- shadow-4.1.4.1.orig/src/groupdel.c 2009-04-30 17:39:40.000000000 -0400
1717+++ shadow-4.1.4.1/src/groupdel.c 2009-07-11 22:34:19.191595316 -0400
1718@@ -426,7 +426,7 @@
1719
1720 close_files ();
1721
1722- nscd_flush_cache ("group");
1723+// nscd_flush_cache ("group");
1724
1725 return E_SUCCESS;
1726 }
1727diff -Naur shadow-4.1.4.1.orig/src/groupmod.c shadow-4.1.4.1/src/groupmod.c
1728--- shadow-4.1.4.1.orig/src/groupmod.c 2009-04-30 17:39:40.000000000 -0400
1729+++ shadow-4.1.4.1/src/groupmod.c 2009-07-11 22:34:19.191595316 -0400
1730@@ -812,7 +812,7 @@
1731
1732 close_files ();
1733
1734- nscd_flush_cache ("group");
1735+// nscd_flush_cache ("group");
1736
1737 return E_SUCCESS;
1738 }
1739diff -Naur shadow-4.1.4.1.orig/src/grpck.c shadow-4.1.4.1/src/grpck.c
1740--- shadow-4.1.4.1.orig/src/grpck.c 2009-05-09 17:20:57.000000000 -0400
1741+++ shadow-4.1.4.1/src/grpck.c 2009-07-11 22:34:19.191595316 -0400
1742@@ -836,7 +836,7 @@
1743 /* Commit the change in the database if needed */
1744 close_files (changed);
1745
1746- nscd_flush_cache ("group");
1747+// nscd_flush_cache ("group");
1748
1749 /*
1750 * Tell the user what we did and exit.
1751diff -Naur shadow-4.1.4.1.orig/src/grpconv.c shadow-4.1.4.1/src/grpconv.c
1752--- shadow-4.1.4.1.orig/src/grpconv.c 2008-09-06 08:51:54.000000000 -0400
1753+++ shadow-4.1.4.1/src/grpconv.c 2009-07-11 22:34:19.191595316 -0400
1754@@ -217,7 +217,7 @@
1755 }
1756 gr_locked = false;
1757
1758- nscd_flush_cache ("group");
1759+// nscd_flush_cache ("group");
1760
1761 return 0;
1762 }
1763diff -Naur shadow-4.1.4.1.orig/src/grpunconv.c shadow-4.1.4.1/src/grpunconv.c
1764--- shadow-4.1.4.1.orig/src/grpunconv.c 2008-09-06 08:51:54.000000000 -0400
1765+++ shadow-4.1.4.1/src/grpunconv.c 2009-07-11 22:34:19.194928564 -0400
1766@@ -186,7 +186,7 @@
1767 /* continue */
1768 }
1769
1770- nscd_flush_cache ("group");
1771+// nscd_flush_cache ("group");
1772
1773 return 0;
1774 }
1775diff -Naur shadow-4.1.4.1.orig/src/login_nopam.c shadow-4.1.4.1/src/login_nopam.c
1776--- shadow-4.1.4.1.orig/src/login_nopam.c 2008-09-13 14:03:51.000000000 -0400
1777+++ shadow-4.1.4.1/src/login_nopam.c 2009-07-11 22:34:19.194928564 -0400
1778@@ -59,7 +59,7 @@
1779
1780 /* Path name of the access control file. */
1781 #ifndef TABLE
1782-#define TABLE "/etc/login.access"
1783+#define TABLE SYSCONFDIR"/login.access"
1784 #endif
1785
1786 /* Delimiters for fields and for lists of users, ttys or hosts. */
1787diff -Naur shadow-4.1.4.1.orig/src/logoutd.c shadow-4.1.4.1/src/logoutd.c
1788--- shadow-4.1.4.1.orig/src/logoutd.c 2009-04-30 17:08:50.000000000 -0400
1789+++ shadow-4.1.4.1/src/logoutd.c 2009-07-11 22:34:19.194928564 -0400
1790@@ -50,7 +50,7 @@
1791 #endif
1792
1793 #ifndef HUP_MESG_FILE
1794-#define HUP_MESG_FILE "/etc/logoutd.mesg"
1795+#define HUP_MESG_FILE SYSCONFDIR"/logoutd.mesg"
1796 #endif
1797
1798 /* local function prototypes */
1799diff -Naur shadow-4.1.4.1.orig/src/Makefile.am shadow-4.1.4.1/src/Makefile.am
1800--- shadow-4.1.4.1.orig/src/Makefile.am 2009-05-09 17:10:18.000000000 -0400
1801+++ shadow-4.1.4.1/src/Makefile.am 2009-07-11 22:34:19.194928564 -0400
1802@@ -3,7 +3,7 @@
1803 .indent.pro
1804
1805 ubindir = ${prefix}/bin
1806-usbindir = ${prefix}/sbin
1807+usbindir = ${prefix}/bin
1808 suidperms = 4755
1809
1810 INCLUDES = \
1811@@ -56,7 +56,7 @@
1812 LDADD = $(INTLLIBS) \
1813 $(top_builddir)/libmisc/libmisc.a \
1814 $(top_builddir)/lib/libshadow.la
1815-AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\"
1816+AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(datadir)/locale\" -DSG=\"`echo sg | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`\" -DVIGR=\"`echo vigr | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`\"
1817
1818 if ACCT_TOOLS_SETUID
1819 LIBPAM_SUID = $(LIBPAM)
1820@@ -106,11 +106,11 @@
1821
1822 install-am: all-am
1823 $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
1824- ln -sf newgrp $(DESTDIR)$(ubindir)/sg
1825- ln -sf vipw $(DESTDIR)$(usbindir)/vigr
1826+ ln -sf `echo newgrp | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(ubindir)/`echo sg | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
1827+ ln -sf `echo vipw | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(usbindir)/`echo vigr | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
1828 for i in $(suidbins); do \
1829- chmod -f $(suidperms) $(DESTDIR)$(bindir)/$$i; \
1830+ chmod -f 4755 $(DESTDIR)$(bindir)/`echo $$i | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
1831 done
1832 for i in $(suidubins); do \
1833- chmod -f $(suidperms) $(DESTDIR)$(ubindir)/$$i; \
1834+ chmod -f 4755 $(DESTDIR)$(ubindir)/`echo $$i | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
1835 done
1836diff -Naur shadow-4.1.4.1.orig/src/Makefile.in shadow-4.1.4.1/src/Makefile.in
1837--- shadow-4.1.4.1.orig/src/Makefile.in 2009-05-22 09:55:44.000000000 -0400
1838+++ shadow-4.1.4.1/src/Makefile.in 2009-07-11 22:35:23.998255352 -0400
1839@@ -1,4 +1,4 @@
1840-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1841+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1842 # @configure_input@
1843
1844 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1845@@ -382,7 +382,7 @@
1846 .indent.pro
1847
1848 ubindir = ${prefix}/bin
1849-usbindir = ${prefix}/sbin
1850+usbindir = ${prefix}/bin
1851 suidperms = 4755
1852 INCLUDES = \
1853 -I${top_srcdir}/lib \
1854@@ -394,7 +394,7 @@
1855 $(top_builddir)/libmisc/libmisc.a \
1856 $(top_builddir)/lib/libshadow.la
1857
1858-AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\"
1859+AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(datadir)/locale\" -DSG=\"`echo sg | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`\" -DVIGR=\"`echo vigr | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`\"
1860 @ACCT_TOOLS_SETUID_FALSE@LIBPAM_SUID =
1861 @ACCT_TOOLS_SETUID_TRUE@LIBPAM_SUID = $(LIBPAM)
1862 @USE_PAM_FALSE@LIBCRYPT_NOPAM = $(LIBCRYPT)
1863@@ -442,8 +442,8 @@
1864 @for dep in $?; do \
1865 case '$(am__configure_deps)' in \
1866 *$$dep*) \
1867- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1868- && { if test -f $@; then exit 0; else break; fi; }; \
1869+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1870+ && exit 0; \
1871 exit 1;; \
1872 esac; \
1873 done; \
1874@@ -760,7 +760,7 @@
1875 unique=`for i in $$list; do \
1876 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1877 done | \
1878- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1879+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
1880 END { if (nonempty) { for (i in files) print i; }; }'`; \
1881 mkid -fID $$unique
1882 tags: TAGS
1883@@ -941,13 +941,13 @@
1884
1885 install-am: all-am
1886 $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
1887- ln -sf newgrp $(DESTDIR)$(ubindir)/sg
1888- ln -sf vipw $(DESTDIR)$(usbindir)/vigr
1889+ ln -sf `echo newgrp | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(ubindir)/`echo sg | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
1890+ ln -sf `echo vipw | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(usbindir)/`echo vigr | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
1891 for i in $(suidbins); do \
1892- chmod -f $(suidperms) $(DESTDIR)$(bindir)/$$i; \
1893+ chmod -f 4755 $(DESTDIR)$(bindir)/`echo $$i | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
1894 done
1895 for i in $(suidubins); do \
1896- chmod -f $(suidperms) $(DESTDIR)$(ubindir)/$$i; \
1897+ chmod -f 4755 $(DESTDIR)$(ubindir)/`echo $$i | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
1898 done
1899 # Tell versions [3.59,3.63) of GNU make to not export all variables.
1900 # Otherwise a system limit (for SysV at least) may be exceeded.
1901diff -Naur shadow-4.1.4.1.orig/src/newgrp.c shadow-4.1.4.1/src/newgrp.c
1902--- shadow-4.1.4.1.orig/src/newgrp.c 2009-05-22 07:10:04.000000000 -0400
1903+++ shadow-4.1.4.1/src/newgrp.c 2009-07-11 22:34:19.194928564 -0400
1904@@ -296,7 +296,7 @@
1905 if ((pid_t)-1 == child) {
1906 /* error in fork() */
1907 fprintf (stderr, _("%s: failure forking: %s\n"),
1908- is_newgrp ? "newgrp" : "sg", strerror (errno));
1909+ is_newgrp ? "newgrp" : SG, strerror (errno));
1910 #ifdef WITH_AUDIT
1911 if (group) {
1912 snprintf (audit_buf, sizeof(audit_buf),
1913@@ -417,7 +417,7 @@
1914 */
1915 Prog = Basename (argv[0]);
1916 is_newgrp = (strcmp (Prog, "newgrp") == 0);
1917- OPENLOG (is_newgrp ? "newgrp" : "sg");
1918+ OPENLOG (is_newgrp ? "newgrp" : SG);
1919 gid = getgid ();
1920 argc--;
1921 argv++;
1922diff -Naur shadow-4.1.4.1.orig/src/newusers.c shadow-4.1.4.1/src/newusers.c
1923--- shadow-4.1.4.1.orig/src/newusers.c 2009-05-10 09:49:05.000000000 -0400
1924+++ shadow-4.1.4.1/src/newusers.c 2009-07-11 22:34:19.194928564 -0400
1925@@ -1041,8 +1041,8 @@
1926
1927 close_files ();
1928
1929- nscd_flush_cache ("passwd");
1930- nscd_flush_cache ("group");
1931+// nscd_flush_cache ("passwd");
1932+// nscd_flush_cache ("group");
1933
1934 #ifdef USE_PAM
1935 unsigned int i;
1936diff -Naur shadow-4.1.4.1.orig/src/passwd.c shadow-4.1.4.1/src/passwd.c
1937--- shadow-4.1.4.1.orig/src/passwd.c 2009-05-22 09:32:30.000000000 -0400
1938+++ shadow-4.1.4.1/src/passwd.c 2009-07-11 22:34:19.194928564 -0400
1939@@ -775,7 +775,7 @@
1940 * The program behaves differently when executed by root than when
1941 * executed by a normal user.
1942 */
1943- amroot = (getuid () == 0);
1944+ amroot = 1; //(getuid () == 0);
1945
1946 /*
1947 * Get the program name. The program name is used as a prefix to
1948@@ -1088,20 +1088,22 @@
1949 exit (E_SUCCESS);
1950 }
1951 #endif /* USE_PAM */
1952+/*
1953 if (setuid (0) != 0) {
1954 fputs (_("Cannot change ID to root.\n"), stderr);
1955 SYSLOG ((LOG_ERR, "can't setuid(0)"));
1956 closelog ();
1957 exit (E_NOPERM);
1958 }
1959+*/
1960 if (spw_file_present ()) {
1961 update_shadow ();
1962 } else {
1963 update_noshadow ();
1964 }
1965
1966- nscd_flush_cache ("passwd");
1967- nscd_flush_cache ("group");
1968+ //nscd_flush_cache ("passwd");
1969+ //nscd_flush_cache ("group");
1970
1971 SYSLOG ((LOG_INFO, "password for '%s' changed by '%s'", name, myname));
1972 closelog ();
1973diff -Naur shadow-4.1.4.1.orig/src/pwck.c shadow-4.1.4.1/src/pwck.c
1974--- shadow-4.1.4.1.orig/src/pwck.c 2009-05-09 17:20:57.000000000 -0400
1975+++ shadow-4.1.4.1/src/pwck.c 2009-07-11 22:34:19.198262003 -0400
1976@@ -704,7 +704,7 @@
1977
1978 close_files (changed);
1979
1980- nscd_flush_cache ("passwd");
1981+// nscd_flush_cache ("passwd");
1982
1983 /*
1984 * Tell the user what we did and exit.
1985diff -Naur shadow-4.1.4.1.orig/src/pwconv.c shadow-4.1.4.1/src/pwconv.c
1986--- shadow-4.1.4.1.orig/src/pwconv.c 2009-04-30 17:39:40.000000000 -0400
1987+++ shadow-4.1.4.1/src/pwconv.c 2009-07-11 22:34:19.198262003 -0400
1988@@ -269,7 +269,7 @@
1989 }
1990 }
1991
1992- nscd_flush_cache ("passwd");
1993+// nscd_flush_cache ("passwd");
1994
1995 return E_SUCCESS;
1996 }
1997diff -Naur shadow-4.1.4.1.orig/src/pwunconv.c shadow-4.1.4.1/src/pwunconv.c
1998--- shadow-4.1.4.1.orig/src/pwunconv.c 2009-04-30 17:44:37.000000000 -0400
1999+++ shadow-4.1.4.1/src/pwunconv.c 2009-07-11 22:34:19.198262003 -0400
2000@@ -194,7 +194,7 @@
2001 /* continue */
2002 }
2003
2004- nscd_flush_cache ("passwd");
2005+// nscd_flush_cache ("passwd");
2006
2007 return 0;
2008 }
2009diff -Naur shadow-4.1.4.1.orig/src/suauth.c shadow-4.1.4.1/src/suauth.c
2010--- shadow-4.1.4.1.orig/src/suauth.c 2008-09-13 12:29:23.000000000 -0400
2011+++ shadow-4.1.4.1/src/suauth.c 2009-07-11 22:34:19.198262003 -0400
2012@@ -40,7 +40,7 @@
2013 #include "prototypes.h"
2014
2015 #ifndef SUAUTHFILE
2016-#define SUAUTHFILE "/etc/suauth"
2017+#define SUAUTHFILE SYSCONFDIR"/suauth"
2018 #endif
2019
2020 #define NOACTION 0
2021diff -Naur shadow-4.1.4.1.orig/src/useradd.c shadow-4.1.4.1/src/useradd.c
2022--- shadow-4.1.4.1.orig/src/useradd.c 2009-05-10 14:26:35.000000000 -0400
2023+++ shadow-4.1.4.1/src/useradd.c 2009-07-11 22:34:19.198262003 -0400
2024@@ -67,11 +67,11 @@
2025 #include "shadowio.h"
2026
2027 #ifndef SKEL_DIR
2028-#define SKEL_DIR "/etc/skel"
2029+#define SKEL_DIR SYSCONFDIR"/skel"
2030 #endif
2031 #ifndef USER_DEFAULTS_FILE
2032-#define USER_DEFAULTS_FILE "/etc/default/useradd"
2033-#define NEW_USER_FILE "/etc/default/nuaddXXXXXX"
2034+#define USER_DEFAULTS_FILE SYSCONFDIR"/default/useradd"
2035+#define NEW_USER_FILE SYSCONFDIR"/default/nuaddXXXXXX"
2036 #endif
2037 /*
2038 * Needed for MkLinux DR1/2/2.1 - J.
2039@@ -2034,8 +2034,8 @@
2040 selinux_update_mapping ();
2041 #endif
2042
2043- nscd_flush_cache ("passwd");
2044- nscd_flush_cache ("group");
2045+// nscd_flush_cache ("passwd");
2046+// nscd_flush_cache ("group");
2047
2048 return E_SUCCESS;
2049 }
2050diff -Naur shadow-4.1.4.1.orig/src/userdel.c shadow-4.1.4.1/src/userdel.c
2051--- shadow-4.1.4.1.orig/src/userdel.c 2009-05-22 06:41:12.000000000 -0400
2052+++ shadow-4.1.4.1/src/userdel.c 2009-07-11 22:34:19.198262003 -0400
2053@@ -993,8 +993,8 @@
2054 user_cancel (user_name);
2055 close_files ();
2056
2057- nscd_flush_cache ("passwd");
2058- nscd_flush_cache ("group");
2059+// nscd_flush_cache ("passwd");
2060+// nscd_flush_cache ("group");
2061
2062 return ((0 != errors) ? E_HOMEDIR : E_SUCCESS);
2063 }
2064diff -Naur shadow-4.1.4.1.orig/src/usermod.c shadow-4.1.4.1/src/usermod.c
2065--- shadow-4.1.4.1.orig/src/usermod.c 2009-05-22 06:42:53.000000000 -0400
2066+++ shadow-4.1.4.1/src/usermod.c 2009-07-11 22:34:19.198262003 -0400
2067@@ -1781,8 +1781,8 @@
2068 }
2069 close_files ();
2070
2071- nscd_flush_cache ("passwd");
2072- nscd_flush_cache ("group");
2073+// nscd_flush_cache ("passwd");
2074+// nscd_flush_cache ("group");
2075
2076 #ifdef WITH_SELINUX
2077 if (Zflg) {
2078diff -Naur shadow-4.1.4.1.orig/src/vipw.c shadow-4.1.4.1/src/vipw.c
2079--- shadow-4.1.4.1.orig/src/vipw.c 2009-04-30 17:39:40.000000000 -0400
2080+++ shadow-4.1.4.1/src/vipw.c 2009-07-11 22:34:19.201595229 -0400
2081@@ -323,7 +323,7 @@
2082 (void) textdomain (PACKAGE);
2083
2084 progname = ((a = strrchr (*argv, '/')) ? a + 1 : *argv);
2085- do_vipw = (strcmp (progname, "vigr") != 0);
2086+ do_vipw = (strcmp (progname, VIGR) != 0);
2087
2088 OPENLOG (do_vipw ? "vipw" : "vigr");
2089
2090@@ -403,8 +403,8 @@
2091 #endif
2092 }
2093
2094- nscd_flush_cache ("passwd");
2095- nscd_flush_cache ("group");
2096+// nscd_flush_cache ("passwd");
2097+// nscd_flush_cache ("group");
2098
2099 return E_SUCCESS;
2100 }
Note: See TracBrowser for help on using the repository browser.