Remove `progname'.

2 files changed, 58 insertions, 62 deletions

diff --git a/usr.sbin/yp_mkdb/yp_mkdb.8 b/usr.sbin/yp_mkdb/yp_mkdb.8
index f784354..c9e8dc8 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.8
+++ b/usr.sbin/yp_mkdb/yp_mkdb.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: yp_mkdb.8,v 1.5 1997/02/22 16:14:49 peter Exp $
+.\"	$Id: yp_mkdb.8,v 1.6 1997/04/15 07:06:15 jmg Exp $
 .\"
 .Dd March 12, 1996
 .Dt YP_MKDB 8
@@ -47,60 +47,63 @@
 .Op Fl s
 .Op Fl i Ar inputfile
 .Op Fl o Ar outputfile
+.Op Fl d Ar domainname
 .Op Fl m Ar mastername
 .Ar inputfile
 .Ar dbname
 .Sh DESCRIPTION
-.Nm yp_mkdb
+.Nm Yp_mkdb
 creates
 .Xr db 3
 style databases for use with FreeBSD's NIS server.
-.Nm yp_mkdb
+.Nm Yp_mkdb
 reads data from
-.Nm inputfile ,
+.Ar inputfile ,
 and writes it to
-.Nm dbname
+.Ar dbname
 in
 .Xr db 3
 format (using the hash table method).
 The input should be in 'key data' format, which is to say
-two fields of ASCII data separated by white space. The first field
+two fields of
+.Tn ASCII
+data separated by white space. The first field
 is assumed to be the key, and everything else is assumed to be
 the data.
 These databases are typically stored in
-.Nm /var/yp/[domainname]
+.Pa /var/yp/[domainname]
 where
-.Nm domainname
+.Ar domainname
 is the name of the NIS domain being served. 
-.Nm yp_mkdb
+.Nm Yp_mkdb
 is usually invoked by
-.Nm /var/yp/Makefile.
-.Nm yp_mkdb
+.Pa /var/yp/Makefile .
+.Nm Yp_mkdb
 can also be used to dump an NIS database file so that its
 contents can be examined. For security reasons, all databases that
-.Nm yp_mkdb
+.Nm
 creates are readable and writable by owner only (and usually the
 owner is root).
 .Sh OPTIONS
 The
-.Nm yp_mkdb
+.Nm
 command supports the following flags and options:
-.Bl -tag -width flag
+.Bl -tag -width indent
 .It Fl c
-Causes
-.Nm yp_mkdb
+Cause
+.Nm
 to send a YPPROC_CLEAR request to
 .Xr ypserv 8
 on the local host. This signal tells the server to close any open
 database descriptors and flush out its database cache. If used alone,
 this flag signals the server and does nothing else. If used as part
 of a database creation command,
-.Nm yp_mkdb
+.Nm
 will send the signal only after the new database has been successfully
 created.
 .It Fl b
 This flag causes
-.Nm yp_mkdb
+.Nm
 to add a special entry to the database with a key of
 .Em YP_INTERDOMAIN
 and an empty data field. If this key is present in a map, it alters the
@@ -117,7 +120,6 @@ special behavior only applies to the
 maps. Using the
 .Fl b
 flag for other maps has no effect.
-.Pp
 .It Fl s
 This flag is used to add a special entry to the database with a key of
 .Em YP_SECURE
@@ -127,45 +129,43 @@ will deny access to the map to any client that is not using a
 reserved port for its query. This is used mainly for the
 .Em master.passwd
 maps, which should be restricted to privileged access only.
-.Pp
 .It Fl u Ar dbname
-.Pp
 Dump (or 'unwind') an NIS database. This option can be used to
 inspect the contents of an existing NIS database.
-.It Op Fl i Ar inputfile
-.Pp
+.It Fl i Ar inputfile
 When generating an NIS map, encode
-.Nm inputfile
+.Ar inputfile
 as a special entry in the database with a key of
 .Em YP_INPUT_FILE .
-.Pp
-.It Op Fl o Ar outputfile
-.Pp
+.It Fl o Ar outputfile
 When generating an NIS map, encode
-.Nm outputfile
+.Ar outputfile
 as a special entry in the database with a key of
 .Em YP_OUTPUT_FILE .
-.Pp
-.It Op Fl m Ar mastername
-.Pp
-When generating an NIS map encode
-.Nm mastername
+.It Fl d Ar domainname
+When generating an NIS map, encode
+.Ar domainname
+as a special entry in the database with a key of
+.Em YP_DOMAIN_NAME .
+.It Fl m Ar mastername
+When generating an NIS map, encode
+.Ar mastername
 as a special entry in the database with a key of
 .Em YP_MASTER_NAME .
 This entry in the database is frequently used by various NIS utilities
 to determine the name of an NIS master server for a domain. By default,
-.Nm yp_mkdb
+.Nm
 assumes that the local host is the NIS master; the
-.Ar m
+.Fl m
 option is used to override this default.
 .Sh FILES
-.Bl -tag -width Pa -compact
+.Bl -tag -width /var/yp/Makefile -compact
 .It Pa /var/yp/Makefile
-The Makefile that calls
-.Nm yp_mkdb
-to build the NIS databases.
+the Makefile that calls
+.Nm
+to build the NIS databases
 .Sh SEE ALSO
 .Xr db 3 ,
 .Xr ypserv 8
 .Sh AUTHOR
-Bill Paul <wpaul@ctr.columbia.edu>
+.An Bill Paul Aq wpaul@ctr.columbia.edu
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.c b/usr.sbin/yp_mkdb/yp_mkdb.c
index 0ce8b58..aea610f 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.c
+++ b/usr.sbin/yp_mkdb/yp_mkdb.c
@@ -28,44 +28,40 @@
  * 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.
- *
- *	$Id: yp_mkdb.c,v 1.6 1997/02/22 16:14:50 peter Exp $
  */
 
-#include <stdio.h>
-#include <string.h>
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
+#include <err.h>
 #include <fcntl.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <limits.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
+#include <string.h>
 #include <time.h>
-#include <err.h>
+#include <unistd.h>
 #include <rpc/rpc.h>
 #include <rpcsvc/yp.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include "yp_extern.h"
 #include "ypxfr_extern.h"
 
-#ifndef lint
-static const char rcsid[] = "$Id: yp_mkdb.c,v 1.6 1997/02/22 16:14:50 peter Exp $";
-#endif
-
 char *yp_dir = "";	/* No particular default needed. */
-char *progname = "yp_mkdb";
 int _rpcpmstart = 0;
 int debug = 1;
 
 static void usage()
 {
-	fprintf(stderr, "usage: %s -c\n", progname);
-	fprintf(stderr, "usage: %s -u dbname\n", progname);
-	fprintf(stderr, "usage: %s [-c] [-b] [-s] [-i inputfile] \
-[-o outputfile]\n", progname);
-	fprintf(stderr, "               [-d domainname ] [-m mastername] \
-inputfile dbname\n");
+	fprintf(stderr, "%s\n%s\n%s\n%s\n",
+	"usage: yp_mkdb -c",
+	"       yp_mkdb -u dbname",
+	"       yp_mkdb [-c] [-b] [-s] [-i inputfile] [-o outputfile]",
+	"               [-d domainname ] [-m mastername] inputfile dbname");
 	exit(1);
 }
 
@@ -99,7 +95,7 @@ static void unwind(map)
 	return;
 }
 
-main (argc, argv)
+int main (argc, argv)
 	int argc;
 	char *argv[];
 {