From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Thu, 28 Jul 2011 15:19:40 +0000 (+0000)
Subject: 	* lib/commonio.c: Fix NIS commit from 2011-07-14.
X-Git-Tag: 4.1.5~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6223c40c2d0a93fc6a2c7e0f41f0d550c50a7a95;p=thirdparty%2Fshadow.git

	* lib/commonio.c: Fix NIS commit from 2011-07-14.
---

diff --git a/ChangeLog b/ChangeLog
index ebb67d398..339f2b4d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-28  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* lib/commonio.c: Fix NIS commit from 2011-07-14.
+
 2011-07-28  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* NEWS, src/chpasswd.c: Create a shadow entry if the password is
diff --git a/lib/commonio.c b/lib/commonio.c
index 2853fc09b..603ac3c75 100644
--- a/lib/commonio.c
+++ b/lib/commonio.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1990 - 1994, Julianne Frances Haugh
  * Copyright (c) 1996 - 2001, Marek Michałkiewicz
  * Copyright (c) 2001 - 2006, Tomasz Kłoczko
- * Copyright (c) 2007 - 2010, Nicolas François
+ * Copyright (c) 2007 - 2011, Nicolas François
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -773,7 +773,7 @@ commonio_sort (struct commonio_db *db, int (*cmp) (const void *, const void *))
 #if KEEP_NIS_AT_END
 	     && (NULL != ptr->line)
 	     && (   ('+' != ptr->line[0])
-	         || ('-' != ptr->line[0]))
+	         && ('-' != ptr->line[0]))
 #endif
 	     ;
 	     ptr = ptr->next) {