# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1250339343 -7200
# Node ID 3b982acb3d07078594b44b3c16f660a4ea2f7268
# Parent  5209729bbbaca82b8670a8c9142fe6b5811e6c5d
Options check for join

diff -r 5209729bbbac -r 3b982acb3d07 security.d/chk_passwd
--- a/security.d/chk_passwd	Sat Aug 15 14:04:50 2009 +0200
+++ b/security.d/chk_passwd	Sat Aug 15 14:29:03 2009 +0200
@@ -52,9 +52,15 @@
 COMBINED=secure3.$$
 OUTPUT=secure4.$$
 
+
 # Combine passwd and shadow files.
 #
-join --nocheck-order -t : -j 1 $MP $SP > $COMBINED
+JOPT=$( join --help | grep "\--nocheck-order")
+if [ -z "$JOPT" ]; then
+    join -t : -j 1 $MP $SP > $COMBINED
+else
+    join --nocheck-order -t : -j 1 $MP $SP > $COMBINED
+fi
 
 
 # These are used several times.