Use krb5_error_code for return value of krb5 library functions.

[moira.git] / man / addusr.1

diff --git a/man/addusr.1 b/man/addusr.1
index 6f518bf5709ccf11f18cc427463540e88b60a5bd..36206c8d625d43c07d971a7ebc99775f307dac32 100644 (file)
--- a/man/addusr.1
+++ b/man/addusr.1
@@ -3,7 +3,7 @@
 .SH NAME
 addusr \- add and/or register users in Moira
 .SH SYNOPSIS
-.B addusr [-cCdfhrRsSv]
+.B addusr [-cCdfhrRsSv6]
 .SH DESCRIPTION
 .I Addusr
 is a tool for adding users in bulk to the moira database and
@@ -25,12 +25,11 @@ also cannot have spaces, although it may have hyphens in it.  The
 capitalization of the names is not important as it will be corrected
 before entering into the database.  If the operation specified for
 .B addusr
-includes registering users, then there are two additional tokens on
+includes registering users, then there is one additional token on
 the end of the line:
 .nf
-  lastname, firstname middlename idnumber loginname password
+  lastname, firstname middlename idnumber loginname
 .fi
-Note that neither the loginname nor the password may contain spaces.
 .SH OPTIONS
 .IP \fB-file\ \fIfilename\ \fRor\ \fB-f\ \fIfilename\fR:
 This specifies the file that will be read for the list of users to
@@ -55,10 +54,13 @@ Athena the default is \fI/bin/athena/tcsh\fR, elsewhere it is likely to be
 \fI/bin/csh\fR.
 .IP \fB-register\ \fRor\ \fB-R\fR:
 This instructs \fBaddusr\fR to both add the users to the database and
-then to immediately register them.
+then to immediately register them. The users will be left
+"half-registered", meaning that they have everything but a Kerberos
+principal.
 .IP \fB-reg_only\ \fRor\ \fB-r\fR:
-This instructs \fBaddusr\fR to register the users without attempting
-to add them to the database.  They must already exist in the database.
+This instructs \fBaddusr\fR to (half-) register the users without
+attempting to add them to the database. They must already exist in the
+database.
 .IP \fB-verbose\ \fRor\ \fB-v\fR:
 This causes \fBaddusr\fR to print messages about each operation as it
 performs it.
@@ -68,13 +70,17 @@ users.  Normally \fBaddusr\fR will check the database for users with
 the same name.  If it finds any who match in both name and ID number,
 the user will not be added.  If it finds a name match with a different
 ID number, it will print a warning and add the user anyway.
-.IP \fB-server\ \fIhost:port\ \fRor\ \fB-S\ \fIhost:port\fR:
+.IP \fB-database\ \fIhost:port\ \fRor\ \fB-db\ \fIhost:port\fR:
 Use the specified host and port to contact the Moira server instead of
 the default server.  Both may be symbolic names or numbers.  If the
 port is left off, the default Moira server port will be assumed.  The
 server chosen will be the one specified on the command line, specified
 in the MOIRASERVER environment variable, the hesiod "moira" sloc entry,
 or the compiled in default, in that order or preference.
+.IP \fB-secure\ \fRor\ \fB-6\fR:
+This specifies that users added in this invocation will need a secure
+"Account Coupon" containing additional verification information beyond
+name and ID number to be allowed to register.
 
 .SH AUTHOR
 Mark Rosenstein