Browse Source

Ticket #2279: mcserver is deprecated.

Removed mcserver and mcfs support.

Reasons:
(1) no longer builds
(2) no one is willing to support it
(3) possibly contains unfixed security holes
(4) makes no sense in view of the availability of FISH

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Andrew Borodin 14 years ago
parent
commit
6a55c9320e
10 changed files with 5 additions and 107 deletions
  1. 0 1
      acinclude.m4
  2. 2 7
      configure.ac
  3. 1 1
      contrib/Makefile.am
  4. 0 68
      contrib/mcserv.init
  5. 0 6
      contrib/mcserv.pamd
  6. 1 2
      doc/HACKING
  7. 0 12
      doc/INSTALL
  8. 1 1
      doc/README
  9. 0 5
      doc/README.QNX
  10. 0 4
      doc/TODO

+ 0 - 1
acinclude.m4

@@ -3,7 +3,6 @@ m4_include([m4.include/ax_path_lib_pcre.m4])
 m4_include([m4.include/dx_doxygen.m4])
 m4_include([m4.include/mc-cflags.m4])
 m4_include([m4.include/mc-check-search-type.m4])
-m4_include([m4.include/mc-mcserver.m4])
 m4_include([m4.include/ac-get-fs-info.m4])
 m4_include([m4.include/mc-use-termcap.m4])
 m4_include([m4.include/mc-with-screen.m4])

+ 2 - 7
configure.ac

@@ -544,7 +544,6 @@ AM_CONDITIONAL(USE_EDIT, [test -n "$use_edit"])
 AM_CONDITIONAL(USE_DIFF, [test -n "$use_diff"])
 AM_CONDITIONAL(ENABLE_VFS_NET, [test x"$use_net_code" = xtrue])
 AM_CONDITIONAL(USE_SAMBA_FS, [test -n "$use_smbfs"])
-AM_CONDITIONAL(ENABLE_MCSERVER, [test x"$enable_mcserver" = "xyes"])
 AM_CONDITIONAL(CHARSET, [test -n "$have_charset"])
 AM_CONDITIONAL(CONS_SAVER, [test -n "$cons_saver"])
 
@@ -622,13 +621,13 @@ misc/syntax/Makefile
 
 doc/Makefile
 doc/hints/Makefile
-doc/man/mc.1 doc/man/mcedit.1 doc/man/mcview.1 doc/man/mcserv.8 doc/man/Makefile
+doc/man/mc.1 doc/man/mcedit.1 doc/man/mcview.1 doc/man/Makefile
 doc/man/es/mc.1 doc/man/es/Makefile
 doc/man/hu/mc.1 doc/man/hu/Makefile
 doc/man/it/mc.1 doc/man/it/Makefile
 doc/man/pl/mc.1 doc/man/pl/Makefile
 doc/man/ru/mc.1 doc/man/ru/Makefile
-doc/man/sr/mc.1 doc/man/sr/mcserv.8 doc/man/sr/Makefile
+doc/man/sr/mc.1 doc/man/sr/Makefile
 
 doc/hlp/Makefile
 doc/hlp/es/Makefile
@@ -644,10 +643,6 @@ po/Makefile.in
 
 AC_OUTPUT
 
-if test x$enable_mcserver = x; then
-    enable_mcserver='no'
-fi
-
 echo "
 Configuration:
 

+ 1 - 1
contrib/Makefile.am

@@ -2,7 +2,7 @@
 
 SUBDIRS = dist
 
-noinst_DATA = README.xterm mcserv.init mcserv.pamd
+noinst_DATA = README.xterm
 
 SCRIPTS_IN = mc.csh.in mc.sh.in mc-wrapper.csh.in mc-wrapper.sh.in
 SCRIPTS_OUT = mc.csh mc.sh mc-wrapper.csh mc-wrapper.sh

+ 0 - 68
contrib/mcserv.init

@@ -1,68 +0,0 @@
-#! /bin/sh
-#
-# skeleton      Example file to build /etc/init.d scripts.
-#
-# Version:      @(#) /etc/init.d/mcserv  07/10/2000
-#
-# Author:       Tomasz K³oczko, <kloczek@rudy.mif.pg.gda.pl>
-#               Michele Marziani <marziani@fe.infn.it>
-#		Preston Brown <pbrown@redhat.com>
-#
-# chkconfig: - 86 30
-# description: The Midnight Commander server allows users on remote machines \
-#	       to use the Midnight Commander file manager to manipulate their \
-#	       files on the machine running the server. The server  \
-#              authenticates the user through PAM, which by default requires \
-#              a username/password combination before allowing access.
-# processname: mcserv
-
-# Source function library.
-. /etc/init.d/functions
-
-RETVAL=0
-
-prog="mcserv"
-
-start() {
-        echo -n $"Starting $prog: "
-       daemon /usr/bin/mcserv -d
-       RETVAL=$?
-       touch /var/lock/subsys/mcserv
-       echo
-}
-
-stop() {
-        echo -n $"Stopping $prog: "
-       killproc mcserv
-       RETVAL=$?
-       rm -f /var/lock/subsys/mcserv
-       echo
-}
-
-# See how we were called.
-case "$1" in
-  start)
-	start
-	;;
-  status)
-        status mcserv
-	;;
-  restart|reload)
-        stop
-	start
-        ;;
-  condrestart)
-	if [ -f /var/lock/subsys/mcserv ]; then
-    	    stop
-	    start
-	fi
-	;;
-  stop)
-	stop
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
-	exit 1
-esac
-
-exit $RETVAL

+ 0 - 6
contrib/mcserv.pamd

@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth       required	/lib/security/pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed
-auth       required	/lib/security/pam_stack.so service=system-auth
-auth       required	/lib/security/pam_shells.so
-account    required	/lib/security/pam_stack.so service=system-auth
-session    required	/lib/security/pam_stack.so service=system-auth

+ 1 - 2
doc/HACKING

@@ -357,8 +357,7 @@ NULL: When you pass NULL as an argument of a varargs function, cast the
 
 	This tip applies at least to catstrs (edit/edit.h), execl(3),
 	execle(3), execlp(3), g_strconcat (glib), parent_call
-	(src/background.h), parent_call_string (src/background.h),
-	rpc_get (vfs/mcfsutil.h), rpc_send (vfs/mcfsutil.h).
+	(src/background.h), parent_call_string (src/background.h).
 
 	example:
 	char *path = g_strconcat("dir", "/", "file", (char *)0);

+ 0 - 12
doc/INSTALL

@@ -178,18 +178,6 @@ VFS options:
      libext2fs library available, this option adds support for
      recovering deleted files (the undel virtual file system).
 
-`--enable-vfs-mcfs'
-     Enable Support MCFS (mc's network filesystem).
-     This option enables mcfs - a non-standard remote filesystem
-     designed specifically for the Midnight Commander.  It also enables
-     a server for that filesystem, mcserv.  Please note that the
-     implementation of mcfs is not optimized for speed.  There may be
-     security issues with mcserv - don't run it if you don't need it.
-
-`--enable-mcserver'
-     (off by default)
-     Support mc-specific networking file system server
-
 `--disable-netcode'
      This option disables support for networked virtual filesystems.
      It's primarily used by developers to make sure that the code would

+ 1 - 1
doc/README

@@ -133,7 +133,7 @@ These are hints for the text mode edition:
 
 * The Virtual File System is a cute addition to the project, you may
   browse in tar and compressed tar files as well as browsing remote
-  machines with the mcfs file system.
+  machines with the fish file system.
 
 * Please read the manual page.
 

+ 0 - 5
doc/README.QNX

@@ -276,11 +276,6 @@ src/
 
 vfs/
 
-  Makefile.in:
-
-    'install' target: 'mcserv' not installed, if net-code not enabled
-    by 'configure'.
-
 <mc-src-root>/
 
   README.QNX:

+ 0 - 4
doc/TODO

@@ -310,10 +310,6 @@ ideas still waiting for their implementation.
 
 * Optimizations and cleanup
 
-  - Optimize the mcfs read and write code: make the code output 8k
-    blocks all the time (if we have called mc_hint_readall) and probe
-    the input for a possible cancel.
-
   - When verbose is off, remove all the clutter on the screen about
     the files being copied.
 

Some files were not shown because too many files changed in this diff