From fd79cd030e126ec3c6ce6a21927b5f9d07f56fc6 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 7 Sep 2017 16:39:56 +0200
Subject: remove unneeded GUEST_USER for NetShare

Shares mounted as guest require either no user/pass at all (like a
unsecured NFS share) or a username only (without password, like CIFS). There
is no need to differentiate between both, just need to accept non-empty
username/passwords when the user sets the share credentials...
---
 src/main/java/org/openslx/bwlp/thrift/iface/NetShareAuth.java | 7 ++-----
 src/main/thrift/bwlp.thrift                                   | 3 +--
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/NetShareAuth.java b/src/main/java/org/openslx/bwlp/thrift/iface/NetShareAuth.java
index 3b5f936..cc7b4e9 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/NetShareAuth.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/NetShareAuth.java
@@ -13,8 +13,7 @@ import org.apache.thrift.TEnum;
 
 public enum NetShareAuth implements org.apache.thrift.TEnum {
   LOGIN_USER(0),
-  SPECIAL_USER(1),
-  GUEST_USER(2);
+  OTHER_USER(1);
 
   private final int value;
 
@@ -38,9 +37,7 @@ public enum NetShareAuth implements org.apache.thrift.TEnum {
       case 0:
         return LOGIN_USER;
       case 1:
-        return SPECIAL_USER;
-      case 2:
-        return GUEST_USER;
+        return OTHER_USER;
       default:
         return null;
     }
diff --git a/src/main/thrift/bwlp.thrift b/src/main/thrift/bwlp.thrift
index 8bafa3a..c2c7d17 100644
--- a/src/main/thrift/bwlp.thrift
+++ b/src/main/thrift/bwlp.thrift
@@ -73,8 +73,7 @@ enum DateParamError {
 
 enum NetShareAuth {
 	LOGIN_USER,
-	SPECIAL_USER,
-	GUEST_USER
+	OTHER_USER
 }
 
 // ############## STRUCT ###############
-- 
cgit v1.2.3-55-g7522