Fix srptool issues

From 1fac0e5352e88addb8bf57dcac126918f19d7303 Mon Sep 17 00:00:00 2001
From: Attila Molnar <attilamolnar@hush.com>
Date: Tue, 1 Oct 2013 13:40:01 +0200
Subject: [PATCH 1/2] srptool: Fix inability to add users to tpasswd and broken
 -i switch

Signed-off-by: Attila Molnar <attilamolnar@hush.com>

diff --git a/src/srptool-args.def b/src/srptool-args.def
index 5794ff432ad53269f8e32138f16996eccfcce3b0..cb78e3b0a6ec9605ef81bfa45e6b85a98ce86ea4 100644 (file)
--- a/src/srptool-args.def
+++ b/src/srptool-args.def
@@ -18,6 +18,8 @@ short-usage   = "srptool [options]\nsrptool --help for usage instructions.\n";
 flag = {
     name      = index;
     value     = i;
+    arg-type  = number;
+    arg-default = 1;
     descrip   = "specify the index of the group parameters in tpasswd.conf to use.";
     doc = "";
 };

diff --git a/src/srptool.c b/src/srptool.c
index 49a62cf29606c0bbc2216462bf997994616afe94..a0cfef10aaa32698c3b78f893609be869c874c75 100644 (file)
--- a/src/srptool.c
+++ b/src/srptool.c
@@ -492,7 +492,7 @@ int main (int argc, char **argv)
 
 
   return crypt_int (username, passwd, salt_size,
-                    fpasswd_conf, fpasswd, VALUE_OPT_INDEX);
+                    fpasswd_conf, fpasswd, OPT_VALUE_INDEX);
 
 }