[Pkg-shadow-commits] r2619 - in upstream/trunk: . lib

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2009-04-10 22:35:07 +0000 (Fri, 10 Apr 2009)
New Revision: 2619

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/lib/sgetspent.c
Log:
	* lib/sgetspent.c: Only compile ifndef HAVE_SGETSPENT

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-04-10 22:35:01 UTC (rev 2618)
+++ upstream/trunk/ChangeLog	2009-04-10 22:35:07 UTC (rev 2619)
@@ -1,5 +1,9 @@
 2009-04-06  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* lib/sgetspent.c: Only compile ifndef HAVE_SGETSPENT
+
+2009-04-06  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* lib/sgetspent.c: Replace strtol() by getlong(). Also detect more
 	issues in a numerical shadow entry field.
 

Modified: upstream/trunk/lib/sgetspent.c
===================================================================
--- upstream/trunk/lib/sgetspent.c	2009-04-10 22:35:01 UTC (rev 2618)
+++ upstream/trunk/lib/sgetspent.c	2009-04-10 22:35:07 UTC (rev 2619)
@@ -2,6 +2,7 @@
  * Copyright (c) 1989 - 1994, Julianne Frances Haugh
  * Copyright (c) 1996 - 1998, Marek Michałkiewicz
  * Copyright (c) 2003 - 2005, Tomasz Kłoczko
+ * Copyright (c) 2009       , Nicolas François
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,6 +32,9 @@
 
 #include <config.h>
 
+/* Newer versions of Linux libc already have shadow support.  */
+#ifndef HAVE_SGETSPENT
+
 #ident "$Id$"
 
 #include <sys/types.h>
@@ -198,4 +202,7 @@
 
 	return (&spwd);
 }
+#else
+extern int errno;		/* warning: ANSI C forbids an empty source file */
+#endif