[Development] Extend Security class to allow different default sectypes for server/viewer.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4122 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/rfb/Security.cxx b/common/rfb/Security.cxx
index 4102920..600df14 100644
--- a/common/rfb/Security.cxx
+++ b/common/rfb/Security.cxx
@@ -52,14 +52,28 @@
UserPasswdGetter *CSecurity::upg = NULL;
-StringParameter Security::secTypes
+StringParameter Security::secTypesViewer
("SecurityTypes",
"Specify which security scheme to use (None, VncAuth)",
- "VncAuth");
+ "VncAuth", ConfViewer);
-Security::Security(void)
+StringParameter Security::secTypesServer
+("SecurityTypes",
+ "Specify which security scheme to use (None, VncAuth)",
+ "VncAuth", ConfServer);
+
+Security::Security(SecurityClassType secClassType)
{
- char *secTypesStr = secTypes.getData();
+ char *secTypesStr;
+
+ switch (secClassType) {
+ case SecurityViewer:
+ secTypesStr = secTypesViewer.getData();
+ break;
+ case SecurityServer:
+ secTypesStr = secTypesServer.getData();
+ break;
+ };
enabledSecTypes = parseSecTypes(secTypesStr);