X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fgss%2Flgss_sk.c;h=f7254d2bf3252ef61bbc0d34d5bd2f6182387288;hp=3c0a467ab3a1b76eb75ecf0bac9a55c6ec5bdfd9;hb=70e9d4ecc9130aeed1260d78cd8b33a5cde6edd7;hpb=e4761eb1f4d564f111be66a61ac84f9f9be97fc2

diff --git a/lustre/utils/gss/lgss_sk.c b/lustre/utils/gss/lgss_sk.c
index 3c0a467..f7254d2 100644
--- a/lustre/utils/gss/lgss_sk.c
+++ b/lustre/utils/gss/lgss_sk.c
@@ -341,30 +341,29 @@ int main(int argc, char **argv)
 	bool generate_prime = false;
 	DH *dh;
 
-	static struct option long_opt[] = {
-		{"crypt", 1, 0, 'c'},
-		{"data", 1, 0, 'd'},
-		{"expire", 1, 0, 'e'},
-		{"fsname", 1, 0, 'f'},
-		{"mgsnids", 1, 0, 'g'},
-		{"help", 0, 0, 'h'},
-		{"hmac", 1, 0, 'i'},
-		{"integrity", 1, 0, 'i'},
-		{"key-bits", 1, 0, 'k'},
-		{"shared", 1, 0, 'k'},
-		{"load", 1, 0, 'l'},
-		{"modify", 1, 0, 'm'},
-		{"nodemap", 1, 0, 'n'},
-		{"prime-bits", 1, 0, 'p'},
-		{"read", 1, 0, 'r'},
-		{"type", 1, 0, 't'},
-		{"verbose", 0, 0, 'v'},
-		{"write", 1, 0, 'w'},
-		{0, 0, 0, 0},
-	};
+	static struct option long_opts[] = {
+	{ .name = "crypt",	.has_arg = required_argument, .val = 'c'},
+	{ .name = "data",	.has_arg = required_argument, .val = 'd'},
+	{ .name = "expire",	.has_arg = required_argument, .val = 'e'},
+	{ .name = "fsname",	.has_arg = required_argument, .val = 'f'},
+	{ .name = "mgsnids",	.has_arg = required_argument, .val = 'g'},
+	{ .name = "help",	.has_arg = no_argument,	      .val = 'h'},
+	{ .name = "hmac",	.has_arg = required_argument, .val = 'i'},
+	{ .name = "integrity",	.has_arg = required_argument, .val = 'i'},
+	{ .name = "key-bits",	.has_arg = required_argument, .val = 'k'},
+	{ .name = "shared",	.has_arg = required_argument, .val = 'k'},
+	{ .name = "load",	.has_arg = required_argument, .val = 'l'},
+	{ .name = "modify",	.has_arg = required_argument, .val = 'm'},
+	{ .name = "nodemap",	.has_arg = required_argument, .val = 'n'},
+	{ .name = "prime-bits",	.has_arg = required_argument, .val = 'p'},
+	{ .name = "read",	.has_arg = required_argument, .val = 'r'},
+	{ .name = "type",	.has_arg = required_argument, .val = 't'},
+	{ .name = "verbose",	.has_arg = no_argument,	      .val = 'v'},
+	{ .name = "write",	.has_arg = required_argument, .val = 'w'},
+	{ .name = NULL, } };
 
 	while ((opt = getopt_long(argc, argv,
-				  "c:d:e:f:g:hi:l:m:n:p:r:s:k:t:w:v", long_opt,
+				  "c:d:e:f:g:hi:l:m:n:p:r:s:k:t:w:v", long_opts,
 				  NULL)) != EOF) {
 		switch (opt) {
 		case 'c':