View | Details | Raw Unified | Return to bug 33884
Collapse All | Expand All

(-)RDP.back (-9 / +28 lines)
 Lines 50-55    Link Here 
50
    exit
50
    exit
51
}
51
}
52
52
53
function already_joined {
54
  if [ -n "$ldap_base" ] && [ -n "$rdp_domainname" ] &&  [ -n "$rdp_server" ]; then
55
    joined="true"
56
  else
57
    joined="false"
58
  fi
59
}
60
53
eval "$(/usr/sbin/univention-config-registry shell)"
61
eval "$(/usr/sbin/univention-config-registry shell)"
54
62
55
params=(-f)
63
params=(-f)
 Lines 72-82    Link Here 
72
	params+=(--ignore-certificate)
80
	params+=(--ignore-certificate)
73
fi
81
fi
74
82
75
if test -e /tmp/password-store-$USER; then
76
    PASSWD=`cat /tmp/password-store-$USER | base64 --decode`
77
    params+=(-p "$PASSWD")
78
fi
79
80
if [ -n "$rdp_keyboard" ]; then
83
if [ -n "$rdp_keyboard" ]; then
81
    params+=(-k "$rdp_keyboard")
84
    params+=(-k "$rdp_keyboard")
82
else
85
else
 Lines 100-109    Link Here 
100
103
101
if [ -n "$rdp_user" ]; then
104
if [ -n "$rdp_user" ]; then
102
    params+=(-u "$rdp_user")
105
    params+=(-u "$rdp_user")
106
    if test -e /tmp/password-store-$USER; then
107
      PASSWD=`cat /tmp/password-store-$USER | base64 --decode`
108
      params+=(-p "$PASSWD")
109
    fi
110
103
else
111
else
104
112
105
if [[ $USER == guest-* ]]; then
113
joined="false"
106
	messageFile=$(mktemp)
114
  if [[ $USER == guest-* ]]; then
115
    already_joined
116
    if [[ $joined == true ]]; then
117
      echo "Disabling NLA validation"
118
      params+=(--no-nla)
119
    else
120
      messageFile=$(mktemp)
107
	echo "
121
	echo "
108
You're currently logged in with a guest user account. This usually means
122
You're currently logged in with a guest user account. This usually means
109
that the UCC system hasn't been joined into the UCS domain yet.
123
that the UCC system hasn't been joined into the UCS domain yet.
 Lines 122-130    Link Here 
122
" >>$messageFile
136
" >>$messageFile
123
	xmessage -file "$messageFile"
137
	xmessage -file "$messageFile"
124
	/usr/bin/startlxde
138
	/usr/bin/startlxde
125
else
139
    fi
140
  else
126
    params+=(-u "$USER")
141
    params+=(-u "$USER")
127
	fi
142
    if test -e /tmp/password-store-$USER; then
143
      PASSWD=`cat /tmp/password-store-$USER | base64 --decode`
144
      params+=(-p "$PASSWD")
145
    fi
146
  fi
128
fi
147
fi
129
148
130
if [ -n "$rdp_domainname" ]; then
149
if [ -n "$rdp_domainname" ]; then

Return to bug 33884