Index: trunk/scripts/samhainadmin.pl.in
===================================================================
--- trunk/scripts/samhainadmin.pl.in	(revision 29)
+++ trunk/scripts/samhainadmin.pl.in	(revision 30)
@@ -29,4 +29,8 @@
 use Fcntl qw(:DEFAULT :flock);
 
+# Do I/O to the data file in binary mode (so it 
+# wouldn't complain about invalid UTF-8 characters).
+use bytes;
+
 File::Temp->safe_level( File::Temp::HIGH );
 
@@ -515,8 +519,8 @@
     $action = 'f';
 }
-elsif (defined ($opts{'create-cfgfile'})) {
+elsif (defined ($opts{'create-datafile'})) {
     $action = 'D';
 }
-elsif (defined ($opts{'print-cfgfile'})) {
+elsif (defined ($opts{'print-datafile'})) {
     $action = 'd';
 }