[FreeNX-kNX] JJK: All patches applied

Sat Aug 11 17:19:32 UTC 2007

Hi,

I have now all your patches applied. Thanks a lot.

I also found the right way to tell nxclient which port to forward for file sharing and applied that to SVN. (see attached changeset below)

Unfortunately all other three mails bounced and I just saw it, so you might have wondered why you did never get any reply from me. (but I just wrote there that I applied your patches and a longer mail regarding your first mail ...)

Anyway, finally being in contact with you, thank you for your patches and hope you are happy that you do no longer need to do a manual port forwarding.

cu

Fabian

PS: A copy goes to freenx-knx so that its archived and that it might reach you over that way.


-------- Original-Nachricht --------
Datum: Sat, 11 Aug 2007 19:08:08 +0200
Von: fabianx at BerliOS <fabianx at mail.berlios.de>
An: freenx-cvs at lists.berlios.de
Betreff: [Freenx-cvs] r362 - freenx-server/trunk

Author: fabianx
Date: 2007-08-11 19:08:07 +0200 (Sat, 11 Aug 2007)
New Revision: 362

Modified:
   freenx-server/trunk/ChangeLog
   freenx-server/trunk/node.conf.sample
   freenx-server/trunk/nxloadconfig
   freenx-server/trunk/nxnode
Log:
* Added support for mount.cifs additionally to the deprecated
  smbmount. (fabianx at bat.berlios.de, puterguy at bat.berlios.de)



Modified: freenx-server/trunk/ChangeLog
===================================================================

--- freenx-server/trunk/ChangeLog	2007-08-09 15:58:11 UTC (rev 361)
+++ freenx-server/trunk/ChangeLog	2007-08-11 17:08:07 UTC (rev 362)
@@ -10,12 +10,14 @@
 	  will work on any machine that has dialog and xterm.
 	  (puterguy at bat.berlios.de)
 	* Fixed the APPLICATION_LIBRARY_PRELOAD to be just a warning and fixed 
-	  the default path.
+	  the default path. (fabianx at bat.berlios.de)
 	* Added drivers.cache.all that is reloaded just every 60 minutes.
 	  (puterguy at bat.berlios.de)
 	* Fixed missing services stop that lead to redundant mounts and still
 	  running cupsd processes.
 	  (puterguy at bat.berlios.de)
+	* Added support for mount.cifs additionally to the deprecated
+	  smbmount. (fabianx at bat.berlios.de, puterguy at bat.berlios.de)
 
 07.07.2007 FreeNX 0.7.0 "Jornade SPL Edition VI+1"
 	* Fixed the printing support for CUPS 1.2.

Modified: freenx-server/trunk/node.conf.sample
===================================================================
--- freenx-server/trunk/node.conf.sample	2007-08-09 15:58:11 UTC (rev 361)
+++ freenx-server/trunk/node.conf.sample	2007-08-11 17:08:07 UTC (rev 362)
@@ -294,6 +294,18 @@
 #CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock"
 #CUPS_ETC="/etc/cups"
 
+# SAMBA_MOUNT_SHARE_PROTOCOL is a key to configure the supported 
+# protocols for mounting shares.
+#
+# This key can be set to the following values:
+#
+# both, either SMB and CIFS protocol are supported, this is the default value.
+# smbfs, only SMB protocol is supported.
+# cifs, only CIFS protocol is supported.
+# none, no network file-sharing protocol is supported.
+
+#SAMBA_MOUNT_SHARE_PROTOCOL="both"
+
 #########################################################################
 # Path directives
 #########################################################################
@@ -357,6 +369,14 @@
 # 'smbumount'.
 #COMMAND_SMBUMOUNT=smbumount
 
+# The key that contains the name of the complete path of command name
+# 'mount.cifs'.
+#COMMAND_SMBMOUNT_CIFS=/sbin/mount.cifs
+
+# The key that contains the name of the complete path of command name
+# 'umount.cifs'.
+#COMMAND_SMBUMOUNT_CIFS=/sbin/umount.cifs
+
 # The key that contains the name of the complete path of the 'netcat' command.
 #COMMAND_NETCAT=netcat
 

Modified: freenx-server/trunk/nxloadconfig
===================================================================
--- freenx-server/trunk/nxloadconfig	2007-08-09 15:58:11 UTC (rev 361)
+++ freenx-server/trunk/nxloadconfig	2007-08-11 17:08:07 UTC (rev 362)
@@ -157,6 +157,8 @@
 CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock"
 CUPS_ETC="/etc/cups/"
 
+SAMBA_MOUNT_SHARE_PROTOCOL="both"
+
 # Path directives
 
 USER_FAKE_HOME="" #Calculated
@@ -173,6 +175,8 @@
 COMMAND_XAUTH=/usr/X11R6/bin/xauth
 COMMAND_SMBMOUNT=smbmount
 COMMAND_SMBUMOUNT=smbumount
+COMMAND_SMBMOUNT_CIFS=/sbin/mount.cifs
+COMMAND_SMBUMOUNT_CIFS=/sbin/umount.cifs
 COMMAND_NETCAT=netcat
 COMMAND_SSH=ssh
 COMMAND_SSH_KEYGEN=ssh-keygen

Modified: freenx-server/trunk/nxnode
===================================================================
--- freenx-server/trunk/nxnode	2007-08-09 15:58:11 UTC (rev 361)
+++ freenx-server/trunk/nxnode	2007-08-11 17:08:07 UTC (rev 362)
@@ -1011,6 +1011,48 @@
 	# Rootless fix from 2x nxserver 1.5.0
 	realtype=$type
 	[ "$type" = "unix-application" -o "$type" = "unix-default" ] && realtype="unix-desktop"
+
+	# NX 2.1.0 file-sharing port options
+	client=$(getparam client)
+
+	smbport=""
+
+	if [ "$samba" = "1" ]
+	then
+		# We know from protocol traces that client=linux,winnt,macosx are valid values.
+		# I hope with smbclientproto=smb on default and smbclientproto=cifs on all valid
+		# values we get support for all those systems.
+
+		smbproto="$SAMBA_MOUNT_SHARE_PROTOCOL"
+
+		if [ "$smbproto" = "both" ]
+		then
+			smbproto="smbfs"
+
+			[ "$client" = "linux" ] && smbproto="cifs"
+			[ "$client" = "winnt" ] && smbproto="cifs"
+			[ "$client" = "macosx" ] && smbproto="cifs"
+
+			# FIXME: This is a rather wild guess
+			[ "$client" = "win9x" ] && smbproto="smbfs"
+		fi
+
+		if [ "$smbproto" = "cifs" ]
+		then
+			smbport=445
+			COMMAND_SMBMOUNT=$COMMAND_SMBMOUNT_CIFS
+			COMMAND_SMBUMOUNT=$COMMAND_SMBUMOUNT_CIFS
+		elif [ "$smbproto" = "none" ] # none
+		then
+			# we set this to true so that the 
+			# SMB mount does not give an error message.
+
+			COMMAND_SMBMOUNT=/bin/true
+			COMMAND_SMBUMOUNT=/bin/true
+		else # smbfs
+			smbport=139
+		fi
+	fi
 	
 	# FreeNX specific variables
 	clientproto=$(getparam clientproto)
@@ -1148,6 +1190,9 @@
 NX> 707 SSL tunneling: $ssl_tunnel
 EOF
 
+# File-sharing port options
+[ "$samba" = "1" -a -n "$smbport" ] && echo "NX> 709 File-sharing port: $smbport"
+
 # collection ...
 
 # NX> 1004 Error:

_______________________________________________
Freenx-cvs mailing list
Freenx-cvs at lists.berlios.de
https://lists.berlios.de/mailman/listinfo/freenx-cvs

!DSPAM:46bded1a290076033044490!

