Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sbin/mount_portal Minor and non-functional enhancements in m...
details: https://anonhg.NetBSD.org/src/rev/9fda0dc26a01
branches: trunk
changeset: 353498:9fda0dc26a01
user: kamil <kamil%NetBSD.org@localhost>
date: Tue May 09 23:26:49 2017 +0000
description:
Minor and non-functional enhancements in mount_portal(8)
Since day0 pt_exec.c shipped with a dummy stub for "exec" operation, stop
waiting longer and eliminate it now. This functionality can be achieved
with filters.
Drop FreeBSD CVS repos references. There are certainly still some mirrors
or old mirrors available, but since the project moved to SVN+GIT entirely
drop it.
Add CVS Id - where missing - to the documentation files. This helps users
to determine how recent are the files.
diffstat:
sbin/mount_portal/Makefile | 4 +-
sbin/mount_portal/examples/advanced.1 | 3 +-
sbin/mount_portal/examples/advanced.1.conf | 2 +
sbin/mount_portal/examples/cvs.1 | 11 ++---
sbin/mount_portal/examples/cvs.conf | 3 +-
sbin/mount_portal/examples/cvs.sh.sh | 6 +--
sbin/mount_portal/examples/fing.c | 2 +
sbin/mount_portal/examples/fs.1 | 2 +
sbin/mount_portal/examples/fs.1.conf | 2 +
sbin/mount_portal/examples/rfilter.1 | 2 +
sbin/mount_portal/examples/rfilter.2 | 2 +
sbin/mount_portal/examples/rfilter.2.conf | 4 +-
sbin/mount_portal/examples/tcp.1 | 2 +
sbin/mount_portal/examples/tcp.1.conf | 2 +
sbin/mount_portal/pt_conf.c | 5 +-
sbin/mount_portal/pt_exec.c | 58 ------------------------------
16 files changed, 31 insertions(+), 79 deletions(-)
diffs (255 lines):
diff -r 086817b9f1c8 -r 9fda0dc26a01 sbin/mount_portal/Makefile
--- a/sbin/mount_portal/Makefile Tue May 09 22:43:09 2017 +0000
+++ b/sbin/mount_portal/Makefile Tue May 09 23:26:49 2017 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.26 2016/01/23 21:22:47 christos Exp $
+# $NetBSD: Makefile,v 1.27 2017/05/09 23:26:49 kamil Exp $
# @(#)Makefile 8.3 (Berkeley) 3/27/94
.include <bsd.own.mk>
PROG= mount_portal
SRCS= puffs_portal.c activate.c conf.c pt_conf.c \
- pt_exec.c pt_file.c pt_tcp.c pt_filter.c
+ pt_file.c pt_tcp.c pt_filter.c
SUBDIR= examples
MAN= mount_portal.8
diff -r 086817b9f1c8 -r 9fda0dc26a01 sbin/mount_portal/examples/advanced.1
--- a/sbin/mount_portal/examples/advanced.1 Tue May 09 22:43:09 2017 +0000
+++ b/sbin/mount_portal/examples/advanced.1 Tue May 09 23:26:49 2017 +0000
@@ -1,3 +1,5 @@
+$NetBSD: advanced.1,v 1.6 2017/05/09 23:26:49 kamil Exp $
+
Using the file advanced.1.conf, we might obtain the following results:
% mkdir /p
@@ -107,4 +109,3 @@
% cat /p/sysctl/kern/mbuf/msize
128
-
diff -r 086817b9f1c8 -r 9fda0dc26a01 sbin/mount_portal/examples/advanced.1.conf
--- a/sbin/mount_portal/examples/advanced.1.conf Tue May 09 22:43:09 2017 +0000
+++ b/sbin/mount_portal/examples/advanced.1.conf Tue May 09 23:26:49 2017 +0000
@@ -1,3 +1,5 @@
+# $NetBSD: advanced.1.conf,v 1.3 2017/05/09 23:26:49 kamil Exp $
+#
# This file contains an example of just about every feature.
# The file "advanced.1" provides a walk-through tutorial using
# this configuration.
diff -r 086817b9f1c8 -r 9fda0dc26a01 sbin/mount_portal/examples/cvs.1
--- a/sbin/mount_portal/examples/cvs.1 Tue May 09 22:43:09 2017 +0000
+++ b/sbin/mount_portal/examples/cvs.1 Tue May 09 23:26:49 2017 +0000
@@ -1,3 +1,5 @@
+$NetBSD: cvs.1,v 1.7 2017/05/09 23:26:49 kamil Exp $
+
The cvs.conf portal configuration file maps the NetBSD anoncvs
respository into the local file system. This means you can cat(1)
or cp(1) copies of any arbitrary file or revision from the cvs
@@ -65,10 +67,5 @@
to get rid of any changes you might have made to /etc/security that
you no longer want.
-Note that there's some support for the FreeBSD and OpenBSD anoncvs
-service in there as well, but those might be tricky. The FreeBSD
-anoncvs server only offers pserver access, so you'll need to manually
-do a cvs login to make that work. The OpenBSD server seems to move
-around a fair amount, so the CVSROOT value for it will need to be
-updated if that happens again. You might also choose to use
-different servers entirely.
+Note that there's some support for the OpenBSD anoncvs.
+You might also choose to use different servers entirely.
diff -r 086817b9f1c8 -r 9fda0dc26a01 sbin/mount_portal/examples/cvs.conf
--- a/sbin/mount_portal/examples/cvs.conf Tue May 09 22:43:09 2017 +0000
+++ b/sbin/mount_portal/examples/cvs.conf Tue May 09 23:26:49 2017 +0000
@@ -1,3 +1,4 @@
+# $NetBSD: cvs.conf,v 1.3 2017/05/09 23:26:49 kamil Exp $
+
netbsd/ rfilter netbsd/ /usr/share/examples/mount_portal/cvs.sh netbsd %s
-freebsd/ rfilter freebsd/ /usr/share/examples/mount_portal/cvs.sh freebsd %s
openbsd/ rfilter openbsd/ /usr/share/examples/mount_portal/cvs.sh openbsd %s
diff -r 086817b9f1c8 -r 9fda0dc26a01 sbin/mount_portal/examples/cvs.sh.sh
--- a/sbin/mount_portal/examples/cvs.sh.sh Tue May 09 22:43:09 2017 +0000
+++ b/sbin/mount_portal/examples/cvs.sh.sh Tue May 09 23:26:49 2017 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: cvs.sh.sh,v 1.3 2003/07/26 19:46:33 salo Exp $
+# $NetBSD: cvs.sh.sh,v 1.4 2017/05/09 23:26:49 kamil Exp $
# ensure that HOME is set for pserver modes
UID=`id -u`
@@ -15,10 +15,6 @@
export CVSROOT="anoncvs%anoncvs.NetBSD.org@localhost:/cvsroot"
shift
;;
- freebsd)
- export CVSROOT=":pserver:anoncvs%anoncvs.freebsd.org@localhost:/home/ncvs"
- shift
- ;;
openbsd)
export CVSROOT="anoncvs%anoncvs.usa.openbsd.org@localhost:/cvs"
shift
diff -r 086817b9f1c8 -r 9fda0dc26a01 sbin/mount_portal/examples/fing.c
--- a/sbin/mount_portal/examples/fing.c Tue May 09 22:43:09 2017 +0000
+++ b/sbin/mount_portal/examples/fing.c Tue May 09 23:26:49 2017 +0000
@@ -1,3 +1,5 @@
+/* $NetBSD: fing.c,v 1.3 2017/05/09 23:26:49 kamil Exp $ */
+
#include <err.h>
#include <stdio.h>
diff -r 086817b9f1c8 -r 9fda0dc26a01 sbin/mount_portal/examples/fs.1
--- a/sbin/mount_portal/examples/fs.1 Tue May 09 22:43:09 2017 +0000
+++ b/sbin/mount_portal/examples/fs.1 Tue May 09 23:26:49 2017 +0000
@@ -1,3 +1,5 @@
+$NetBSD: fs.1,v 1.2 2017/05/09 23:26:49 kamil Exp $
+
Use the following configuration file (also stored in fs.1.conf):
fs/ file fs/
diff -r 086817b9f1c8 -r 9fda0dc26a01 sbin/mount_portal/examples/fs.1.conf
--- a/sbin/mount_portal/examples/fs.1.conf Tue May 09 22:43:09 2017 +0000
+++ b/sbin/mount_portal/examples/fs.1.conf Tue May 09 23:26:49 2017 +0000
@@ -1,1 +1,3 @@
+# $NetBSD: fs.1.conf,v 1.2 2017/05/09 23:26:49 kamil Exp $
+
fs/ file fs/
diff -r 086817b9f1c8 -r 9fda0dc26a01 sbin/mount_portal/examples/rfilter.1
--- a/sbin/mount_portal/examples/rfilter.1 Tue May 09 22:43:09 2017 +0000
+++ b/sbin/mount_portal/examples/rfilter.1 Tue May 09 23:26:49 2017 +0000
@@ -1,3 +1,5 @@
+$NetBSD: rfilter.1,v 1.2 2017/05/09 23:26:49 kamil Exp $
+
If you don't already have bzip2 and bzcat installed, this example
won't work.
diff -r 086817b9f1c8 -r 9fda0dc26a01 sbin/mount_portal/examples/rfilter.2
--- a/sbin/mount_portal/examples/rfilter.2 Tue May 09 22:43:09 2017 +0000
+++ b/sbin/mount_portal/examples/rfilter.2 Tue May 09 23:26:49 2017 +0000
@@ -1,3 +1,5 @@
+$NetBSD: rfilter.2,v 1.3 2017/05/09 23:26:49 kamil Exp $
+
Advanced rfilter usage: the strip key, and cmd:// notation
diff -r 086817b9f1c8 -r 9fda0dc26a01 sbin/mount_portal/examples/rfilter.2.conf
--- a/sbin/mount_portal/examples/rfilter.2.conf Tue May 09 22:43:09 2017 +0000
+++ b/sbin/mount_portal/examples/rfilter.2.conf Tue May 09 23:26:49 2017 +0000
@@ -1,3 +1,5 @@
+# $NetBSD: rfilter.2.conf,v 1.2 2017/05/09 23:26:49 kamil Exp $
+
# Comments are okay.
echo/ rfilter echo/ echo %s
echo_nostrip/ rfilter no_strip echo %s
@@ -9,5 +11,3 @@
# A solution for the problem mentioned in the second example.
ftp%// rfilter ftp%// ftp -Vo - ftp://%s
-
-
diff -r 086817b9f1c8 -r 9fda0dc26a01 sbin/mount_portal/examples/tcp.1
--- a/sbin/mount_portal/examples/tcp.1 Tue May 09 22:43:09 2017 +0000
+++ b/sbin/mount_portal/examples/tcp.1 Tue May 09 23:26:49 2017 +0000
@@ -1,3 +1,5 @@
+$NetBSD: tcp.1,v 1.3 2017/05/09 23:26:49 kamil Exp $
+
Use the following configuration file, tcp.1.conf:
tcp/ tcp tcp/
diff -r 086817b9f1c8 -r 9fda0dc26a01 sbin/mount_portal/examples/tcp.1.conf
--- a/sbin/mount_portal/examples/tcp.1.conf Tue May 09 22:43:09 2017 +0000
+++ b/sbin/mount_portal/examples/tcp.1.conf Tue May 09 23:26:49 2017 +0000
@@ -1,1 +1,3 @@
+# $NetBSD: tcp.1.conf,v 1.2 2017/05/09 23:26:49 kamil Exp $
+
tcp/ tcp tcp/
diff -r 086817b9f1c8 -r 9fda0dc26a01 sbin/mount_portal/pt_conf.c
--- a/sbin/mount_portal/pt_conf.c Tue May 09 22:43:09 2017 +0000
+++ b/sbin/mount_portal/pt_conf.c Tue May 09 23:26:49 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pt_conf.c,v 1.7 2003/08/07 10:04:30 agc Exp $ */
+/* $NetBSD: pt_conf.c,v 1.8 2017/05/09 23:26:49 kamil Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: pt_conf.c,v 1.7 2003/08/07 10:04:30 agc Exp $");
+__RCSID("$NetBSD: pt_conf.c,v 1.8 2017/05/09 23:26:49 kamil Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -45,7 +45,6 @@
#include "portald.h"
provider providers[] = {
- { "exec", portal_exec },
{ "file", portal_file },
{ "tcp", portal_tcp },
{ "rfilter", portal_rfilter },
diff -r 086817b9f1c8 -r 9fda0dc26a01 sbin/mount_portal/pt_exec.c
--- a/sbin/mount_portal/pt_exec.c Tue May 09 22:43:09 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/* $NetBSD: pt_exec.c,v 1.9 2007/07/02 18:07:45 pooka Exp $ */
-
-/*
- * Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * This code is derived from software donated to Berkeley by
- * Jan-Simon Pendry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * from: Id: pt_exec.c,v 1.1 1992/05/25 21:43:09 jsp Exp
- * @(#)pt_exec.c 8.1 (Berkeley) 6/5/93
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: pt_exec.c,v 1.9 2007/07/02 18:07:45 pooka Exp $");
-#endif /* not lint */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/syslog.h>
-
-#include "portald.h"
-
-int
-portal_exec(struct portal_cred *pcr, char *key, char **v, int *fdp)
-{
-
- return (ENOEXEC);
-}
Home |
Main Index |
Thread Index |
Old Index