|
Lines 85-90
Link Here
|
| 85 |
echo $sessionid |
85 |
echo $sessionid |
| 86 |
} |
86 |
} |
| 87 |
|
87 |
|
|
|
88 |
setup_samba() |
| 89 |
{ |
| 90 |
smbport="" |
| 91 |
|
| 92 |
# We know from protocol traces that client=linux,winnt,macosx are valid values. |
| 93 |
# I hope with smbclientproto=smb on default and smbclientproto=cifs on all valid |
| 94 |
# values we get support for all those systems. |
| 95 |
|
| 96 |
smbproto="$SAMBA_MOUNT_SHARE_PROTOCOL" |
| 97 |
|
| 98 |
if [ "$smbproto" = "both" ] |
| 99 |
then |
| 100 |
smbproto="smbfs" |
| 101 |
|
| 102 |
[ "$client" = "linux" ] && smbproto="cifs" |
| 103 |
[ "$client" = "winnt" ] && smbproto="cifs" |
| 104 |
[ "$client" = "macosx" ] && smbproto="cifs" |
| 105 |
|
| 106 |
# FIXME: This is a rather wild guess |
| 107 |
[ "$client" = "win9x" ] && smbproto="smbfs" |
| 108 |
fi |
| 109 |
|
| 110 |
if [ "$smbproto" = "cifs" ] |
| 111 |
then |
| 112 |
smbport=445 |
| 113 |
COMMAND_SMBMOUNT=$COMMAND_SMBMOUNT_CIFS |
| 114 |
COMMAND_SMBUMOUNT=$COMMAND_SMBUMOUNT_CIFS |
| 115 |
elif [ "$smbproto" = "none" ] # none |
| 116 |
then |
| 117 |
# we set this to true so that the |
| 118 |
# SMB mount does not give an error message. |
| 119 |
|
| 120 |
COMMAND_SMBMOUNT=/bin/true |
| 121 |
COMMAND_SMBUMOUNT=/bin/true |
| 122 |
else # smbfs |
| 123 |
smbport=139 |
| 124 |
fi |
| 125 |
} |
| 126 |
|
| 88 |
# |
127 |
# |
| 89 |
# ----------------------------------------------------------------------------- |
128 |
# ----------------------------------------------------------------------------- |
| 90 |
# Node functions module |
129 |
# Node functions module |
|
Lines 735-740
Link Here
|
| 735 |
|
774 |
|
| 736 |
node_umount_smb() |
775 |
node_umount_smb() |
| 737 |
{ |
776 |
{ |
|
|
777 |
setup_samba |
| 738 |
[ -e "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/mpoint" ] || return |
778 |
[ -e "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/mpoint" ] || return |
| 739 |
cat "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/mpoint" | while read mpoint |
779 |
cat "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/mpoint" | while read mpoint |
| 740 |
do |
780 |
do |
|
Lines 1136-1174
Link Here
|
| 1136 |
|
1176 |
|
| 1137 |
if [ "$samba" = "1" ] |
1177 |
if [ "$samba" = "1" ] |
| 1138 |
then |
1178 |
then |
| 1139 |
# We know from protocol traces that client=linux,winnt,macosx are valid values. |
1179 |
setup_samba |
| 1140 |
# I hope with smbclientproto=smb on default and smbclientproto=cifs on all valid |
|
|
| 1141 |
# values we get support for all those systems. |
| 1142 |
|
| 1143 |
smbproto="$SAMBA_MOUNT_SHARE_PROTOCOL" |
| 1144 |
|
| 1145 |
if [ "$smbproto" = "both" ] |
| 1146 |
then |
| 1147 |
smbproto="smbfs" |
| 1148 |
|
| 1149 |
[ "$client" = "linux" ] && smbproto="cifs" |
| 1150 |
[ "$client" = "winnt" ] && smbproto="cifs" |
| 1151 |
[ "$client" = "macosx" ] && smbproto="cifs" |
| 1152 |
|
| 1153 |
# FIXME: This is a rather wild guess |
| 1154 |
[ "$client" = "win9x" ] && smbproto="smbfs" |
| 1155 |
fi |
| 1156 |
|
| 1157 |
if [ "$smbproto" = "cifs" ] |
| 1158 |
then |
| 1159 |
smbport=445 |
| 1160 |
COMMAND_SMBMOUNT=$COMMAND_SMBMOUNT_CIFS |
| 1161 |
COMMAND_SMBUMOUNT=$COMMAND_SMBUMOUNT_CIFS |
| 1162 |
elif [ "$smbproto" = "none" ] # none |
| 1163 |
then |
| 1164 |
# we set this to true so that the |
| 1165 |
# SMB mount does not give an error message. |
| 1166 |
|
| 1167 |
COMMAND_SMBMOUNT=/bin/true |
| 1168 |
COMMAND_SMBUMOUNT=/bin/true |
| 1169 |
else # smbfs |
| 1170 |
smbport=139 |
| 1171 |
fi |
| 1172 |
fi |
1180 |
fi |
| 1173 |
|
1181 |
|
| 1174 |
# FreeNX specific variables |
1182 |
# FreeNX specific variables |
|
Lines 1430-1435
Link Here
|
| 1430 |
|
1438 |
|
| 1431 |
cmd_node_smbmount() |
1439 |
cmd_node_smbmount() |
| 1432 |
{ |
1440 |
{ |
|
|
1441 |
setup_samba |
| 1433 |
sessionid=$(getparam_sessionid) |
1442 |
sessionid=$(getparam_sessionid) |
| 1434 |
port=$(getparam port) |
1443 |
port=$(getparam port) |
| 1435 |
username=$(getparam username) |
1444 |
username=$(getparam username) |
