summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim <timothyasir@gluster.com>2011-08-09 20:12:35 +0530
committerTim <timothyasir@gluster.com>2011-08-09 20:12:35 +0530
commit7fa4207e81cc5020aca4a06a6bc68a85605742cc (patch)
tree08bf59246948892955092ede85aa867898edd947
parent26c99b7829a648dc61f0eaf7e8550c8d957040cb (diff)
Bug 3370 - [CIFS] adding another user fails.
-rwxr-xr-xsrc/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py2
-rwxr-xr-xsrc/com.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py2
-rwxr-xr-xsrc/com.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py2
-rwxr-xr-xsrc/com.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py
index 8e25ea5a..40ad5228 100755
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py
@@ -29,7 +29,7 @@ def getUid(userName):
for line in content.strip().split():
tokens = line.split(":")
- if tokens[1] == UserName:
+ if tokens[1] == userName:
return int(tokens[0])
return None
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py
index 61eaaa97..70b84e6b 100755
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py
@@ -51,7 +51,7 @@ def main():
rv = Utils.runCommand(["grun.py", serverFile, "create_volume_cifs.py", volumeName] + userList)
if rv == 0:
if not addVolumeCifsConf(volumeName, userList):
- sys.stderr.write("Failed to add volume and user-list in cifs volume configuration\n")
+ sys.stderr.write("Failed to add volume %s and user-list %s in cifs volume configuration\n" % (volumeName, userList))
sys.exit(11)
sys.exit(rv)
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py
index 26c654da..d51e647d 100755
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py
@@ -49,7 +49,7 @@ def main():
rv = Utils.runCommand(["grun.py", serverFile, "delete_volume_cifs.py", volumeName])
if rv == 0:
if not removeVolumeCifsConf(volumeName):
- sys.stderr.write("Failed to remove volume and user-list in cifs volume configuration\n")
+ sys.stderr.write("Failed to remove volume %s and user-list in cifs volume configuration\n" % volumeName)
sys.exit(11)
sys.exit(rv)
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py
index 184e30b6..6a0be968 100755
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py
@@ -52,7 +52,7 @@ def main():
rv = Utils.runCommand(["grun.py", serverFile, "update_volume_cifs.py", volumeName] + userList)
if rv == 0:
if not updateVolumeCifsConf(volumeName, userList):
- sys.stderr.write("Failed to update volume and user-list in cifs volume configuration\n")
+ sys.stderr.write("Failed to update volume %s and user-list %s in cifs volume configuration\n" % (volumeName, userList))
sys.exit(11)
sys.exit(rv)