[Midnightbsd-cvs] src: usr.bin/ncplist: sync with freebsd 7
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Mar 27 18:34:08 EDT 2009
Log Message:
-----------
sync with freebsd 7
Modified Files:
--------------
src/usr.bin/ncplist:
ncplist.1 (r1.1.1.1 -> r1.2)
ncplist.c (r1.1.1.1 -> r1.2)
src/usr.bin/ncplogin:
ncplogin.1 (r1.1.1.1 -> r1.2)
ncplogin.c (r1.1.1.1 -> r1.2)
ncplogout.1 (r1.1.1.1 -> r1.2)
-------------- next part --------------
Index: ncplist.c
===================================================================
RCS file: /home/cvs/src/usr.bin/ncplist/ncplist.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L usr.bin/ncplist/ncplist.c -L usr.bin/ncplist/ncplist.c -u -r1.1.1.1 -r1.2
--- usr.bin/ncplist/ncplist.c
+++ usr.bin/ncplist/ncplist.c
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/ncplist/ncplist.c,v 1.2 2002/04/28 12:21:31 markm Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/ncplist/ncplist.c,v 1.3 2007/02/05 07:35:23 kevlo Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -380,7 +380,7 @@
bzero(args, sizeof(args));
what = LO_NONE;
- while ((opt = getopt(argc, argv, "h")) != EOF) {
+ while ((opt = getopt(argc, argv, "h")) != -1) {
switch (opt) {
case 'h': case '?':
help();
Index: ncplist.1
===================================================================
RCS file: /home/cvs/src/usr.bin/ncplist/ncplist.1,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L usr.bin/ncplist/ncplist.1 -L usr.bin/ncplist/ncplist.1 -u -r1.1.1.1 -r1.2
--- usr.bin/ncplist/ncplist.1
+++ usr.bin/ncplist/ncplist.1
@@ -1,27 +1,27 @@
-.\" $FreeBSD: src/usr.bin/ncplist/ncplist.1,v 1.9 2001/04/18 15:51:52 ru Exp $
+.\" $FreeBSD: src/usr.bin/ncplist/ncplist.1,v 1.11 2006/12/15 13:40:53 ru Exp $
.Dd June 24, 1999
.Dt NCPLIST 1
.Os
.Sh NAME
.Nm ncplist
-.Nd displays various information about ncplib and NetWare servers
+.Nd "display various information about ncplib and NetWare servers"
.Sh SYNOPSIS
.Nm
.Ar command
-.Op Ar args
+.Op Ar arguments
.Sh DESCRIPTION
The
.Nm
-command used to display state of ncplib and NetWare servers.
+utility displays the state of ncplib and NetWare servers.
The first argument
-is a one letter
+is a one-letter
.Ar command
-following by optional
-.Ar args .
+that may be followed by
+.Ar arguments .
.Pp
The commands are:
.Bl -tag -width indent
-.It b Ar server Ar type Op Ar pattern
+.It Ic b Ar server type Op Ar pattern
Lists bindery objects of
.Ar type
on a specified
@@ -30,33 +30,39 @@
.Ar type
argument
can be one of the following:
-.Bd -literal -offset indent
-Type Meaning
-user bindery users
-group bindery groups
-pserver bindery print servers
-tree tree name hosted by given server
-.Ed
+.Pp
+.Bl -tag -width ".Cm pserver" -offset indent -compact
+.It Em Type
+.Em Meaning
+.It Cm user
+bindery users
+.It Cm group
+bindery groups
+.It Cm pserver
+bindery print servers
+.It Cm tree
+tree name hosted by given server
+.El
.Pp
Note that if you are not logged in to the specified server,
the list may be incomplete or empty.
-.It c
+.It Ic c
List active NCP connections on the local machine.
-.It s Op Ar server
+.It Ic s Op Ar server
Display
.Tn NetWare
servers known to a given
.Ar server .
If no server is specified, the nearest server will be used.
-.It u Ar server
+.It Ic u Ar server
Displays a list of users logged in on a given
.Ar server .
If you are not logged in to the specified server,
the list will be empty.
-.It q Ar server Op Ar pattern
+.It Ic q Ar server Op Ar pattern
Displays bindery queues on a given
.Ar server .
-.It v Ar server
+.It Ic v Ar server
Displays mounted volumes on a given
.Ar server .
.El
Index: ncplogin.1
===================================================================
RCS file: /home/cvs/src/usr.bin/ncplogin/ncplogin.1,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L usr.bin/ncplogin/ncplogin.1 -L usr.bin/ncplogin/ncplogin.1 -u -r1.1.1.1 -r1.2
--- usr.bin/ncplogin/ncplogin.1
+++ usr.bin/ncplogin/ncplogin.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.bin/ncplogin/ncplogin.1,v 1.12 2002/04/20 12:16:11 charnier Exp $
+.\" $FreeBSD: src/usr.bin/ncplogin/ncplogin.1,v 1.13 2007/01/15 15:25:15 ru Exp $
.Dd September 15, 1999
.Dt NCPLOGIN 1
.Os
@@ -45,23 +45,29 @@
command.
Connections can be created by any user.
Each user can have multiple
-connections, but each NetWareServer:NetWareUser pair should be unique.
+connections, but each
+.Ar NetWareServer Ns : Ns Ar NetWareUser
+pair should be unique.
.Pp
The
.Nm
command is used to create a permanent connection to a
.Tn NetWare
server.
-Permanent connections will stay connected even if no applications use them.
-This allows users to run different ncp* programs
+Permanent connections will stay open even if no application uses them.
+This allows users to run different
+.Pa ncp*
+programs
without specifying a file server and user to use.
Established connections can be destroyed with the
.Xr ncplogout 1
command.
.Pp
-Upper case options described in this manual
-are common for other ncp* programs and are referred to as
-.Qq connection options .
+Upper case options described in this manual page
+are common for other
+.Pa ncp*
+programs and are referred to as
+.Dq connection options .
Options
.Fl U
and
@@ -70,18 +76,18 @@
.No / Ns Ar server Ns : Ns Ar user
syntax.
.Pp
-The options are:
+The following options are available:
.Bl -tag -width indent
.It Fl S Ar server
Specify the name of the
.Tn NetWare
server to connect to.
-This affect only
+This affects only
.Tn IPX
servers.
-For native
+For servers supporting
.Tn IP
-servers, see the
+natively, see the
.Fl A
option.
.It Fl U Ar user
@@ -106,13 +112,19 @@
Try to use
.Ar signature_level .
Available values are:
-.Bd -literal -offset indent
-Value Meaning
-0 disable signatures
-1 enable (use if required by server)
-2 request but do not require signing
-3 require signatures
-.Ed
+.Pp
+.Bl -tag -width ".Em Value" -offset indent -compact
+.It Em Value
+.Em Meaning
+.It 0
+disable signatures
+.It 1
+enable (use if required by server)
+.It 2
+request but do not require signing
+.It 3
+require signatures
+.El
.Pp
Note that only packet header signing is implemented.
.It Fl M Ar mode
@@ -120,12 +132,20 @@
The bits in the
.Ar mode
argument are similar to standard file permissions:
-.Bd -literal -offset indent
-Mask Meaning
-4 READ - connection will be visible.
-2 WRITE - connection can be closed/modified
-1 EXECUTE - user allowed to execute requests.
-.Ed
+.Pp
+.Bl -tag -width ".Em Mask" -offset indent -compact
+.It Em Mask
+.Em Meaning
+.It 4
+.Pq READ
+connection will be visible.
+.It 2
+.Pq WRITE
+connection can be closed/modified.
+.It 1
+.Pq EXECUTE
+user is allowed to execute requests.
+.El
.Pp
By default, the connection is created with
.Ar mode
@@ -139,15 +159,16 @@
requests,
but not to destroy the connection.
When a server is not explicitly specified,
-ncp* programs try to find a suitable connection in the following order:
+.Pa ncp*
+programs try to find a suitable connection in the following order:
.Bl -enum -offset indent
.It
Try to find a connection owned by the user.
If there is more than one such
connection, try to determine which one is primary.
-The primary flag is set with the
+(The primary flag is set with the
.Fl D
-option.
+option.)
.It
If the primary connection could not be determined,
the first shared connection will be used.
@@ -170,7 +191,7 @@
and
.Ar group
attributes for the connection.
-Newly created connections take the
+By default, newly created connections take the
.Ar owner
attribute from the creating user's username and the
.Ar group
@@ -184,7 +205,8 @@
The
.Nm
utility always creates permanent connections.
-This option can be used in other ncp*
+This option can be useful in other
+.Pa ncp*
programs.
.It Fl R Ar retry_count
Specify the number of retries to be performed
@@ -192,14 +214,14 @@
The default value is 10.
.Pp
Note: after a connection is marked
-.Sq BAD ,
+.Dq BAD ,
each request will try to restore it.
This process restores only the
.Tn NCP
connection;
it does not reopen any files that were open
at the time that the connection was marked
-.Sq BAD .
+.Dq BAD .
.It Fl W Ar timeout
Specify the server request timeout in seconds.
The default is 5 seconds.
@@ -212,19 +234,19 @@
options.
.El
.Sh IMPLEMENTATION NOTES
-Low level connection management is implemented in the
+Low-level connection management is implemented in the
.Pa ncp.ko
-module.
+kernel module.
The
.Xr IPXrouted 8
program is also required for
.Tn IPX
support.
.Sh FILES
-.Bl -tag -width /var/log/wtmp -compact
+.Bl -tag -width ".Pa ~/.nwfsrc"
.It Pa ~/.nwfsrc
-keeps static parameters for connections and other information
-See
+keeps static parameters for connections and other information;
+see
.Pa /usr/share/examples/nwclient/dot.nwfsrc
for details.
.El
Index: ncplogin.c
===================================================================
RCS file: /home/cvs/src/usr.bin/ncplogin/ncplogin.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L usr.bin/ncplogin/ncplogin.c -L usr.bin/ncplogin/ncplogin.c -u -r1.1.1.1 -r1.2
--- usr.bin/ncplogin/ncplogin.c
+++ usr.bin/ncplogin/ncplogin.c
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/ncplogin/ncplogin.c,v 1.4 2002/09/04 23:29:04 dwmalone Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/ncplogin/ncplogin.c,v 1.5 2007/02/05 07:35:23 kevlo Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -69,7 +69,7 @@
login(int argc, char *argv[], struct ncp_conn_loginfo *li) {
int error = 0, connid, opt, setprimary = 0;
- while ((opt = getopt(argc, argv, STDPARAM_OPT"D")) != EOF){
+ while ((opt = getopt(argc, argv, STDPARAM_OPT"D")) != -1) {
switch(opt){
case STDPARAM_ARGS:
if (ncp_li_arg(li, opt, optarg))
Index: ncplogout.1
===================================================================
RCS file: /home/cvs/src/usr.bin/ncplogin/ncplogout.1,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L usr.bin/ncplogin/ncplogout.1 -L usr.bin/ncplogin/ncplogout.1 -u -r1.1.1.1 -r1.2
--- usr.bin/ncplogin/ncplogout.1
+++ usr.bin/ncplogin/ncplogout.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.bin/ncplogin/ncplogout.1,v 1.10 2004/07/02 22:22:29 ru Exp $
+.\" $FreeBSD: src/usr.bin/ncplogin/ncplogout.1,v 1.11 2007/01/15 15:25:15 ru Exp $
.Dd September 15, 1999
.Dt NCPLOGOUT 1
.Os
@@ -7,11 +7,11 @@
.Nd schedule permanent connection to close
.Sh SYNOPSIS
.Nm
-.Op -S Ar server
-.Op -U Ar user
-.Op -c Ar handle
+.Op Fl S Ar server
+.Op Fl U Ar user
+.Op Fl c Ar handle
.Nm
-.Op -c Ar handle
+.Op Fl c Ar handle
.No / Ns Ar server Ns : Ns Ar user
.Sh DESCRIPTION
The
@@ -23,7 +23,8 @@
be closed when the last process using it is terminated.
This command is similar to the
.Tn DOS
-logout.exe command.
+.Pa logout.exe
+command.
.Pp
The options are:
.Bl -tag -width indent
@@ -40,9 +41,8 @@
.It Fl c Ar handle
Close a connection by handle.
A list of available handles can be obtained with the following command:
-.Bd -literal -offset indent
- ncplist c
-.Ed
+.Pp
+.Dl "ncplist c"
.El
.Sh HISTORY
The
More information about the Midnightbsd-cvs
mailing list