From: Attila Molnar <attilamolnar@hush.com>
Date: Fri, 4 Oct 2013 15:19:34 +0000 (+0200)
Subject: Fix srptool issues
X-Git-Tag: gnutls_3_2_5~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b57de388c15ddf17deca4d55e35b64d4828637aa;p=thirdparty%2Fgnutls.git

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 5794ff432a..cb78e3b0a6 100644
--- 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 49a62cf296..a0cfef10aa 100644
--- 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);
 
 }