Merge pull request #1668 from bolkedebruin/enable_token_sso

Add support for token authentication

common/os_calls.c

@@ -2590,6 +2590,19 @@ g_strcat(char *dest, const char *src)
     return strcat(dest, src);
 }
 
+/*****************************************************************************/
+/* returns dest */
+char *
+g_strncat(char *dest, const char *src, int len)
+{
+    if (dest == 0 || src == 0)
+    {
+        return dest;
+    }
+
+    return strncat(dest, src, len);
+}
+
 /*****************************************************************************/
 /* if in = 0, return 0 else return newly alloced copy of in */
 char *

common/os_calls.h

@@ -124,6 +124,7 @@ const char *g_strchr(const char *text, int c);
 char*    g_strcpy(char* dest, const char* src);
 char*    g_strncpy(char* dest, const char* src, int len);
 char*    g_strcat(char* dest, const char* src);
+char*    g_strncat(char* dest, const char* src, int len);
 char*    g_strdup(const char* in);
 char*    g_strndup(const char* in, const unsigned int maxlen);
 int      g_strcmp(const char* c1, const char* c2);

common/xrdp_client_info.h

@@ -159,6 +159,9 @@ struct xrdp_client_info
   int use_cache_glyph_v2;
   int rail_enable;
   int suppress_output;
+
+  int enable_token_login;
+  char domain_user_separator[16];
 };
 
 #endif