From f57ef39dbd46389dc9763bf291b08a0ba762b707 Mon Sep 17 00:00:00 2001 From: Harshavardhana Ranganath Date: Fri, 4 Dec 2009 20:48:09 +0000 Subject: Fix critical argument validation bug found during initial testing. Signed-off-by: Harshavardhana Signed-off-by: Anand V. Avati BUG: 437 (Fix critical argument validation check on Fedora11 systems) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=437 --- extras/volgen/CreateVolfile.py | 1 + extras/volgen/glusterfs-volgen.in | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/extras/volgen/CreateVolfile.py b/extras/volgen/CreateVolfile.py index b51be766aae..2cca8903bb3 100644 --- a/extras/volgen/CreateVolfile.py +++ b/extras/volgen/CreateVolfile.py @@ -42,6 +42,7 @@ class CreateVolfile: cmdline = string.join (sys.argv, ' ') + mount_fd.write ("## file auto generated by %s (mount.vol)\n" % sys.argv[0]) mount_fd.write ("# Cmd line:\n") diff --git a/extras/volgen/glusterfs-volgen.in b/extras/volgen/glusterfs-volgen.in index 5d9c579cfd5..bd19d122773 100755 --- a/extras/volgen/glusterfs-volgen.in +++ b/extras/volgen/glusterfs-volgen.in @@ -27,10 +27,14 @@ def args2dict(args): keyvalue = {} for arg in args: + if int(arg.find(':')) == -1: + continue first = arg.split(':')[0] keyvalue[first] = [] for arg in args: + if int(arg.find(':')) == -1: + continue first = arg.split(':')[0] if arg.split(':')[1] not in keyvalue[first]: if arg.split(':')[1][0] != '/': @@ -43,7 +47,11 @@ def args2dict(args): def args2array(args): array = [] - array = args + + for arg in args: + if int(arg.find(':')) == -1: + continue + array.append(arg) return array -- cgit